fix(ci): Fix merge conflict for AWS auth changes

src/aws/auth.rs

@@ -32,7 +32,7 @@ pub enum AwsAuthentication {
 impl AwsAuthentication {
     pub async fn credentials_provider(
         &self,
-        region: Option<Region>,
+        region: Region,
     ) -> crate::Result<SharedCredentialsProvider> {
         match self {
             Self::Static {
@@ -47,15 +47,11 @@ impl AwsAuthentication {
                 Err("Overriding the credentials file is not supported.".into())
             }
             AwsAuthentication::Role { assume_role } => {
-                let mut credentials = AssumeRoleProviderBuilder::new(assume_role);
+                let provider = AssumeRoleProviderBuilder::new(assume_role)
+                    .region(region.clone())
+                    .build(default_credentials_provider(region).await);
 
-                if let Some(ref region) = region {
-                    credentials = credentials.region(region.clone())
-                }
-
-                Ok(SharedCredentialsProvider::new(
-                    credentials.build(default_credentials_provider(region).await),
-                ))
+                Ok(SharedCredentialsProvider::new(provider))
             }
             AwsAuthentication::Default {} => Ok(SharedCredentialsProvider::new(
                 default_credentials_provider(region).await,
@@ -72,14 +68,13 @@ impl AwsAuthentication {
     }
 }
 
-async fn default_credentials_provider(region: Option<Region>) -> SharedCredentialsProvider {
-    let mut credentials = DefaultCredentialsChain::builder();
-
-    if let Some(region) = region {
-        credentials = credentials.region(region)
-    }
+async fn default_credentials_provider(region: Region) -> SharedCredentialsProvider {
+    let chain = DefaultCredentialsChain::builder()
+        .region(region)
+        .build()
+        .await;
 
-    SharedCredentialsProvider::new(credentials.build().await)
+    SharedCredentialsProvider::new(chain)
 }
 
 #[cfg(test)]

src/sinks/elasticsearch/common.rs

@@ -70,12 +70,16 @@ impl ElasticsearchCommon {
         let http_auth = authorization.choose_one(&uri.auth)?;
         let base_url = uri.uri.to_string().trim_end_matches('/').to_owned();
 
-        let region = config.aws.as_ref().map(|config| config.region());
-
         let aws_auth = match &config.auth {
             Some(ElasticsearchAuth::Basic { .. }) | None => None,
             Some(ElasticsearchAuth::Aws(aws)) => {
-                Some(aws.credentials_provider(region.clone()).await?)
+                let region = config
+                    .aws
+                    .as_ref()
+                    .map(|config| config.region())
+                    .ok_or(ParseError::RegionRequired)?;
+
+                Some(aws.credentials_provider(region).await?)
             }
         };
 
@@ -116,6 +120,8 @@ impl ElasticsearchCommon {
             metric_config.timezone.unwrap_or_default(),
         );
 
+        let region = config.aws.as_ref().map(|config| config.region());
+
         Ok(Self {
             http_auth,
             base_url,

src/sinks/elasticsearch/mod.rs

@@ -162,4 +162,6 @@ pub enum ParseError {
     IndexTemplate { source: TemplateParseError },
     #[snafu(display("Batch action template parse error: {}", source))]
     BatchActionTemplate { source: TemplateParseError },
+    #[snafu(display("aws.region required when AWS authentication is in use"))]
+    RegionRequired,
 }

src/sources/aws_sqs/integration_tests.rs

@@ -51,7 +51,7 @@ async fn get_sqs_client() -> aws_sdk_sqs::Client {
     let config = aws_sdk_sqs::config::Builder::new()
         .credentials_provider(
             AwsAuthentication::test_auth()
-                .credentials_provider(Some(Region::new("custom")))
+                .credentials_provider(Region::new("custom"))
                 .await
                 .unwrap(),
         )

tests/config.rs

@@ -776,6 +776,7 @@ async fn parses_sink_full_es_aws() {
         type = "elasticsearch"
         inputs = ["in"]
         endpoint = "https://es.us-east-1.amazonaws.com"
+        aws.region = "us-east-1"
 
         [sinks.out.auth]
         strategy = "aws"