Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: dependencies upgrade #520

Merged
merged 1 commit into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,9 @@ dependencies {
// AWS libs: versions are managed by the Micronaut BOM
api platform("io.micronaut.platform:micronaut-platform")
api 'software.amazon.awssdk:cloudwatchlogs'
api 'software.amazon.awssdk:batch:2.26.16' // we can remove this after micronaut bump as long as it contains the RegisterJobDefinitionRequest.ecsProperties exists
api 'software.amazon.awssdk:s3'
api 'software.amazon.awssdk:s3-transfer-manager'
api 'software.amazon.awssdk.crt:aws-crt:0.29.19' //used by s3-transfer-manager
api 'software.amazon.awssdk.crt:aws-crt:0.30.6' //used by s3-transfer-manager
api 'software.amazon.awssdk:apache-client'
api 'software.amazon.awssdk:dynamodb'
api 'software.amazon.awssdk:sns'
Expand Down Expand Up @@ -122,11 +121,11 @@ dependencies {
testImplementation group: "io.kestra", name: "repository-memory"

// testcontainers
testImplementation "org.testcontainers:testcontainers:1.20.0"
testImplementation "org.testcontainers:junit-jupiter:1.20.0"
testImplementation "org.testcontainers:localstack:1.20.0"
testImplementation "org.testcontainers:testcontainers:1.20.1"
testImplementation "org.testcontainers:junit-jupiter:1.20.1"
testImplementation "org.testcontainers:localstack:1.20.1"
// Localstack module misses SDK v1 classes that are mandatory, see https://github.com/testcontainers/testcontainers-java/issues/1442#issuecomment-694342883
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.730'
testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.767'
}

/**********************************************************************************************************************\
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/io/kestra/plugin/aws/sqs/AbstractSqs.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import lombok.NoArgsConstructor;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
import software.amazon.awssdk.awscore.retry.AwsRetryStrategy;
import software.amazon.awssdk.awscore.retry.AwsRetryPolicy;
import software.amazon.awssdk.services.sqs.SqsAsyncClient;
import software.amazon.awssdk.services.sqs.SqsAsyncClientBuilder;
import software.amazon.awssdk.services.sqs.SqsClient;
Expand Down Expand Up @@ -50,10 +50,10 @@ protected SqsAsyncClient asyncClient(final RunContext runContext,
);

clientBuilder = clientBuilder.overrideConfiguration(builder ->
builder.retryStrategy(
AwsRetryStrategy.standardRetryStrategy()
builder.retryPolicy(
AwsRetryPolicy.defaultRetryPolicy()
.toBuilder()
.maxAttempts(retryMaxAttempts)
.numRetries(retryMaxAttempts)
.build()
)
);
Expand Down