From 0f74a0c3025d52f3418018a61fe055418fe071e6 Mon Sep 17 00:00:00 2001
From: beeb <703631+beeb@users.noreply.github.com>
Date: Tue, 28 Nov 2023 19:14:36 +0100
Subject: [PATCH] refactor: simplify aws config import

---
 Cargo.toml        | 2 +-
 src/aws.rs        | 4 +---
 tests/e2e_test.rs | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5c794b7..6702e1b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"] }
diff --git a/src/aws.rs b/src/aws.rs
index d0734a3..e2ecc3b 100644
--- a/src/aws.rs
+++ b/src/aws.rs
@@ -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},
@@ -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.");
diff --git a/tests/e2e_test.rs b/tests/e2e_test.rs
index 0ce1aed..b560bc8 100644
--- a/tests/e2e_test.rs
+++ b/tests/e2e_test.rs
@@ -6,7 +6,6 @@ use std::{
     process::{Command, Stdio},
 };
 
-use aws_config::BehaviorVersion;
 use aws_sdk_s3::Client;
 use dockertest::{
     waitfor::{MessageSource, MessageWait},
@@ -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()