From 3c22c56c059f4734d0f3a3aa2002027309b818f2 Mon Sep 17 00:00:00 2001 From: Robert Strauch Date: Mon, 13 Nov 2023 17:47:44 +0100 Subject: [PATCH] Upgrade Localstack to 2.3.2 (#949) Closes #947 --- .../ParameterStoreConfigDataLoaderIntegrationTests.java | 2 +- .../SecretsManagerConfigDataLoaderIntegrationTests.java | 2 +- .../CloudWatchExportAutoConfigurationIntegrationTests.java | 2 +- .../autoconfigure/sqs/SqsAutoConfigurationIntegrationTest.java | 2 +- .../cloud/dynamodb/DynamoDbTemplateIntegrationTest.java | 2 +- .../s3/crossregion/CrossRegionS3ClientIntegrationTests.java | 2 +- .../cloud/s3/S3PathMatchingResourcePatternResolverTests.java | 2 +- .../java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java | 2 +- .../java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java | 2 +- spring-cloud-aws-samples/docker-compose.yml | 2 +- .../cloud/sns/integration/SnsTemplateIntegrationTest.java | 2 +- .../awspring/cloud/sns/sms/SnsSmsTemplateIntegrationTest.java | 2 +- .../awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java | 2 +- .../java/io/awspring/cloud/test/sqs/BaseSqsIntegrationTest.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) 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 6207146b1..60ea9ee22 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 @@ -69,7 +69,7 @@ class ParameterStoreConfigDataLoaderIntegrationTests { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:1.4.0")).withReuse(true); + DockerImageName.parse("localstack/localstack:2.3.2")).withReuse(true); @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 383a3ed43..eb1c4795c 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 @@ -74,7 +74,7 @@ class SecretsManagerConfigDataLoaderIntegrationTests { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:1.4.0")).withReuse(true); + DockerImageName.parse("localstack/localstack:2.3.2")).withReuse(true); @TempDir static Path tokenTempDir; 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 f712c5aeb..8a7af5cdf 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:1.4.0")); + DockerImageName.parse("localstack/localstack:2.3.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 2b5ac9166..11d94e22b 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 @@ -60,7 +60,7 @@ class SqsAutoConfigurationIntegrationTest { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:1.4.0")); + DockerImageName.parse("localstack/localstack:2.3.2")); @SuppressWarnings("unchecked") @Test 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 164834141..69ac7c6ea 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 @@ -60,7 +60,7 @@ public class DynamoDbTemplateIntegrationTest { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:1.4.0")).withServices(DYNAMODB).withReuse(true); + DockerImageName.parse("localstack/localstack:2.3.2")).withServices(DYNAMODB).withReuse(true); @BeforeAll public static void createTable() { diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientIntegrationTests.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientIntegrationTests.java index 3b7f3a9d5..7a2781f59 100644 --- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientIntegrationTests.java +++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3-cross-region-client/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientIntegrationTests.java @@ -45,7 +45,7 @@ class CrossRegionS3ClientIntegrationTests { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:1.4.0")); + DockerImageName.parse("localstack/localstack:2.3.2")); private static S3Client client; diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3PathMatchingResourcePatternResolverTests.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3PathMatchingResourcePatternResolverTests.java index c33cf5a8e..b1ca1180a 100644 --- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3PathMatchingResourcePatternResolverTests.java +++ b/spring-cloud-aws-s3-parent/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:1.4.0")).withReuse(true); + DockerImageName.parse("localstack/localstack:2.3.2")).withReuse(true); private static ResourcePatternResolver resourceLoader; diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java index a7844afce..23a22ecb9 100644 --- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java +++ b/spring-cloud-aws-s3-parent/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:1.4.0")).withReuse(true); + DockerImageName.parse("localstack/localstack:2.3.2")).withReuse(true); private static S3Client client; private static S3AsyncClient asyncClient; diff --git a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java index 01b2330e6..72b090530 100644 --- a/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java +++ b/spring-cloud-aws-s3-parent/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java @@ -69,7 +69,7 @@ class S3TemplateIntegrationTests { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:1.4.0")).withReuse(true); + DockerImageName.parse("localstack/localstack:2.3.2")).withReuse(true); private static S3Client client; diff --git a/spring-cloud-aws-samples/docker-compose.yml b/spring-cloud-aws-samples/docker-compose.yml index 681e995a8..4491f9c55 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:1.3.1 + image: localstack/localstack:2.3.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-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 4123778e1..1bf136e07 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 @@ -64,7 +64,7 @@ class SnsTemplateIntegrationTest { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:1.4.0")).withServices(SNS).withServices(SQS).withReuse(true); + DockerImageName.parse("localstack/localstack:2.3.2")).withServices(SNS).withServices(SQS).withReuse(true); @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 40227793c..988247186 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 @@ -43,7 +43,7 @@ class SnsSmsTemplateIntegrationTest { @Container static LocalStackContainer localstack = new LocalStackContainer( - DockerImageName.parse("localstack/localstack:1.4.0")).withServices(SNS).withEnv("DEBUG", "1"); + DockerImageName.parse("localstack/localstack:2.3.2")).withServices(SNS).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 19dbf7a44..50f76c35d 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 @@ -46,7 +46,7 @@ abstract class BaseSqsIntegrationTest { protected static final boolean purgeQueues = true; - private static final String LOCAL_STACK_VERSION = "localstack/localstack:1.4.0"; + private static final String LOCAL_STACK_VERSION = "localstack/localstack:2.3.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 bd3e2be4a..1bf21d951 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:1.4.0")).withReuse(true); + DockerImageName.parse("localstack/localstack:2.3.2")).withReuse(true); @BeforeAll static void beforeAll() throws IOException, InterruptedException {