Code cleanup

awspring · Nov 3, 2023 · caf1e84 · caf1e84
1 parent 93d447a
commit caf1e84
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 30 deletions.
diff --git a/...d/autoconfigure/config/parameterstore/ParameterStoreConfigDataLoaderIntegrationTests.java b/...d/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/...d/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java b/...d/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/autoconfigure/metrics/CloudWatchExportAutoConfigurationIntegrationTests.java b/...spring/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/...rc/test/java/io/awspring/cloud/autoconfigure/sqs/SqsAutoConfigurationIntegrationTest.java b/...rc/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/...ws-dynamodb/src/test/java/io/awspring/cloud/dynamodb/DynamoDbTemplateIntegrationTest.java b/...ws-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/...t/src/test/java/io/awspring/cloud/s3/crossregion/CrossRegionS3ClientIntegrationTests.java b/...t/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/...aws-s3/src/test/java/io/awspring/cloud/s3/S3PathMatchingResourcePatternResolverTests.java b/...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/...nt/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3ResourceIntegrationTests.java b/...nt/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/...nt/spring-cloud-aws-s3/src/test/java/io/awspring/cloud/s3/S3TemplateIntegrationTests.java b/...nt/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/...d-aws-sns/src/test/java/io/awspring/cloud/sns/integration/SnsTemplateIntegrationTest.java b/...d-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/...-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/sms/SnsSmsTemplateIntegrationTest.java b/...-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/...cloud-aws-sqs/src/test/java/io/awspring/cloud/sqs/integration/BaseSqsIntegrationTest.java b/...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
@@ -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());
 	}
 
 }