Move localstack's tests to aws sdk v2 (#10592)

Author: eddumelendez

docs/modules/localstack.md

@@ -16,10 +16,6 @@ public LocalStackContainer localstack = new LocalStackContainer(localstackImage)
 
 ## Creating a client using AWS SDK
 
-<!--codeinclude-->
-[AWS SDK V1](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_aws_sdk_v1
-<!--/codeinclude-->
-
 <!--codeinclude-->
 [AWS SDK V2](../../modules/localstack/src/test/java/org/testcontainers/containers/localstack/LocalstackContainerTest.java) inside_block:with_aws_sdk_v2
 <!--/codeinclude-->

modules/localstack/build.gradle

@@ -3,13 +3,12 @@ description = "Testcontainers :: Localstack"
 dependencies {
     api project(':testcontainers')
 
-    testImplementation platform("com.amazonaws:aws-java-sdk-bom:1.12.572")
-    testImplementation 'com.amazonaws:aws-java-sdk-s3'
-    testImplementation 'com.amazonaws:aws-java-sdk-sqs'
-    testImplementation 'com.amazonaws:aws-java-sdk-logs'
-    testImplementation 'com.amazonaws:aws-java-sdk-lambda'
-    testImplementation 'com.amazonaws:aws-java-sdk-core'
-    testImplementation 'software.amazon.awssdk:s3:2.32.14'
+    testImplementation platform("software.amazon.awssdk:bom:2.32.14")
+    testImplementation 'software.amazon.awssdk:s3'
+    testImplementation 'software.amazon.awssdk:sqs'
+    testImplementation 'software.amazon.awssdk:cloudwatchlogs'
+    testImplementation 'software.amazon.awssdk:lambda'
+    testImplementation 'software.amazon.awssdk:kms'
     testImplementation 'org.assertj:assertj-core:3.27.3'
 }
 

modules/localstack/src/test/java/org/testcontainers/containers/localstack/LegacyModeTest.java

@@ -1,6 +1,5 @@
 package org.testcontainers.containers.localstack;
 
-import com.amazonaws.client.builder.AwsClientBuilder;
 import com.github.dockerjava.api.DockerClient;
 import lombok.AllArgsConstructor;
 import org.junit.BeforeClass;
@@ -20,7 +19,9 @@
 @RunWith(Enclosed.class)
 public class LegacyModeTest {
 
-    private static DockerImageName LOCALSTACK_CUSTOM_TAG = LocalstackTestImages.LOCALSTACK_IMAGE.withTag("custom");
+    private static DockerImageName LOCALSTACK_CUSTOM_TAG = DockerImageName
+        .parse("localstack/localstack:0.12.8")
+        .withTag("custom");
 
     @RunWith(Parameterized.class)
     @AllArgsConstructor
@@ -54,21 +55,9 @@ public void samePortIsExposedForAllServices() {
                 assertThat(localstack.getEndpointOverride(Service.SQS).toString())
                     .as("Endpoint overrides are different")
                     .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
-                assertThat(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.SQS).toString(),
-                        localstack.getRegion()
-                    )
-                        .getServiceEndpoint()
-                )
+                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
                     .as("Endpoint configuration have different endpoints")
-                    .isEqualTo(
-                        new AwsClientBuilder.EndpointConfiguration(
-                            localstack.getEndpointOverride(Service.S3).toString(),
-                            localstack.getRegion()
-                        )
-                            .getServiceEndpoint()
-                    );
+                    .isEqualTo(localstack.getEndpointOverride(Service.S3).toString());
             } finally {
                 localstack.stop();
             }
@@ -119,21 +108,9 @@ public void differentPortsAreExposed() {
                 assertThat(localstack.getEndpointOverride(Service.SQS).toString())
                     .as("Endpoint overrides are different")
                     .isNotEqualTo(localstack.getEndpointOverride(Service.S3).toString());
-                assertThat(
-                    new AwsClientBuilder.EndpointConfiguration(
-                        localstack.getEndpointOverride(Service.SQS).toString(),
-                        localstack.getRegion()
-                    )
-                        .getServiceEndpoint()
-                )
+                assertThat(localstack.getEndpointOverride(Service.SQS).toString())
                     .as("Endpoint configuration have different endpoints")
-                    .isNotEqualTo(
-                        new AwsClientBuilder.EndpointConfiguration(
-                            localstack.getEndpointOverride(Service.S3).toString(),
-                            localstack.getRegion()
-                        )
-                            .getServiceEndpoint()
-                    );
+                    .isNotEqualTo(localstack.getEndpointOverride(Service.S3).toString());
             } finally {
                 localstack.stop();
             }