From d01c24ce64f70990d18b867a71404d9bf96cc58e Mon Sep 17 00:00:00 2001 From: bzablocki Date: Mon, 10 Jun 2024 18:08:13 +0200 Subject: [PATCH] Update aws testcontainer to make it compatible with testcontainers_version = "1.19.7" (#31531) --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- .../test/java/org/apache/beam/sdk/io/aws/ITEnvironment.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 493be3d7cc090..65fcf73334076 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -639,7 +639,7 @@ class BeamModulePlugin implements Plugin { def spark2_version = "2.4.8" def spark3_version = "3.2.2" def spotbugs_version = "4.0.6" - def testcontainers_version = "1.17.3" + def testcontainers_version = "1.19.7" // [bomupgrader] determined by: org.apache.arrow:arrow-memory-core, consistent with: google_cloud_platform_libraries_bom def arrow_version = "15.0.2" def jmh_version = "1.34" diff --git a/sdks/java/io/amazon-web-services/src/test/java/org/apache/beam/sdk/io/aws/ITEnvironment.java b/sdks/java/io/amazon-web-services/src/test/java/org/apache/beam/sdk/io/aws/ITEnvironment.java index ee882a71a5cd7..3415a11bf9f0c 100644 --- a/sdks/java/io/amazon-web-services/src/test/java/org/apache/beam/sdk/io/aws/ITEnvironment.java +++ b/sdks/java/io/amazon-web-services/src/test/java/org/apache/beam/sdk/io/aws/ITEnvironment.java @@ -20,6 +20,8 @@ import static org.apache.beam.sdk.testing.TestPipeline.testingPipelineOptions; import static org.testcontainers.containers.localstack.LocalStackContainer.Service.S3; +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; import com.amazonaws.client.builder.AwsClientBuilder; import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration; import org.apache.beam.sdk.io.aws.options.AwsOptions; @@ -139,6 +141,8 @@ private void startLocalstack() { options.setAwsServiceEndpoint( localstack.getEndpointOverride(S3).toString()); // service irrelevant options.setAwsRegion(localstack.getRegion()); - options.setAwsCredentialsProvider(localstack.getDefaultCredentialsProvider()); + options.setAwsCredentialsProvider( + new AWSStaticCredentialsProvider( + new BasicAWSCredentials(localstack.getAccessKey(), localstack.getSecretKey()))); } }