Skip to content

Commit

Permalink
revert rusoto workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
alecmocatta committed Oct 17, 2019
1 parent 802e7de commit 4167503
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
4 changes: 2 additions & 2 deletions amadeus-aws/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ futures-01 = { package = "futures", version = "0.1" }
futures-preview = { version = "=0.3.0-alpha.19", features = ["compat"] }
http = "0.1"
once_cell = "1.0"
rusoto_core = "0.41"
rusoto_s3 = "0.41"
rusoto_core = "0.40"
rusoto_s3 = "0.40"
serde_closure = "0.2"
serde = { version = "1.0", features = ["derive"] }
tokio = "0.1.7"
Expand Down
18 changes: 1 addition & 17 deletions amadeus-aws/src/cloudfront.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,10 @@ impl Source for Cloudfront {
region,
objects,
} = self;
let region: (String, Option<String>) = (
region.name().to_owned(),
if let AwsRegion::Custom { endpoint, .. } = region {
Some(endpoint)
} else {
None
},
);
let ret = objects
.into_dist_iter()
.flat_map(FnMut!(move |key: String| {
let region = if let Some(endpoint) = &region.1 {
AwsRegion::Custom {
name: region.0.clone(),
endpoint: endpoint.clone(),
}
} else {
region.0.parse().unwrap()
};
let client = S3Client::new(region);
let client = S3Client::new(region.clone());
ResultExpand(
loop {
match self::block_on_01(self::retry(|| {
Expand Down

0 comments on commit 4167503

Please sign in to comment.