Merge branch 'localstack-master' into master

* localstack-master: (27 commits)
  Added tests to show the exception on the SES client V2
  release version v0.2.15
  refactor logging config; fix Kinesis CBOR tests
  fix project setup and classpath for SDK v1/v2 utils
  fix awaiting results in tests using async clients
  adjust CI config to use new make targets; fix imports for SDK v1/v2 compatibility
  refactor classpath setup for v1/v2 SDKs; fall back to using edge port if port mapping cannot be determined from container
  add ability to get handler class name through "_HANDLER" environment variable like in real AWS (localstack#67)
  implement empty methods in `LambdaContext` (localstack#66)
  release version 0.2.13
  increate number of scanned log lines to 100 when searching for "Ready." token (localstack#64)
  consider Windows EOL when listing images (localstack#65)
  release version 0.2.11
  fix endpoint URL for getClientLambdaAsyncV2 (localstack#60)
  add simple tests for IAM service (localstack#62)
  read port config file in multiple locations for different Python versions in the container (localstack#59)
  Bump logback-classic from 1.0.13 to 1.2.0 (localstack#56)
  log which image is being pulled (localstack#58)
  Bump commons-io from 2.6 to 2.7 (localstack#53)
  add simple test for KMS (localstack#54)
  ...

Author: fripoli

.gitignore

@@ -29,3 +29,5 @@ hs_err_pid*
 .classpath
 .settings
 .project
+
+.vscode

.travis.yml

@@ -15,9 +15,9 @@ install:
 
 script:
   - set -e
-  - mvn -q -DskipTests test
-  - docker pull localstack/localstack-light > /dev/null
-  - docker tag localstack/localstack-light localstack/localstack
+  - nohup docker pull localstack/localstack > /dev/null &
+  - make compile
+  - MVN_TEST_ARGS="-q -DskipTests" make test
   - make test
   - docker ps -a
 

Makefile

@@ -6,15 +6,18 @@ usage:           ## Show this help
 build:           ## Build the code using Maven
 	mvn -Pfatjar $(ADDITIONAL_MVN_ARGS) clean javadoc:jar source:jar package $(ADDITIONAL_MVN_TARGETS)
 
+compile:
+	mvn -Pawssdkv1,awssdkv2 $(ADDITIONAL_MVN_ARGS) -DskipTests compile test-compile
+
 publish-maven:   ## Publish artifacts to Maven Central
-	ADDITIONAL_MVN_TARGETS=deploy ADDITIONAL_MVN_ARGS=" " make build
+	ADDITIONAL_MVN_TARGETS=deploy ADDITIONAL_MVN_ARGS="-DskipTests -Pawssdkv1,awssdkv2" make build
 
 test-v1:
-	USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,iam,cloudwatch mvn -Pawssdkv1 \
-                -Dtest="!cloud.localstack.awssdkv2.*Test" test
+	USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,iam,cloudwatch mvn $(MVN_TEST_ARGS) -Pawssdkv1 \
+		-Dtest="cloud.localstack.awssdkv1.*Test" test
 
 test-v2:
-	USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,iam,cloudwatch mvn -Pawssdkv2 \
+	USE_SSL=1 SERVICES=serverless,kinesis,sns,sqs,iam,cloudwatch mvn $(MVN_TEST_ARGS) -Pawssdkv2 \
 		-Dtest="cloud.localstack.awssdkv2.*Test" test
 
 test:            ## Run Java/JUnit tests for AWS SDK v1 and v2

README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/localstack/localstack-java-utils.svg)](https://travis-ci.org/localstack/localstack-java-utils)
+[![Build Status](https://travis-ci.com/localstack/localstack-java-utils.svg)](https://travis-ci.com/localstack/localstack-java-utils)
+[![Maven Central](https://img.shields.io/maven-central/v/cloud.localstack/localstack-utils)](https://mvnrepository.com/artifact/cloud.localstack/localstack-utils)
 
 # LocalStack Java Utils
 
@@ -19,7 +20,7 @@ extension. Take a look at the example JUnit tests in `src/test/java`.
 By default, the JUnit Test Runner starts LocalStack in a Docker container, for the duration of the test.
 The container can be configured by using the `@LocalstackDockerProperties` annotation.
 
-```
+```java
 ...
 import cloud.localstack.LocalstackTestRunner;
 import cloud.localstack.ServiceName;
@@ -42,7 +43,7 @@ public class MyCloudAppTest {
 
 Or with JUnit 5:
 
-```
+```java
 @ExtendWith(LocalstackDockerExtension.class)
 @LocalstackDockerProperties(...)
 public class MyCloudAppTest {
@@ -55,11 +56,11 @@ public class MyCloudAppTest {
 The LocalStack JUnit test runner is published as an artifact in Maven Central.
 Simply add the following dependency to your `pom.xml` file:
 
-```
+```xml
 <dependency>
     <groupId>cloud.localstack</groupId>
     <artifactId>localstack-utils</artifactId>
-    <version>0.2.7</version>
+    <version>0.2.15</version>
 </dependency>
 ```
 
@@ -76,8 +77,10 @@ You can configure the Docker behaviour using the `@LocalstackDockerProperties` a
 | `portEdge`                  | Port number for the edge service, the main entry point for all API invocations                                               | String                       | `4566`        |
 | `portElasticSearch`         | Port number for the elasticsearch service                                                                                    | String                       | `4571`        |
 | `hostNameResolver`          | Used for determining the host name of the machine running the docker containers so that the containers can be addressed.     | IHostNameResolver            | `localhost`     |
-| `environmentVariableProvider` | Used for injecting environment variables into the container.                                                                 | IEnvironmentVariableProvider | Empty Map     |
-| `useSingleDockerContainer`  | Whether a singleton container should be used by all test classes.                     | boolean | `false`     |
+| `environmentVariableProvider` | Used for injecting environment variables into the container.                                                               | IEnvironmentVariableProvider | Empty Map     |
+| `bindMountProvider`         | Used bind mounting files and directories into the container, useful to run init scripts before using the container.          | IBindMountProvider           | Empty Map     |
+|  `initializationToken`      | Give a regex that will be searched in the logstream of the container, start is complete only when the token is found. Use with bindMountProvider to execute init scripts. | String | Empty String |
+| `useSingleDockerContainer`  | Whether a singleton container should be used by all test classes.                                                            | boolean | `false`     |
 
 For more details, please refer to the README of the main LocalStack repo: https://github.com/localstack/localstack
 
@@ -98,19 +101,74 @@ _Note: When specifying the port in the `services` property, you cannot use `rand
 ## Building
 
 To build the latest version of the code via Maven:
-```
+
+```sh
 make build
 ```
 
 ## Change Log
 
+* v0.2.15: Fix Kinesis CBOR tests; fix project setup and classpath for SDK v1/v2 utils; fix awaiting results in tests using async clients; refactor classpath setup for v1/v2 SDKs; fall back to using edge port if port mapping cannot be determined from container
+* v0.2.14: Add ability to get handler class name through `_HANDLER` environment variable like on real AWS and Lambci environment
+* v0.2.11: Enable specification of "platform" when configuring container
+* v0.2.10: Add Lambda async utils for AWS SDK v2; add support for specifying bind mounts and init scripts via `@LocalstackDockerProperties`; add PowerMock integration for easy patching of AWS SDK to use local endpoints; add support for configuring the Docker image name via `@LocalstackDockerProperties`; add tests for templated emails
+* v0.2.8: Allow overwriting the port binding via environment variables
 * v0.2.7: Extend `@LocalstackDockerProperties` to include port binding
 * v0.2.6: Add new path to possible docker exe locations in Windows; add various additional tests for v1 and v2 SDKs (Kinesis, SQS, SSM & SecretsManager, ...)
 * v0.2.5: Refactor code to accommodate edge port config for all services; add CloudWatch Logs endpoint configuration
 * v0.2.2: Addition of CloudWatch Logs endpoint configuration; adjust tests to use central edge service endpoint
 * v0.2.1: Move Java sources into separate project; mark non-Docker Java `LocalstackExtension` as deprecated; update paths for Python code lookup in Docker container
 * v0.2.0: Last version still maintained in LocalStack main repo
 
+## PowerMock
+
+You can use the PowerMock Library to call the builders default method and still get LocalStack version of the AWS clients.
+
+```java
+...
+@RunWith(PowerMockRunner.class)
+@PowerMockRunnerDelegate(LocalstackTestRunner.class)
+@LocalstackDockerProperties(services = { "ses" })
+@PrepareForTest({ AmazonSimpleEmailServiceClientBuilder.class, AmazonSimpleEmailServiceAsyncClientBuilder.class })
+@PowerMockIgnore({"javax.crypto.*", "org.hamcrest.*", "javax.net.ssl.*", "com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*", "javax.security.*", "org.w3c.*"})
+public class SESMessagingTest {
+....
+    @Before
+    public void mockSES() {
+        AmazonSimpleEmailService mockSes = TestUtils.getClientSES();
+        PowerMockito.mockStatic(AmazonSimpleEmailServiceClientBuilder.class);
+        when(AmazonSimpleEmailServiceClientBuilder.defaultClient()).thenReturn(mockSes);
+    }
+    @Test
+    public void testSendEmail() throws Exception {
+        AmazonSimpleEmailService client = amazonSimpleEmailServiceClientBuilder.defaultClient();
+    ....
+```
+
+## PowerMockLocalStack Utility
+
+This utility makes easier to use PowerMock with Localstack.
+
+```java
+...
+public class PowerMockLocalStackExampleTest extends PowerMockLocalStack{
+    private static final String TOPIC = "topic";
+    @Before
+    public void mock() {
+        PowerMockLocalStack.mockSNS();
+    }
+
+    @Test
+    public void testSendMessage() throws JMSException {
+        final AmazonSNS clientSNS = AmazonSNSClientBuilder.defaultClient();
+        ...
+    }
+}
+```
+
+## Acknowledgements
+I thank you [Keith Humphreys](https://gitlab.com/keithh), for showing us how to empower LocalStack with PowerMock to write tests even easier.
+
 ## License
 
 This code is released under the Apache License, Version 2.0 (see LICENSE.txt).