S3 region detection fix (#291)

opensnowcat · Dec 24, 2024 · a36f1fa · a36f1fa
1 parent fdfc53d
commit a36f1fa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/...es/cloudutils/aws/src/main/scala/com/snowplowanalytics/snowplow/enrich/aws/S3Client.scala b/...es/cloudutils/aws/src/main/scala/com/snowplowanalytics/snowplow/enrich/aws/S3Client.scala
@@ -24,7 +24,7 @@ import blobstore.s3.S3Store
 
 import software.amazon.awssdk.services.s3.S3AsyncClient
 import software.amazon.awssdk.core.exception.SdkException
-import software.amazon.awssdk.regions.providers.AwsRegionProviderChain
+import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain
 import software.amazon.awssdk.regions.Region
 
 import com.snowplowanalytics.snowplow.enrich.common.fs2.io.Clients.{Client, RetryableFailure}
@@ -58,7 +58,7 @@ object S3Client {
     }
 
   private def getRegion(): Region =
-    Either.catchNonFatal(new AwsRegionProviderChain().getRegion) match {
+    Either.catchNonFatal((new DefaultAwsRegionProviderChain).getRegion) match {
       case Right(region) =>
         region
       case _ =>

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -180,6 +180,7 @@ object BuildSettings {
       case x if x.endsWith(".config") => MergeStrategy.first
       case x if x.endsWith(".types") => MergeStrategy.first
       case x if x.contains("netty") => MergeStrategy.first
+      case x if x.endsWith("NOTICE") => MergeStrategy.rename
       case x =>
         val oldStrategy = (assembly / assemblyMergeStrategy).value
         oldStrategy(x)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -70,7 +70,7 @@ object Dependencies {
     val collectorPayload = "0.0.0"
     val schemaSniffer = "0.0.0"
 
-    val awsSdk = "1.12.765"
+    val awsSdk = "1.12.780"
     val gcpSdk = "2.31.0"
     val awsSdk2 = "2.25.69"
     val kinesisClient2 = "2.4.3"