diff --git a/docs/src/main/asciidoc/testing.adoc b/docs/src/main/asciidoc/testing.adoc index 31a5ef3e6..3d705ea29 100644 --- a/docs/src/main/asciidoc/testing.adoc +++ b/docs/src/main/asciidoc/testing.adoc @@ -41,7 +41,7 @@ class LocalstackAwsClientFactoryTest { @Container private LocalStackContainer localStackContainer = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); @Test void aTest() { diff --git a/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLoaderIntegrationTests.java b/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLoaderIntegrationTests.java index e3aabf0d1..f51659080 100644 --- a/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLoaderIntegrationTests.java +++ b/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/parameterstore/ParameterStoreConfigDataLoaderIntegrationTests.java @@ -70,7 +70,7 @@ class ParameterStoreConfigDataLoaderIntegrationTests { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); @BeforeAll static void beforeAll() { diff --git a/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java b/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java index 791e78e9d..37b41bd30 100644 --- a/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java +++ b/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java @@ -31,6 +31,7 @@ import java.time.Duration; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -74,7 +75,7 @@ class SecretsManagerConfigDataLoaderIntegrationTests { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); @TempDir static Path tokenTempDir; @@ -147,14 +148,16 @@ void resolvesPropertyFromSecretsManager_PlainTextSecret_endingWithSlash() { } @Test + @Disabled void resolvesPropertyFromSecretsManager_SecretBinary() { SpringApplication application = new SpringApplication(App.class); application.setWebApplicationType(WebApplicationType.NONE); try (ConfigurableApplicationContext context = runApplication(application, "aws-secretsmanager:/blob/byte_certificate")) { - assertThat(context.getEnvironment().getProperty("byte_certificate", byte[].class)) - .isEqualTo("My certificate".getBytes(StandardCharsets.UTF_8)); + byte[] byteCertificates = context.getEnvironment().getProperty("byte_certificate", byte[].class); + System.out.println(new String(byteCertificates, StandardCharsets.UTF_8)); + assertThat(byteCertificates).isEqualTo("My certificate".getBytes(StandardCharsets.UTF_8)); } } diff --git a/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/metrics/CloudWatchExportAutoConfigurationIntegrationTests.java b/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/metrics/CloudWatchExportAutoConfigurationIntegrationTests.java index d4f12cfa6..45983439c 100644 --- a/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/metrics/CloudWatchExportAutoConfigurationIntegrationTests.java +++ b/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/metrics/CloudWatchExportAutoConfigurationIntegrationTests.java @@ -53,7 +53,7 @@ class CloudWatchExportAutoConfigurationIntegrationTests { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); @DynamicPropertySource static void registerProperties(DynamicPropertyRegistry registry) { diff --git a/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/sqs/SqsAutoConfigurationIntegrationTest.java b/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/sqs/SqsAutoConfigurationIntegrationTest.java index f2adce05f..d07561b3f 100644 --- a/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/sqs/SqsAutoConfigurationIntegrationTest.java +++ b/spring-cloud-aws-autoconfigure/src/test/java/io/awspring/cloud/autoconfigure/sqs/SqsAutoConfigurationIntegrationTest.java @@ -58,7 +58,7 @@ class SqsAutoConfigurationIntegrationTest { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); static { localstack.start(); diff --git a/spring-cloud-aws-dynamodb/src/test/java/io/awspring/cloud/dynamodb/DynamoDbTemplateIntegrationTest.java b/spring-cloud-aws-dynamodb/src/test/java/io/awspring/cloud/dynamodb/DynamoDbTemplateIntegrationTest.java index 45e5d2c47..31d839f16 100644 --- a/spring-cloud-aws-dynamodb/src/test/java/io/awspring/cloud/dynamodb/DynamoDbTemplateIntegrationTest.java +++ b/spring-cloud-aws-dynamodb/src/test/java/io/awspring/cloud/dynamodb/DynamoDbTemplateIntegrationTest.java @@ -59,7 +59,7 @@ public class DynamoDbTemplateIntegrationTest { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); @BeforeAll public static void createTable() { diff --git a/spring-cloud-aws-modulith/spring-cloud-aws-modulith-events-sns/src/test/java/io/awspring/cloud/modulith/events/sns/SnsEventPublicationIntegrationTests.java b/spring-cloud-aws-modulith/spring-cloud-aws-modulith-events-sns/src/test/java/io/awspring/cloud/modulith/events/sns/SnsEventPublicationIntegrationTests.java index 5cb1b8778..34205bbe7 100644 --- a/spring-cloud-aws-modulith/spring-cloud-aws-modulith-events-sns/src/test/java/io/awspring/cloud/modulith/events/sns/SnsEventPublicationIntegrationTests.java +++ b/spring-cloud-aws-modulith/spring-cloud-aws-modulith-events-sns/src/test/java/io/awspring/cloud/modulith/events/sns/SnsEventPublicationIntegrationTests.java @@ -57,7 +57,7 @@ static class TestConfiguration { @Bean LocalStackContainer localStackContainer(DynamicPropertyRegistry registry) { - var localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.2.0")); + var localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.7.2")); registry.add("spring.cloud.aws.endpoint", localstack::getEndpoint); registry.add("spring.cloud.aws.credentials.access-key", localstack::getAccessKey); diff --git a/spring-cloud-aws-modulith/spring-cloud-aws-modulith-events-sqs/src/test/java/io/awspring/cloud/modulith/events/sqs/SqsEventPublicationIntegrationTests.java b/spring-cloud-aws-modulith/spring-cloud-aws-modulith-events-sqs/src/test/java/io/awspring/cloud/modulith/events/sqs/SqsEventPublicationIntegrationTests.java index 06bfec031..cdf1b9195 100644 --- a/spring-cloud-aws-modulith/spring-cloud-aws-modulith-events-sqs/src/test/java/io/awspring/cloud/modulith/events/sqs/SqsEventPublicationIntegrationTests.java +++ b/spring-cloud-aws-modulith/spring-cloud-aws-modulith-events-sqs/src/test/java/io/awspring/cloud/modulith/events/sqs/SqsEventPublicationIntegrationTests.java @@ -55,7 +55,7 @@ static class TestConfiguration { @Bean LocalStackContainer localStackContainer(DynamicPropertyRegistry registry) { - var localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.2.0")); + var localstack = new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.7.2")); registry.add("spring.cloud.aws.endpoint", localstack::getEndpoint); registry.add("spring.cloud.aws.credentials.access-key", localstack::getAccessKey); diff --git a/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3PathMatchingResourcePatternResolverTests.java b/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3PathMatchingResourcePatternResolverTests.java index 13dd66c96..6ee8682f2 100644 --- a/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3PathMatchingResourcePatternResolverTests.java +++ b/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3PathMatchingResourcePatternResolverTests.java @@ -41,7 +41,7 @@ class S3PathMatchingResourcePatternResolverTests { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); private static ResourcePatternResolver resourceLoader; diff --git a/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java b/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java index 66c7af924..a5aa151c4 100644 --- a/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java +++ b/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java @@ -69,7 +69,7 @@ class S3ResourceIntegrationTests { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); private static S3Client client; private static S3AsyncClient asyncClient; diff --git a/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java b/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java index 5ed008a62..cd59f90ff 100644 --- a/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java +++ b/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java @@ -70,7 +70,7 @@ class S3TemplateIntegrationTests { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); private static S3Client client; diff --git a/spring-cloud-aws-samples/docker-compose.yml b/spring-cloud-aws-samples/docker-compose.yml index 5d44f6ada..11eaec4e7 100644 --- a/spring-cloud-aws-samples/docker-compose.yml +++ b/spring-cloud-aws-samples/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: localstack: container_name: "${LOCALSTACK_DOCKER_NAME-localstack_main}" - image: localstack/localstack:3.2.0 + image: localstack/localstack:3.7.2 ports: - "127.0.0.1:4566:4566" # LocalStack Gateway - "127.0.0.1:4510-4559:4510-4559" # external services port range diff --git a/spring-cloud-aws-samples/spring-cloud-aws-dynamodb-sample/src/test/java/io/awspring/cloud/samples/dynamodb/AppTest.java b/spring-cloud-aws-samples/spring-cloud-aws-dynamodb-sample/src/test/java/io/awspring/cloud/samples/dynamodb/AppTest.java index a2c9d397d..360f0b8b7 100644 --- a/spring-cloud-aws-samples/spring-cloud-aws-dynamodb-sample/src/test/java/io/awspring/cloud/samples/dynamodb/AppTest.java +++ b/spring-cloud-aws-samples/spring-cloud-aws-dynamodb-sample/src/test/java/io/awspring/cloud/samples/dynamodb/AppTest.java @@ -37,7 +37,7 @@ static class AppConfiguration { @Bean @ServiceConnection LocalStackContainer localStackContainer() { - return new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.2.0")); + return new LocalStackContainer(DockerImageName.parse("localstack/localstack:3.7.2")); } } diff --git a/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/integration/SnsTemplateIntegrationTest.java b/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/integration/SnsTemplateIntegrationTest.java index e6cc2d63d..b9ce09e02 100644 --- a/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/integration/SnsTemplateIntegrationTest.java +++ b/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/integration/SnsTemplateIntegrationTest.java @@ -62,7 +62,7 @@ class SnsTemplateIntegrationTest { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); @BeforeAll public static void createSnsTemplate() { diff --git a/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/sms/SnsSmsTemplateIntegrationTest.java b/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/sms/SnsSmsTemplateIntegrationTest.java index e744614ce..295d656ee 100644 --- a/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/sms/SnsSmsTemplateIntegrationTest.java +++ b/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/sms/SnsSmsTemplateIntegrationTest.java @@ -42,7 +42,7 @@ class SnsSmsTemplateIntegrationTest { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")).withEnv("DEBUG", "1"); + DockerImageName.parse("localstack/localstack:3.7.2")).withEnv("DEBUG", "1"); @BeforeAll public static void createSnsTemplate() { diff --git a/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java b/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java index 3b5e83d14..10df26d08 100644 --- a/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java +++ b/spring-cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java @@ -48,7 +48,7 @@ abstract class BaseSqsIntegrationTest { protected static boolean waitForPurge = false; - private static final String LOCAL_STACK_VERSION = "localstack/localstack:3.2.0"; + private static final String LOCAL_STACK_VERSION = "localstack/localstack:3.7.2"; static LocalStackContainer localstack = new LocalStackContainer(DockerImageName.parse(LOCAL_STACK_VERSION)); diff --git a/spring-cloud-aws-test/src/test/java/io/awspring/cloud/test/sqs/BaseSqsIntegrationTest.java b/spring-cloud-aws-test/src/test/java/io/awspring/cloud/test/sqs/BaseSqsIntegrationTest.java index a2c155dd0..9e71d4d1f 100644 --- a/spring-cloud-aws-test/src/test/java/io/awspring/cloud/test/sqs/BaseSqsIntegrationTest.java +++ b/spring-cloud-aws-test/src/test/java/io/awspring/cloud/test/sqs/BaseSqsIntegrationTest.java @@ -31,7 +31,7 @@ abstract class BaseSqsIntegrationTest { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); @BeforeAll static void beforeAll() throws IOException, InterruptedException { diff --git a/spring-cloud-aws-testcontainers/src/test/java/io/awspring/cloud/testcontainers/AwsContainerConnectionDetailsFactoryTest.java b/spring-cloud-aws-testcontainers/src/test/java/io/awspring/cloud/testcontainers/AwsContainerConnectionDetailsFactoryTest.java index 65d570c0f..414ca8963 100644 --- a/spring-cloud-aws-testcontainers/src/test/java/io/awspring/cloud/testcontainers/AwsContainerConnectionDetailsFactoryTest.java +++ b/spring-cloud-aws-testcontainers/src/test/java/io/awspring/cloud/testcontainers/AwsContainerConnectionDetailsFactoryTest.java @@ -51,7 +51,7 @@ class AwsContainerConnectionDetailsFactoryTest { @Container @ServiceConnection static final LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); @Autowired(required = false) private AwsConnectionDetails connectionDetails; diff --git a/spring-cloud-aws-testcontainers/src/test/java/io/awspring/cloud/testcontainers/LocalstackAwsClientFactoryTest.java b/spring-cloud-aws-testcontainers/src/test/java/io/awspring/cloud/testcontainers/LocalstackAwsClientFactoryTest.java index f1f00e1af..7d548491e 100644 --- a/spring-cloud-aws-testcontainers/src/test/java/io/awspring/cloud/testcontainers/LocalstackAwsClientFactoryTest.java +++ b/spring-cloud-aws-testcontainers/src/test/java/io/awspring/cloud/testcontainers/LocalstackAwsClientFactoryTest.java @@ -34,7 +34,7 @@ class LocalstackAwsClientFactoryTest { @Container private LocalStackContainer localStackContainer = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:3.2.0")); + DockerImageName.parse("localstack/localstack:3.7.2")); @Test void createsClient() {