Skip to content

Commit f3b40a3

Browse files
bump: AWS auth, dynamodb, eventbridge, firehose, ... 2.36.3 (was 2.25.16) (#3234)
1 parent 3b06fdf commit f3b40a3

File tree

8 files changed

+8
-159
lines changed

8 files changed

+8
-159
lines changed

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949
echo 'CREATE PRIMARY INDEX ON akkaquery USING GSI;' | cbq -c Administrator:password -e http://couchbase:8093
5050
"
5151
elasticmq:
52-
image: softwaremill/elasticmq-native:1.5.8
52+
image: softwaremill/elasticmq-native:1.6.15
5353
ports:
5454
- "9324:9324"
5555
dynamodb:

docs/src/main/paradox/aws-shared-configuration.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,6 @@ Please make sure to configure a big enough thread pool for the Netty client to a
2525
if you share the client between multiple Sources, Sinks and Flows. For the SQS Sinks and Sources the sum of all
2626
`parallelism` (Source) and `maxInFlight` (Sink) must be less than or equal to the thread pool size.
2727

28-
29-
## AWS retry configuration
30-
31-
The AWS SDK 2 supports request retrying with exponential backoff.
32-
33-
The request retry behaviour is configurable via the @javadoc[SdkDefaultClientBuilder.overrideConfiguration](software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder#overrideConfiguration-software.amazon.awssdk.core.client.config.ClientOverrideConfiguration-) method by using the @javadoc[RetryPolicy](software.amazon.awssdk.core.retry.RetryPolicy).
34-
35-
Scala
36-
: @@snip [snip](/dynamodb/src/test/scala/docs/scaladsl/RetrySpec.scala) { #awsRetryConfiguration }
37-
38-
Java
39-
: @@snip [snip](/dynamodb/src/test/java/docs/javadsl/RetryTest.java) { #awsRetryConfiguration }
40-
41-
4228
## AWS Access Keys
4329

4430
Do not encode AWS Access Keys in your source code or in static configuration. Please refer to [Best Practices for Managing AWS Access Keys](https://docs.aws.amazon.com/general/latest/gr/aws-access-keys-best-practices.html) for proper AWS Access Key management.

docs/src/main/paradox/dynamodb.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,6 @@ Java
9191
: @@snip [snip](/dynamodb/src/test/java/docs/javadsl/ExampleTest.java) { #paginated }
9292

9393

94-
## Error Retries and Exponential Backoff
95-
96-
The AWS SDK 2 implements error retrying with exponential backoff which is configurable via the @javadoc[DynamoDbAsyncClient](software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient) configuration by using the @javadoc[RetryPolicy](software.amazon.awssdk.core.retry.RetryPolicy) in `overrideConfiguration`.
97-
98-
See @ref[AWS Retry configuration](aws-shared-configuration.md) for more details.
99-
100-
Scala
101-
: @@snip [snip](/dynamodb/src/test/scala/docs/scaladsl/RetrySpec.scala) { #clientRetryConfig }
102-
103-
Java
104-
: @@snip [snip](/dynamodb/src/test/java/docs/javadsl/RetryTest.java) { #clientRetryConfig }
105-
10694
@@@ index
10795

10896
* [retry conf](aws-shared-configuration.md)

dynamodb/src/test/java/docs/javadsl/RetryTest.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

dynamodb/src/test/scala/docs/scaladsl/RetrySpec.scala

Lines changed: 0 additions & 62 deletions
This file was deleted.

project/Dependencies.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ object Dependencies {
1818

1919
val InfluxDBJavaVersion = "2.15"
2020

21-
val AwsSdk2Version = "2.25.16"
21+
// https://github.com/aws/aws-sdk-java-v2
22+
val AwsSdk2Version = "2.36.3"
2223
val AwsSpiAkkaHttpVersion = "1.0.1"
2324
// Sync with plugins.sbt
2425
val AkkaGrpcBinaryVersion = "2.5"

s3/src/main/scala/akka/stream/alpakka/s3/settings.scala

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import java.nio.file.{Path, Paths}
88
import java.time.{Duration => JavaDuration}
99
import java.util.concurrent.TimeUnit
1010
import java.util.{Objects, Optional}
11-
1211
import akka.actor.{ActorSystem, ClassicActorSystemProvider}
1312
import akka.http.scaladsl.model.Uri
1413
import akka.stream.alpakka.s3.AccessStyle.{PathAccessStyle, VirtualHostAccessStyle}
@@ -590,13 +589,13 @@ object S3Settings {
590589
if (c.hasPath(credProviderPath)) {
591590
c.getString(credProviderPath) match {
592591
case "default" =>
593-
DefaultCredentialsProvider.create()
592+
DefaultCredentialsProvider.builder().build()
594593

595594
case "static" =>
596595
val aki = c.getString("aws.credentials.access-key-id")
597596
val sak = c.getString("aws.credentials.secret-access-key")
598597
val tokenPath = "aws.credentials.token"
599-
val creds = if (c.hasPath(tokenPath)) {
598+
val creds: AwsCredentials = if (c.hasPath(tokenPath)) {
600599
AwsSessionCredentials.create(aki, sak, c.getString(tokenPath))
601600
} else {
602601
AwsBasicCredentials.create(aki, sak)
@@ -607,10 +606,10 @@ object S3Settings {
607606
AnonymousCredentialsProvider.create()
608607

609608
case _ =>
610-
DefaultCredentialsProvider.create()
609+
DefaultCredentialsProvider.builder().build()
611610
}
612611
} else {
613-
DefaultCredentialsProvider.create()
612+
DefaultCredentialsProvider.builder().build()
614613
}
615614
}
616615

sqs/src/main/scala/akka/stream/alpakka/sqs/scaladsl/SqsSource.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ object SqsSource {
3434
ReceiveMessageRequest
3535
.builder()
3636
.queueUrl(queueUrl)
37-
.attributeNamesWithStrings(settings.attributeNames.map(_.name).asJava)
37+
.messageSystemAttributeNamesWithStrings(settings.attributeNames.map(_.name).asJava)
3838
.messageAttributeNames(settings.messageAttributeNames.map(_.name).asJava)
3939
.maxNumberOfMessages(settings.maxBatchSize)
4040
.waitTimeSeconds(settings.waitTimeSeconds)

0 commit comments

Comments
 (0)