From 67338ca0cb334816698cae6009f3bf5cf89a442a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 10 Jul 2024 12:51:59 +0000 Subject: [PATCH 1/4] bump: auth, dynamodb, eventbridge, firehose, ... 2.25.70 (was 2.25.16) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5fc0cc2560..e2e1a4ff38 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,7 +15,7 @@ object Dependencies { val InfluxDBJavaVersion = "2.15" - val AwsSdk2Version = "2.25.16" + val AwsSdk2Version = "2.25.70" val AwsSpiAkkaHttpVersion = "1.0.1" // Sync with plugins.sbt val AkkaGrpcBinaryVersion = "2.5" From 0f640ef358335efbc8bdb2cae5c32b77f174ffba Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 30 Sep 2024 13:34:16 +0200 Subject: [PATCH 2/4] use messageSystemAttributeNamesWithStrings --- .../main/scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala b/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala index c8ef8df269..495c2917dd 100644 --- a/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala +++ b/sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala @@ -34,7 +34,7 @@ object SqsSource { ReceiveMessageRequest .builder() .queueUrl(queueUrl) - .attributeNamesWithStrings(settings.attributeNames.map(_.name).asJava) + .messageSystemAttributeNamesWithStrings(settings.attributeNames.map(_.name).asJava) .messageAttributeNames(settings.messageAttributeNames.map(_.name).asJava) .maxNumberOfMessages(settings.maxBatchSize) .waitTimeSeconds(settings.waitTimeSeconds) From 4c7cc4e782c0be1cddab2a7ac5ad16f7e720759c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 1 Oct 2024 16:09:36 +0200 Subject: [PATCH 3/4] fix scala3 compile --- s3/src/main/scala/akka/stream/alpakka/s3/settings.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/s3/src/main/scala/akka/stream/alpakka/s3/settings.scala b/s3/src/main/scala/akka/stream/alpakka/s3/settings.scala index 4d80abffb4..4a33b03ae3 100644 --- a/s3/src/main/scala/akka/stream/alpakka/s3/settings.scala +++ b/s3/src/main/scala/akka/stream/alpakka/s3/settings.scala @@ -8,7 +8,6 @@ import java.nio.file.{Path, Paths} import java.time.{Duration => JavaDuration} import java.util.concurrent.TimeUnit import java.util.{Objects, Optional} - import akka.actor.{ActorSystem, ClassicActorSystemProvider} import akka.http.scaladsl.model.Uri import akka.stream.alpakka.s3.AccessStyle.{PathAccessStyle, VirtualHostAccessStyle} @@ -17,6 +16,7 @@ import org.slf4j.LoggerFactory import software.amazon.awssdk.auth.credentials._ import software.amazon.awssdk.regions.Region import software.amazon.awssdk.regions.providers._ +import software.amazon.awssdk.utils.builder.{CopyableBuilder, ToCopyableBuilder} import scala.jdk.OptionConverters._ import scala.concurrent.duration._ @@ -596,7 +596,7 @@ object S3Settings { val aki = c.getString("aws.credentials.access-key-id") val sak = c.getString("aws.credentials.secret-access-key") val tokenPath = "aws.credentials.token" - val creds = if (c.hasPath(tokenPath)) { + val creds: AwsCredentials = if (c.hasPath(tokenPath)) { AwsSessionCredentials.create(aki, sak, c.getString(tokenPath)) } else { AwsBasicCredentials.create(aki, sak) From d3e497d7061d8a2a7c5ae1e2dfb81b6e1a1596dc Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 2 Oct 2024 14:52:12 +0200 Subject: [PATCH 4/4] fix unused import --- s3/src/main/scala/akka/stream/alpakka/s3/settings.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/s3/src/main/scala/akka/stream/alpakka/s3/settings.scala b/s3/src/main/scala/akka/stream/alpakka/s3/settings.scala index 4a33b03ae3..6d81fa7dfa 100644 --- a/s3/src/main/scala/akka/stream/alpakka/s3/settings.scala +++ b/s3/src/main/scala/akka/stream/alpakka/s3/settings.scala @@ -16,7 +16,6 @@ import org.slf4j.LoggerFactory import software.amazon.awssdk.auth.credentials._ import software.amazon.awssdk.regions.Region import software.amazon.awssdk.regions.providers._ -import software.amazon.awssdk.utils.builder.{CopyableBuilder, ToCopyableBuilder} import scala.jdk.OptionConverters._ import scala.concurrent.duration._