Fix region on clients

Author: vitornp

src/main/java/xyz/fabiano/spring/localstack/legacy/LocalstackDocker.java

@@ -56,6 +56,7 @@ public class LocalstackDocker {
     @Setter
     private Collection<String> options = new ArrayList<>();
     @Setter
+    @Getter
     private String region = "us-east-1";
 
     @Getter

src/main/java/xyz/fabiano/spring/localstack/support/AbstractAmazonDockerClientsHolder.java

@@ -1,17 +1,17 @@
 package xyz.fabiano.spring.localstack.support;
 
 import cloud.localstack.TestUtils;
-
 import com.amazonaws.client.builder.AwsClientBuilder;
+import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import xyz.fabiano.spring.localstack.legacy.LocalstackDocker;
 
-import java.util.function.Supplier;
+import java.util.function.Function;
 
 public abstract class AbstractAmazonDockerClientsHolder implements AmazonClientsHolder {
 
-    LocalstackDocker localstackDocker;
+    private LocalstackDocker localstackDocker;
 
     AbstractAmazonDockerClientsHolder(LocalstackDocker localstackDocker) {
         this.localstackDocker = localstackDocker;
@@ -20,16 +20,21 @@ public abstract class AbstractAmazonDockerClientsHolder implements AmazonClients
     @Override
     public AmazonS3 amazonS3() {
         return decorateWithConfigsAndBuild(
-            AmazonS3ClientBuilder
-                .standard()
-                .enablePathStyleAccess(),
-            localstackDocker::getEndpointS3);
+            AmazonS3ClientBuilder.standard().enablePathStyleAccess(),
+            LocalstackDocker::getEndpointS3
+        );
     }
 
-    static <S, T extends AwsClientBuilder<T, S>> S decorateWithConfigsAndBuild(T builder, Supplier<String> endpointSupplier) {
+    <S, T extends AwsClientBuilder<T, S>> S decorateWithConfigsAndBuild(
+        T builder,
+        Function<LocalstackDocker, String> endpointFunction
+    ) {
         return builder
             .withCredentials(TestUtils.getCredentialsProvider())
-            .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endpointSupplier.get(), region))
+            .withEndpointConfiguration(new EndpointConfiguration(
+                endpointFunction.apply(localstackDocker),
+                localstackDocker.getRegion()
+            ))
             .build();
     }
 }

src/main/java/xyz/fabiano/spring/localstack/support/AmazonAsyncDockerClientsHolder.java

