From caf1e84f1dd4af3427f29fd39f40145cf9cb80eb Mon Sep 17 00:00:00 2001 From: matejnedic Date: Sat, 4 Nov 2023 00:25:46 +0100 Subject: [PATCH] Code cleanup --- ...meterStoreConfigDataLoaderIntegrationTests.java | 14 +++++++------- ...etsManagerConfigDataLoaderIntegrationTests.java | 14 +++++++------- ...tchExportAutoConfigurationIntegrationTests.java | 4 ++-- .../sqs/SqsAutoConfigurationIntegrationTest.java | 2 +- .../dynamodb/DynamoDbTemplateIntegrationTest.java | 2 +- .../CrossRegionS3ClientIntegrationTests.java | 2 +- ...S3PathMatchingResourcePatternResolverTests.java | 2 +- .../cloud/s3/S3ResourceIntegrationTests.java | 4 ++-- .../cloud/s3/S3TemplateIntegrationTests.java | 4 ++-- .../integration/SnsTemplateIntegrationTest.java | 4 ++-- .../sns/sms/SnsSmsTemplateIntegrationTest.java | 2 +- .../sqs/integration/BaseSqsIntegrationTest.java | 4 ++-- .../cloud/test/sqs/BaseSqsIntegrationTest.java | 2 +- 13 files changed, 30 insertions(+), 30 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 70ad29118..704fecc0f 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 @@ -195,7 +195,7 @@ void serviceSpecificEndpointTakesPrecedenceOverGlobalAwsRegion() { "--spring.config.import=aws-parameterstore:/config/spring/", "--spring.cloud.aws.parameterstore.region=" + REGION, "--spring.cloud.aws.endpoint=http://non-existing-host/", - "--spring.cloud.aws.parameterstore.endpoint=" + localstack.getEndpointOverride(SSM).toString(), + "--spring.cloud.aws.parameterstore.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1", "--logging.level.io.awspring.cloud.parameterstore=debug")) { @@ -210,7 +210,7 @@ void parameterStoreClientUsesGlobalRegion() { try (ConfigurableApplicationContext context = application.run( "--spring.config.import=aws-parameterstore:/config/spring/", - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SSM).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=" + REGION, "--logging.level.io.awspring.cloud.parameterstore=debug")) { @@ -263,7 +263,7 @@ void reloadsPropertiesWhenPropertyValueChanges() { "--spring.cloud.aws.parameterstore.reload.strategy=refresh", "--spring.cloud.aws.parameterstore.reload.period=PT1S", "--spring.cloud.aws.parameterstore.region=" + REGION, - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SSM).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1")) { assertThat(context.getEnvironment().getProperty("message")).isEqualTo("value from tests"); @@ -289,7 +289,7 @@ void reloadsPropertiesWhenNewPropertyIsAdded() { "--spring.cloud.aws.parameterstore.reload.strategy=refresh", "--spring.cloud.aws.parameterstore.reload.period=PT1S", "--spring.cloud.aws.parameterstore.region=" + REGION, - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SSM).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1")) { assertThat(context.getEnvironment().getProperty("message")).isEqualTo("value from tests"); @@ -314,7 +314,7 @@ void doesNotReloadPropertiesWhenReloadStrategyIsNotSet() { "--spring.config.import=aws-parameterstore:/config/spring/", "--spring.cloud.aws.parameterstore.reload.period=PT1S", "--spring.cloud.aws.parameterstore.region=" + REGION, - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SSM).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1")) { assertThat(context.getEnvironment().getProperty("message")).isEqualTo("value from tests"); @@ -340,7 +340,7 @@ void reloadsPropertiesWithRestartContextStrategy() { "--spring.cloud.aws.parameterstore.reload.strategy=restart_context", "--spring.cloud.aws.parameterstore.reload.period=PT1S", "--spring.cloud.aws.parameterstore.region=" + REGION, - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SSM).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--management.endpoint.restart.enabled=true", "--management.endpoints.web.exposure.include=restart", "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1")) { @@ -362,7 +362,7 @@ private ConfigurableApplicationContext runApplication(SpringApplication applicat String endpointProperty) { return application.run("--spring.config.import=" + springConfigImport, "--spring.cloud.aws.parameterstore.region=" + REGION, - "--" + endpointProperty + "=" + localstack.getEndpointOverride(SSM).toString(), + "--" + endpointProperty + "=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1", "--logging.level.io.awspring.cloud.parameterstore=debug"); } 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 33353c1d6..a8577205f 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 @@ -275,7 +275,7 @@ void serviceSpecificEndpointTakesPrecedenceOverGlobalAwsRegion() { "--spring.cloud.aws.secretsmanager.region=" + REGION, "--spring.cloud.aws.endpoint=http://non-existing-host/", "--spring.cloud.aws.secretsmanager.endpoint=" - + localstack.getEndpointOverride(SECRETSMANAGER).toString(), + + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1")) { assertThat(context.getEnvironment().getProperty("message")).isEqualTo("value from tests"); @@ -292,7 +292,7 @@ void secretsManagerClientUsesStsCredentials() throws IOException { try (ConfigurableApplicationContext context = application.run( "--spring.config.import=optional:aws-secretsmanager:/config/spring;/config/second", - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SECRETSMANAGER).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.region.static=" + REGION, "--spring.cloud.aws.credentials.sts.role-arn=develop", "--spring.cloud.aws.credentials.sts.enabled=true", "--spring.cloud.aws.credentials.sts.web-identity-token-file=" + tempFile.getAbsolutePath())) { @@ -308,7 +308,7 @@ void secretsManagerClientUsesGlobalRegion() { try (ConfigurableApplicationContext context = application.run( "--spring.config.import=aws-secretsmanager:/config/spring;/config/second", - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SECRETSMANAGER).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=" + REGION)) { assertThat(context.getEnvironment().getProperty("message")).isEqualTo("value from tests"); @@ -334,7 +334,7 @@ void reloadsProperties() { "--spring.cloud.aws.secretsmanager.region=" + REGION, "--spring.cloud.aws.secretsmanager.reload.strategy=refresh", "--spring.cloud.aws.secretsmanager.reload.period=PT1S", - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SECRETSMANAGER).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1", "--logging.level.io.awspring.cloud.secretsmanager=debug")) { @@ -360,7 +360,7 @@ void doesNotReloadPropertiesWhenMonitoringIsDisabled() { "--spring.config.import=aws-secretsmanager:/config/spring;/config/second", "--spring.cloud.aws.secretsmanager.region=" + REGION, "--spring.cloud.aws.secretsmanager.reload.period=PT1S", - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SECRETSMANAGER).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1", "--logging.level.io.awspring.cloud.secretsmanager=debug")) { @@ -389,7 +389,7 @@ void reloadsPropertiesWithRestartContextStrategy() { "--spring.cloud.aws.secretsmanager.reload.period=PT1S", "--spring.cloud.aws.secretsmanager.reload.max-wait-for-restart=PT1S", "--management.endpoint.restart.enabled=true", "--management.endpoints.web.exposure.include=restart", - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SECRETSMANAGER).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1", "--logging.level.io.awspring.cloud.secretsmanager=debug")) { @@ -415,7 +415,7 @@ private ConfigurableApplicationContext runApplication(SpringApplication applicat String endpointProperty) { return application.run("--spring.config.import=" + springConfigImport, "--spring.cloud.aws.secretsmanager.region=" + REGION, - "--" + endpointProperty + "=" + localstack.getEndpointOverride(SECRETSMANAGER).toString(), + "--" + endpointProperty + "=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=eu-west-1", "--logging.level.io.awspring.cloud.secretsmanager=debug"); } 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 3ed481e98..524a7149c 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 @@ -60,7 +60,7 @@ class CloudWatchExportAutoConfigurationIntegrationTests { @DynamicPropertySource static void registerProperties(DynamicPropertyRegistry registry) { registry.add("spring.cloud.aws.cloudwatch.endpoint", - () -> localstack.getEndpointOverride(CLOUDWATCH).toString()); + () -> localstack.getEndpoint()); } @Test @@ -70,7 +70,7 @@ void testCounter() { application.setWebApplicationType(WebApplicationType.NONE); try (ConfigurableApplicationContext context = application.run( - "--spring.cloud.aws.endpoint=" + localstack.getEndpointOverride(SSM).toString(), + "--spring.cloud.aws.endpoint=" + localstack.getEndpoint(), "--spring.cloud.aws.credentials.access-key=noop", "--spring.cloud.aws.credentials.secret-key=noop", "--spring.cloud.aws.region.static=us-east-1", "--management.cloudwatch.metrics.export.step=5s", "--management.cloudwatch.metrics.export.namespace=awspring/spring-cloud-aws", 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 5f4ea0cd5..bce7b1adc 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 @@ -52,7 +52,7 @@ class SqsAutoConfigurationIntegrationTest { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withPropertyValues("spring.cloud.aws.sqs.region=eu-west-1", - "spring.cloud.aws.sqs.endpoint=" + localstack.getEndpointOverride(SQS).toString(), + "spring.cloud.aws.sqs.endpoint=" + localstack.getEndpoint(), "spring.cloud.aws.credentials.access-key=noop", "spring.cloud.aws.credentials.secret-key=noop", "spring.cloud.aws.region.static=eu-west-1") .withConfiguration(AutoConfigurations.of(RegionProviderAutoConfiguration.class, 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 fe7d2a9d2..b71870086 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 @@ -65,7 +65,7 @@ public class DynamoDbTemplateIntegrationTest { @BeforeAll public static void createTable() { DynamoDbClient dynamoDbClient = DynamoDbClient.builder() - .endpointOverride(localstack.getEndpointOverride(DYNAMODB)).region(Region.of(localstack.getRegion())) + .endpointOverride(localstack.getEndpoint()).region(Region.of(localstack.getRegion())) .credentialsProvider(StaticCredentialsProvider .create(AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey()))) .build(); 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 cca7230b3..b8dcdc369 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 @@ -57,7 +57,7 @@ static void beforeAll() { .create(AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())); client = new CrossRegionS3Client( S3Client.builder().region(Region.of(localstack.getRegion())).credentialsProvider(credentialsProvider) - .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3))); + .endpointOverride(localstack.getEndpoint())); } @Test 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 b89d584c7..aea588ae8 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 @@ -53,7 +53,7 @@ static void beforeAll() { .create(AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())); S3Client client = S3Client.builder().region(Region.of(localstack.getRegion())) .credentialsProvider(credentialsProvider) - .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3)).build(); + .endpointOverride(localstack.getEndpoint()).build(); // prepare buckets and objects for tests client.createBucket(request -> request.bucket("my-bucket")); 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 4c49bd285..46fc5f65d 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 @@ -91,10 +91,10 @@ static void beforeAll() { StaticCredentialsProvider credentialsProvider = StaticCredentialsProvider .create(AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())); asyncClient = S3AsyncClient.builder().region(Region.of(localstack.getRegion())) - .credentialsProvider(credentialsProvider).endpointOverride(localstack.getEndpointOverride(Service.S3)) + .credentialsProvider(credentialsProvider).endpointOverride(localstack.getEndpoint()) .build(); client = S3Client.builder().region(Region.of(localstack.getRegion())).credentialsProvider(credentialsProvider) - .endpointOverride(localstack.getEndpointOverride(Service.S3)).build(); + .endpointOverride(localstack.getEndpoint()).build(); s3TransferManager = S3TransferManager.builder().s3Client(asyncClient).build(); client.createBucket(request -> request.bucket("first-bucket")); } 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 718df61c2..afadd2628 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 @@ -83,10 +83,10 @@ static void beforeAll() { StaticCredentialsProvider credentialsProvider = StaticCredentialsProvider .create(AwsBasicCredentials.create(localstack.getAccessKey(), localstack.getSecretKey())); client = S3Client.builder().region(Region.of(localstack.getRegion())).credentialsProvider(credentialsProvider) - .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3)).build(); + .endpointOverride(localstack.getEndpoint()).build(); presigner = S3Presigner.builder().region(Region.of(localstack.getRegion())) .credentialsProvider(credentialsProvider) - .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3)).build(); + .endpointOverride(localstack.getEndpoint()).build(); } @BeforeEach 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 3ff39bd43..5c3d6248e 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 @@ -68,11 +68,11 @@ class SnsTemplateIntegrationTest { @BeforeAll public static void createSnsTemplate() { - snsClient = SnsClient.builder().endpointOverride(localstack.getEndpointOverride(SNS)) + snsClient = SnsClient.builder().endpointOverride(localstack.getEndpoint()) .region(Region.of(localstack.getRegion())) .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("noop", "noop"))) .build(); - sqsClient = SqsClient.builder().endpointOverride(localstack.getEndpointOverride(SQS)) + sqsClient = SqsClient.builder().endpointOverride(localstack.getEndpoint()) .region(Region.of(localstack.getRegion())) .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("noop", "noop"))) .build(); 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 ba526e3d4..40227793c 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 @@ -47,7 +47,7 @@ class SnsSmsTemplateIntegrationTest { @BeforeAll public static void createSnsTemplate() { - SnsClient snsClient = SnsClient.builder().endpointOverride(localstack.getEndpointOverride(SNS)) + SnsClient snsClient = SnsClient.builder().endpointOverride(localstack.getEndpoint()) .region(Region.of(localstack.getRegion())) .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("noop", "noop"))) .build(); 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 bd7189beb..f720e9f8d 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 @@ -66,7 +66,7 @@ static synchronized void beforeAll() { @DynamicPropertySource static void registerSqsProperties(DynamicPropertyRegistry registry) { // overwrite SQS endpoint with one provided by LocalStack - registry.add("spring.cloud.aws.endpoint", () -> localstack.getEndpointOverride(SQS).toString()); + registry.add("spring.cloud.aws.endpoint", () -> localstack.getEndpoint()); } protected static CompletableFuture createQueue(SqsAsyncClient client, String queueName) { @@ -130,7 +130,7 @@ protected static SqsAsyncClient createHighThroughputAsyncClient() { private static SqsAsyncClient createLocalStackClient() { return SqsAsyncClient.builder().credentialsProvider(credentialsProvider) - .endpointOverride(localstack.getEndpointOverride(SQS)).region(Region.of(localstack.getRegion())) + .endpointOverride(localstack.getEndpoint()).region(Region.of(localstack.getRegion())) .build(); } 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 9b6e8a0bc..74b453049 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 @@ -43,7 +43,7 @@ static void beforeAll() throws IOException, InterruptedException { @DynamicPropertySource static void registerSqsProperties(DynamicPropertyRegistry registry) { // overwrite SQS endpoint with one provided by LocalStack - registry.add("spring.cloud.aws.sqs.endpoint", () -> localstack.getEndpointOverride(SQS).toString()); + registry.add("spring.cloud.aws.sqs.endpoint", () -> localstack.getEndpoint()); } }