Merge branch 'master' into feature/localstack-version

galhardi · web-flow · commit f14ceddf60b9 · 2018-09-20T16:53:27.000-03:00
diff --git a/README.md b/README.md
@@ -99,6 +99,21 @@ spring.localstack.random-ports=true
 #   You can specify which is the Docker host for the container to use.
 ##
 spring.localstack.external-host=localhost
+
+##
+#   You can specify is container will be removed after stop. Default: true
+##
+spring.localstack.auto-remove=false
+
+##
+#   You can specify the extra-options for the container.
+##
+spring.localstack.extra-options=
+
+##
+#   You can specify which is the region. Default: us-east-1
+##
+spring.localstack.region=sa-east-1
 ```
 
 
diff --git a/src/main/java/xyz/fabiano/spring/localstack/LocalstackDockerBuilder.java b/src/main/java/xyz/fabiano/spring/localstack/LocalstackDockerBuilder.java
@@ -32,6 +32,8 @@ public class LocalstackDockerBuilder {
 
     private Collection<String> options = new ArrayList<>();
 
+    private String region = "us-east-1";
+
     public LocalstackDocker build() {
         if (!cborEnable) {
             TestUtils.setEnv("AWS_CBOR_DISABLE", "1");
@@ -47,6 +49,7 @@ public LocalstackDocker build() {
         docker.setEnvironmentVariables(environmentVariables);
         docker.setOptions(options);
         docker.setVersion(version);
+        docker.setRegion(region);
         return docker;
     }
 
@@ -134,4 +137,8 @@ public LocalstackDockerBuilder withVersion(String version) {
         return this;
     }
 
+    public LocalstackDockerBuilder withRegion(String region) {
+        this.region = region;
+        return this;
+    }
 }
diff --git a/src/main/java/xyz/fabiano/spring/localstack/annotation/SpringLocalstackProperties.java b/src/main/java/xyz/fabiano/spring/localstack/annotation/SpringLocalstackProperties.java
@@ -24,4 +24,6 @@
     boolean autoRemove() default true;
 
     String[] extraOptions() default {};
+
+    String region() default "us-east-1";
 }
diff --git a/src/main/java/xyz/fabiano/spring/localstack/autoconfigure/LocalstackAutoConfiguration.java b/src/main/java/xyz/fabiano/spring/localstack/autoconfigure/LocalstackAutoConfiguration.java
@@ -35,6 +35,7 @@ public class LocalstackAutoConfiguration {
     private final boolean autoRemove;
     private final String extraOptions;
     private final String version;
+    private final String region;
 
     public LocalstackAutoConfiguration(
         @Value("${spring.localstack.async-clients.enabled:false}") boolean asyncClientsEnabled,
@@ -45,6 +46,7 @@ public LocalstackAutoConfiguration(
         @Value("${spring.localstack.auto-remove:true}") boolean autoRemove,
         @Value("${spring.localstack.extra-options:}") String extraOptions,
         @Value("${spring.localstack.version:latest}") String version) {
+        @Value("${spring.localstack.region:us-east-1}") String region) {
         this.asyncClientsEnabled = asyncClientsEnabled;
         this.pullNewImage = pullNewImage;
         this.randomPorts = randomPorts;
@@ -53,6 +55,7 @@ public LocalstackAutoConfiguration(
         this.autoRemove = autoRemove;
         this.extraOptions = extraOptions;
         this.version = version;
+        this.region = region;
     }
 
     @Bean
@@ -65,6 +68,7 @@ public LocalstackDocker localstackDocker() {
             .withServices(services())
             .withOptions(options())
             .withVersion(version)
+            .withRegion(region)
             .build();
 
         localstackDocker.startup();
diff --git a/src/main/java/xyz/fabiano/spring/localstack/junit/SpringLocalstackDockerRunner.java b/src/main/java/xyz/fabiano/spring/localstack/junit/SpringLocalstackDockerRunner.java
@@ -33,6 +33,7 @@ public void run(RunNotifier notifier) {
             builder.withRandomPorts(p.randomPorts());
             builder.pullingNewImages(p.pullNewImage());
             builder.withOptions(options(p));
+            builder.withRegion(p.region());
         });
 
         LocalstackDocker docker = builder.build();
diff --git a/src/main/java/xyz/fabiano/spring/localstack/legacy/Container.java b/src/main/java/xyz/fabiano/spring/localstack/legacy/Container.java
@@ -31,6 +31,7 @@ public class Container {
     private static final int NUM_LOG_LINES = 10;
 
     private static final String LOCALSTACK_EXTERNAL_HOSTNAME = "HOSTNAME_EXTERNAL";
+    private static final String LOCALSTACK_DEFAULT_REGION = "DEFAULT_REGION";
 
     private final String containerId;
     private final List<PortMapping> ports;
@@ -49,9 +50,10 @@ public static Container createLocalstackContainer(String externalHostName,
                                                       boolean randomizePorts,
                                                       Map<String, String> environmentVariables,
                                                       Collection<String> options,
-                                                      String version) {
+                                                      String version,
+                                                      String region) {
         String imageName = LOCALSTACK_NAME + ":" + version;
-
+      
         if(pullNewImage) {
             LOG.info("Pulling latest image...");
             new PullCommand(imageName).execute();
@@ -62,6 +64,7 @@ public static Container createLocalstackContainer(String externalHostName,
                 .withExposedPorts(LOCALSTACK_PORTS, randomizePorts)
                 .withEnvironmentVariable(LOCALSTACK_EXTERNAL_HOSTNAME, externalHostName)
                 .withEnvironmentVariables(environmentVariables)
+                .withEnvironmentVariable(LOCALSTACK_DEFAULT_REGION, region)
                 .execute();
         LOG.info("Started container: " + containerId);
 
diff --git a/src/main/java/xyz/fabiano/spring/localstack/legacy/LocalstackDocker.java b/src/main/java/xyz/fabiano/spring/localstack/legacy/LocalstackDocker.java
@@ -57,6 +57,8 @@ public class LocalstackDocker {
     private Collection<String> options = new ArrayList<>();
     @Setter
     private String version = "latest";
+    @Getter
+    private String region = "us-east-1";
 
     @Getter
     private static LocalstackDocker localstackDocker = new LocalstackDocker();
@@ -71,7 +73,14 @@ public void startup() {
         locked = true;
 
         try {
-            localStackContainer = Container.createLocalstackContainer(externalHostName, pullNewImage, randomizePorts, environmentVariables, options, version);
+            localStackContainer = Container.createLocalstackContainer(
+                externalHostName,
+                pullNewImage,
+                randomizePorts,
+                environmentVariables,
+                options,
+                version,
+                region);
             loadServiceToPortMap();
 
             LOG.info("Waiting for localstack container to be ready...");
diff --git a/src/main/java/xyz/fabiano/spring/localstack/support/AbstractAmazonDockerClientsHolder.java b/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();
     }
 }
diff --git a/src/main/java/xyz/fabiano/spring/localstack/support/AmazonAsyncDockerClientsHolder.java b/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
+        );
     }
-}
+}
diff --git a/src/main/java/xyz/fabiano/spring/localstack/support/AmazonClientsHolder.java b/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();
 
diff --git a/src/main/java/xyz/fabiano/spring/localstack/support/AmazonDockerClientsHolder.java b/src/main/java/xyz/fabiano/spring/localstack/support/AmazonDockerClientsHolder.java

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,6 @@`
`24`	`24`	`boolean autoRemove() default true;`
`25`	`25`
`26`	`26`	`String[] extraOptions() default {};`
	`27`	`+`
	`28`	`+ String region() default "us-east-1";`
`27`	`29`	`}`