@@ -37,66 +37,105 @@ public AmazonAsyncDockerClientsHolder(LocalstackDocker localstackDocker) {
 
     @Override
     public AmazonSQSAsync amazonSQS() {
-        return decorateWithConfigsAndBuild(AmazonSQSAsyncClientBuilder.standard(), localstackDocker::getEndpointSQS);
+        return decorateWithConfigsAndBuild(
+            AmazonSQSAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointSQS
+        );
     }
 
     @Override
     public AmazonSNSAsync amazonSNS() {
-        return decorateWithConfigsAndBuild(AmazonSNSAsyncClientBuilder.standard(), localstackDocker::getEndpointSNS);
+        return decorateWithConfigsAndBuild(
+            AmazonSNSAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointSNS
+        );
     }
 
     @Override
     public AmazonKinesisAsync amazonKinesis() {
-        return decorateWithConfigsAndBuild(AmazonKinesisAsyncClientBuilder.standard(), localstackDocker::getEndpointKinesis);
+        return decorateWithConfigsAndBuild(
+            AmazonKinesisAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointKinesis
+        );
     }
 
     @Override
     public AmazonDynamoDBAsync amazonDynamoDB() {
-        return decorateWithConfigsAndBuild(AmazonDynamoDBAsyncClientBuilder.standard(), localstackDocker::getEndpointDynamoDB);
+        return decorateWithConfigsAndBuild(
+            AmazonDynamoDBAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointDynamoDB
+        );
     }
 
     @Override
     public AmazonDynamoDBStreamsAsync amazonDynamoDBStreams() {
-        return decorateWithConfigsAndBuild(AmazonDynamoDBStreamsAsyncClientBuilder.standard(), localstackDocker::getEndpointDynamoDBStreams);
+        return decorateWithConfigsAndBuild(
+            AmazonDynamoDBStreamsAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointDynamoDBStreams
+        );
     }
 
     @Override
     public AmazonSimpleEmailServiceAsync amazonSimpleEmailService() {
-        return decorateWithConfigsAndBuild(AmazonSimpleEmailServiceAsyncClientBuilder.standard(), localstackDocker::getEndpointSES);
+        return decorateWithConfigsAndBuild(
+            AmazonSimpleEmailServiceAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointSES
+        );
     }
 
     @Override
     public AmazonApiGatewayAsync amazonApiGateway() {
-        return decorateWithConfigsAndBuild(AmazonApiGatewayAsyncClientBuilder.standard(), localstackDocker::getEndpointAPIGateway);
+        return decorateWithConfigsAndBuild(
+            AmazonApiGatewayAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointAPIGateway
+        );
     }
 
     @Override
     public AmazonRedshiftAsync amazonRedshift() {
-        return decorateWithConfigsAndBuild(AmazonRedshiftAsyncClientBuilder.standard(), localstackDocker::getEndpointRedshift);
+        return decorateWithConfigsAndBuild(
+            AmazonRedshiftAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointRedshift
+        );
     }
 
     @Override
     public AmazonCloudWatchAsync amazonCloudWatch() {
-        return decorateWithConfigsAndBuild(AmazonCloudWatchAsyncClientBuilder.standard(), localstackDocker::getEndpointCloudWatch);
+        return decorateWithConfigsAndBuild(
+            AmazonCloudWatchAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointCloudWatch
+        );
     }
 
     @Override
     public AmazonCloudFormationAsync amazonCloudFormation() {
-        return decorateWithConfigsAndBuild(AmazonCloudFormationAsyncClientBuilder.standard(), localstackDocker::getEndpointCloudFormation);
+        return decorateWithConfigsAndBuild(
+            AmazonCloudFormationAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointCloudFormation
+        );
     }
 
     @Override
     public AmazonKinesisFirehoseAsync amazonKinesisFirehose() {
-        return decorateWithConfigsAndBuild(AmazonKinesisFirehoseAsyncClientBuilder.standard(), localstackDocker::getEndpointFirehose);
+        return decorateWithConfigsAndBuild(
+            AmazonKinesisFirehoseAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointFirehose
+        );
     }
 
     @Override
     public AmazonRoute53Async amazonRoute53() {
-        return decorateWithConfigsAndBuild(AmazonRoute53AsyncClientBuilder.standard(), localstackDocker::getEndpointRoute53);
+        return decorateWithConfigsAndBuild(
+            AmazonRoute53AsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointRoute53
+        );
     }
 
     @Override
     public AWSLambdaAsync awsLambda() {
-        return decorateWithConfigsAndBuild(AWSLambdaAsyncClientBuilder.standard(), localstackDocker::getEndpointLambda);
+        return decorateWithConfigsAndBuild(
+            AWSLambdaAsyncClientBuilder.standard(),
+            LocalstackDocker::getEndpointLambda
+        );
     }
-}
+}

src/main/java/xyz/fabiano/spring/localstack/support/AmazonClientsHolder.java

@@ -1,7 +1,5 @@
 package xyz.fabiano.spring.localstack.support;
 
-
-import com.amazonaws.regions.Regions;
 import com.amazonaws.services.apigateway.AmazonApiGateway;
 import com.amazonaws.services.cloudformation.AmazonCloudFormation;
 import com.amazonaws.services.cloudwatch.AmazonCloudWatch;
