Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Added feature to use rustls instead of default for dependancy rusoto #55

Merged
merged 2 commits into from
May 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions dynomite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,20 @@ log = "0.4"
failure = "0.1"
futures = "0.1"
futures-backoff = "0.1"
rusoto_core = "0.38"
rusoto_dynamodb = "0.38"
rusoto_core_default = { package = "rusoto_core", version = "0.38", optional = true }
rusoto_core_rustls = { package = "rusoto_core", version = "0.38", default_features = false, features=["rustls"], optional = true }
rusoto_dynamodb_default = { package = "rusoto_dynamodb", version = "0.38", optional = true }
rusoto_dynamodb_rustls = { package = "rusoto_dynamodb", version = "0.38", default_features = false, features=["rustls"], optional = true }
uuid = { version = "0.7", features = ["v4"], optional = true }


[dev-dependencies]
env_logger = "0.6"
maplit = "1.0"
serde_json = "1.0"
tokio = "0.1"

[features]
default = ["uuid", "derive"]
default = ["uuid", "derive", "rusoto_core_default", "rusoto_dynamodb_default"]
rustls = ["uuid", "derive", "rusoto_core_rustls", "rusoto_dynamodb_rustls"]
derive = ["dynomite-derive"]
8 changes: 7 additions & 1 deletion dynomite/examples/demo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ use dynomite::{
DynamoDbExt, FromAttributes, Item, Retries,
};
use futures::{Future, Stream};
use rusoto_core::Region;

#[cfg(feature = "default")]
use rusoto_core_default::Region;

#[cfg(feature = "rustls")]
use rusoto_core_rustls::Region;

use tokio::runtime::Runtime;
use uuid::Uuid;

Expand Down
8 changes: 7 additions & 1 deletion dynomite/examples/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ use dynomite::{
};

use futures::{Future, Stream};
use rusoto_core::Region;

#[cfg(feature = "default")]
use rusoto_core_default::Region;

#[cfg(feature = "rustls")]
use rusoto_core_rustls::Region;

use tokio::runtime::Runtime;
use uuid::Uuid;

Expand Down
6 changes: 5 additions & 1 deletion dynomite/src/ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ use crate::dynamodb::{
ListTablesInput, QueryError, QueryInput, ScanError, ScanInput,
};
use futures::{stream, Future, Stream};
use rusoto_core::RusotoError;

#[cfg(feature = "default")]
use rusoto_core_default::RusotoError;
#[cfg(feature = "rustls")]
use rusoto_core_rustls::RusotoError;
use std::collections::HashMap;

type DynomiteStream<I, E> = Box<Stream<Item = I, Error = RusotoError<E>> + Send>;
Expand Down
9 changes: 7 additions & 2 deletions dynomite/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,13 @@
#![deny(missing_docs)]
// reexported
// note: this is used inside the attr_map! macro
pub use rusoto_dynamodb as dynamodb;
use rusoto_dynamodb::AttributeValue;
#[cfg(feature = "default")]
pub use rusoto_dynamodb_default as dynamodb;

#[cfg(feature = "rustls")]
pub use rusoto_dynamodb_rustls as dynamodb;

use dynamodb::AttributeValue;
use std::{
borrow::Cow,
collections::{BTreeMap, BTreeSet, HashMap, HashSet},
Expand Down
5 changes: 4 additions & 1 deletion dynomite/src/retry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
use crate::dynamodb::*;
use futures_backoff::{Condition, Strategy};
use log::debug;
use rusoto_core::{RusotoError, RusotoFuture};
#[cfg(feature = "default")]
use rusoto_core_default::{RusotoError, RusotoFuture};
#[cfg(feature = "rustls")]
use rusoto_core_rustls::{RusotoError, RusotoFuture};
use std::{sync::Arc, time::Duration};

/// Preconfigured retry policies for failable operations
Expand Down