Skip to content

Commit

Permalink
refactor: simplify aws config import
Browse files Browse the repository at this point in the history
  • Loading branch information
beeb committed Nov 28, 2023
1 parent 2120c65 commit 0f74a0c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ categories = ["command-line-utilities", "filesystem"]

[dependencies]
anyhow = "1"
aws-config = "1"
aws-config = { version = "1", features = ["behavior-version-latest"] }
aws-sdk-s3 = "1"
aws-smithy-types = "1"
chrono = { version = "0.4", default-features = false, features = ["clock"] }
Expand Down
4 changes: 1 addition & 3 deletions src/aws.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use std::{env, fs::File, path::Path};

use anyhow::{anyhow, Result};
use aws_config::BehaviorVersion;
use aws_sdk_s3::{
operation::create_multipart_upload::CreateMultipartUploadOutput,
types::{CompletedMultipartUpload, CompletedPart},
Expand All @@ -32,8 +31,7 @@ pub(crate) async fn upload_file(archive: Archive, params: &Params) -> Result<()>
// from the command line args
env::set_var("AWS_ACCESS_KEY_ID", &params.aws_key_id);
env::set_var("AWS_SECRET_ACCESS_KEY", &params.aws_key);
let mut shared_config_builder =
aws_config::defaults(BehaviorVersion::latest()).region(params.aws_region.region().await);
let mut shared_config_builder = aws_config::from_env().region(params.aws_region.region().await);
// we set this special environment variable when doing e2e testing
if env::var("AWSBCK_TESTING_E2E").is_ok() {
warn!("Endpoint URL was changed to localhost while in testing environment.");
Expand Down
3 changes: 1 addition & 2 deletions tests/e2e_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use std::{
process::{Command, Stdio},
};

use aws_config::BehaviorVersion;
use aws_sdk_s3::Client;
use dockertest::{
waitfor::{MessageSource, MessageWait},
Expand Down Expand Up @@ -89,7 +88,7 @@ fn e2e_test() {
// check bucket contents
env::set_var("AWS_ACCESS_KEY_ID", "bar");
env::set_var("AWS_SECRET_ACCESS_KEY", "baz");
let shared_config = aws_config::defaults(BehaviorVersion::latest())
let shared_config = aws_config::from_env()
.region("us-east-1")
.endpoint_url("http://127.0.0.1:9090")
.load()
Expand Down

0 comments on commit 0f74a0c

Please sign in to comment.