@@ -18,7 +16,6 @@
 import com.amazonaws.services.sqs.AmazonSQS;
 
 public interface AmazonClientsHolder {
-    String region = Regions.DEFAULT_REGION.getName();
 
     AmazonS3 amazonS3();
 

src/main/java/xyz/fabiano/spring/localstack/support/AmazonDockerClientsHolder.java

@@ -37,66 +37,105 @@ public AmazonDockerClientsHolder(LocalstackDocker localstackDocker) {
 
     @Override
     public AmazonSQS amazonSQS() {
-        return decorateWithConfigsAndBuild(AmazonSQSClientBuilder.standard(), localstackDocker::getEndpointSQS);
+        return decorateWithConfigsAndBuild(
+            AmazonSQSClientBuilder.standard(),
+            LocalstackDocker::getEndpointSQS
+        );
     }
 
     @Override
     public AmazonSNS amazonSNS() {
-        return decorateWithConfigsAndBuild(AmazonSNSClientBuilder.standard(), localstackDocker::getEndpointSNS);
+        return decorateWithConfigsAndBuild(
+            AmazonSNSClientBuilder.standard(),
+            LocalstackDocker::getEndpointSNS
+        );
     }
 
     @Override
     public AmazonKinesis amazonKinesis() {
-        return decorateWithConfigsAndBuild(AmazonKinesisClientBuilder.standard(), localstackDocker::getEndpointKinesis);
+        return decorateWithConfigsAndBuild(
+            AmazonKinesisClientBuilder.standard(),
+            LocalstackDocker::getEndpointKinesis
+        );
     }
 
     @Override
     public AmazonDynamoDB amazonDynamoDB() {
-        return decorateWithConfigsAndBuild(AmazonDynamoDBClientBuilder.standard(), localstackDocker::getEndpointDynamoDB);
+        return decorateWithConfigsAndBuild(
+            AmazonDynamoDBClientBuilder.standard(),
+            LocalstackDocker::getEndpointDynamoDB
+        );
     }
 
     @Override
     public AmazonDynamoDBStreams amazonDynamoDBStreams() {
-        return decorateWithConfigsAndBuild(AmazonDynamoDBStreamsClientBuilder.standard(), localstackDocker::getEndpointDynamoDBStreams);
+        return decorateWithConfigsAndBuild(
+            AmazonDynamoDBStreamsClientBuilder.standard(),
+            LocalstackDocker::getEndpointDynamoDBStreams
+        );
     }
 
     @Override
     public AmazonSimpleEmailService amazonSimpleEmailService() {
-        return decorateWithConfigsAndBuild(AmazonSimpleEmailServiceClientBuilder.standard(), localstackDocker::getEndpointSES);
+        return decorateWithConfigsAndBuild(
+            AmazonSimpleEmailServiceClientBuilder.standard(),
+            LocalstackDocker::getEndpointSES
+        );
     }
 
     @Override
     public AmazonApiGateway amazonApiGateway() {
-        return decorateWithConfigsAndBuild(AmazonApiGatewayClientBuilder.standard(), localstackDocker::getEndpointAPIGateway);
+        return decorateWithConfigsAndBuild(
+            AmazonApiGatewayClientBuilder.standard(),
+            LocalstackDocker::getEndpointAPIGateway
+        );
     }
 
     @Override
     public AmazonRedshift amazonRedshift() {
-        return decorateWithConfigsAndBuild(AmazonRedshiftClientBuilder.standard(), localstackDocker::getEndpointRedshift);
+        return decorateWithConfigsAndBuild(
+            AmazonRedshiftClientBuilder.standard(),
+            LocalstackDocker::getEndpointRedshift
+        );
     }
 
     @Override
     public AmazonCloudWatch amazonCloudWatch() {
-        return decorateWithConfigsAndBuild(AmazonCloudWatchClientBuilder.standard(), localstackDocker::getEndpointCloudWatch);
+        return decorateWithConfigsAndBuild(
+            AmazonCloudWatchClientBuilder.standard(),
+            LocalstackDocker::getEndpointCloudWatch
+        );
     }
 
     @Override
     public AmazonCloudFormation amazonCloudFormation() {
-        return decorateWithConfigsAndBuild(AmazonCloudFormationClientBuilder.standard(), localstackDocker::getEndpointCloudFormation);
+        return decorateWithConfigsAndBuild(
+            AmazonCloudFormationClientBuilder.standard(),
+            LocalstackDocker::getEndpointCloudFormation
+        );
     }
 
     @Override
     public AmazonKinesisFirehose amazonKinesisFirehose() {
-        return decorateWithConfigsAndBuild(AmazonKinesisFirehoseClientBuilder.standard(), localstackDocker::getEndpointFirehose);
+        return decorateWithConfigsAndBuild(
+            AmazonKinesisFirehoseClientBuilder.standard(),
+            LocalstackDocker::getEndpointFirehose
+        );
     }
 
     @Override
     public AmazonRoute53 amazonRoute53() {
-        return decorateWithConfigsAndBuild(AmazonRoute53ClientBuilder.standard(), localstackDocker::getEndpointRoute53);
+        return decorateWithConfigsAndBuild(
+            AmazonRoute53ClientBuilder.standard(),
+            LocalstackDocker::getEndpointRoute53
+        );
     }
 
     @Override
     public AWSLambda awsLambda() {
-        return decorateWithConfigsAndBuild(AWSLambdaClientBuilder.standard(), localstackDocker::getEndpointLambda);
+        return decorateWithConfigsAndBuild(
+            AWSLambdaClientBuilder.standard(),
+            LocalstackDocker::getEndpointLambda
+        );
     }
-}
+}