fix project setup and classpath for SDK v1/v2 utils

Author: whummer

.travis.yml

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

Makefile

@@ -13,11 +13,11 @@ publish-maven:   ## Publish artifacts to Maven Central
 	ADDITIONAL_MVN_TARGETS=deploy ADDITIONAL_MVN_ARGS="-DskipTests" 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

pom.xml

@@ -201,6 +201,24 @@
         </profile>
         <profile>
             <id>awssdkv1</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/awssdkv2/**/*.java</exclude>
+                                <exclude>**/deprecated/**/*.java</exclude>
+                            </excludes>
+                            <testExcludes>
+                                <exclude>**/awssdkv2/**/*.java</exclude>
+                                <exclude>**/deprecated/**/*.java</exclude>
+                            </testExcludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
             <dependencies>
                 <dependency>
                     <groupId>com.amazonaws</groupId>
@@ -248,6 +266,24 @@
         </profile>
         <profile>
             <id>awssdkv2</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/awssdkv1/**/*.java</exclude>
+                                <exclude>**/deprecated/**/*.java</exclude>
+                            </excludes>
+                            <testExcludes>
+                                <exclude>**/awssdkv1/**/*.java</exclude>
+                                <exclude>**/deprecated/**/*.java</exclude>
+                            </testExcludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
             <dependencies>
                 <dependency>
                     <groupId>software.amazon.awssdk</groupId>
@@ -276,18 +312,6 @@
                     <version>${aws.sdkv2.version}</version>
                     <scope>provided</scope>
                 </dependency>
-                <dependency>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>sns</artifactId>
-                    <version>${aws.sdkv2.version}</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>sqs</artifactId>
-                    <version>${aws.sdkv2.version}</version>
-                    <scope>provided</scope>
-                </dependency>
                 <dependency>
                     <groupId>software.amazon.awssdk</groupId>
                     <artifactId>ssm</artifactId>
@@ -300,12 +324,6 @@
                     <version>${aws.sdkv2.version}</version>
                     <scope>provided</scope>
                 </dependency>
-                <dependency>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>kinesis</artifactId>
-                    <version>${aws.sdkv2.version}</version>
-                    <scope>provided</scope>
-                </dependency>
                 <dependency>
                     <groupId>software.amazon.awssdk</groupId>
                     <artifactId>s3</artifactId>
@@ -477,12 +495,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.21.0</version>
+                <version>2.22.1</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit4</artifactId>
-                        <version>2.21.0</version>
+                        <version>2.22.1</version>
                     </dependency>
                     <dependency>
                         <groupId>org.junit.platform</groupId>

src/test/java/cloud/localstack/CWMetricsTest.java renamed to src/test/java/cloud/localstack/awssdkv1/CWMetricsTest.java

@@ -1,6 +1,7 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
+import cloud.localstack.LocalstackTestRunner;
 import cloud.localstack.awssdkv1.TestUtils;
 
 import com.amazonaws.services.cloudwatch.AmazonCloudWatch;

src/test/java/cloud/localstack/CloudWatchLogsTest.java renamed to src/test/java/cloud/localstack/awssdkv1/CloudWatchLogsTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,6 +20,7 @@
 import com.amazonaws.services.logs.model.OutputLogEvent;
 import com.amazonaws.services.logs.model.PutLogEventsRequest;
 
+import cloud.localstack.LocalstackTestRunner;
 import cloud.localstack.awssdkv1.TestUtils;
 import cloud.localstack.docker.LocalstackDockerExtension;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;

src/test/java/cloud/localstack/DDBEventMappingTest.java renamed to src/test/java/cloud/localstack/awssdkv1/DDBEventMappingTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
 import cloud.localstack.lambda.DDBEventParser;
 import com.amazonaws.services.lambda.runtime.events.DynamodbEvent;

src/test/java/cloud/localstack/IAMTest.java renamed to src/test/java/cloud/localstack/awssdkv1/IAMTest.java

@@ -1,8 +1,9 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import cloud.localstack.LocalstackTestRunner;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import cloud.localstack.awssdkv1.TestUtils;
 

src/test/java/cloud/localstack/KMSTest.java renamed to src/test/java/cloud/localstack/awssdkv1/KMSTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
 import cloud.localstack.awssdkv1.PowerMockLocalStack;
 

src/test/java/cloud/localstack/KinesisConsumerTest.java renamed to src/test/java/cloud/localstack/awssdkv1/KinesisConsumerTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
 import cloud.localstack.LocalstackTestRunner;
 import cloud.localstack.awssdkv1.TestUtils;

src/test/java/cloud/localstack/KinesisEventMappingTest.java renamed to src/test/java/cloud/localstack/awssdkv1/KinesisEventMappingTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
 import cloud.localstack.lambda.KinesisEventParser;
 import com.amazonaws.services.lambda.runtime.events.KinesisEvent;

src/test/java/cloud/localstack/awssdkv1/LocalTestUtilSDKV1.java

@@ -0,0 +1,23 @@
+package cloud.localstack.awssdkv2;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.commons.io.IOUtils;
+import cloud.localstack.utils.LocalTestUtil;
+
+public class LocalTestUtilSDKV1 extends LocalTestUtil {
+
+	public static com.amazonaws.services.lambda.model.FunctionCode createFunctionCode(Class<?> clazz) throws Exception {
+		com.amazonaws.services.lambda.model.FunctionCode code = new com.amazonaws.services.lambda.model.FunctionCode();
+		code.setZipFile(createFunctionByteBuffer(clazz, false));
+		return code;
+	}
+
+}

src/test/java/cloud/localstack/PowerMockExampleTest.java renamed to src/test/java/cloud/localstack/awssdkv1/PowerMockExampleTest.java

@@ -1,5 +1,6 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
+import cloud.localstack.LocalstackTestRunner;
 import cloud.localstack.awssdkv1.TestUtils;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 
@@ -26,7 +27,6 @@
 /**
  * Test integration of SES messaging with LocalStack
  */
-// @RunWith(LocalstackTestRunner.class)
 @RunWith(PowerMockRunner.class)
 @PowerMockRunnerDelegate(LocalstackTestRunner.class)
 @LocalstackDockerProperties(services = { "sns" })

src/test/java/cloud/localstack/PowerMockLocalStackExampleTest.java renamed to src/test/java/cloud/localstack/awssdkv1/PowerMockLocalStackExampleTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
 import javax.jms.JMSException;
 

src/test/java/cloud/localstack/S3EventMappingTest.java renamed to src/test/java/cloud/localstack/awssdkv1/S3EventMappingTest.java

@@ -1,6 +1,5 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
-import cloud.localstack.lambda.S3EventParser;
 import com.amazonaws.services.lambda.runtime.events.S3Event;
 import com.amazonaws.services.s3.event.S3EventNotification;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -10,6 +9,8 @@
 import java.util.List;
 import java.util.Map;
 
+import cloud.localstack.lambda.S3EventParser;
+import cloud.localstack.LocalstackTestRunner;
 import static cloud.localstack.LambdaExecutor.get;
 import static cloud.localstack.LambdaExecutor.readFile;
 

src/test/java/cloud/localstack/S3FeaturesTest.java renamed to src/test/java/cloud/localstack/awssdkv1/S3FeaturesTest.java

@@ -1,8 +1,9 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import cloud.localstack.*;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import cloud.localstack.awssdkv1.TestUtils;
 

src/test/java/cloud/localstack/S3UploadTest.java renamed to src/test/java/cloud/localstack/awssdkv1/S3UploadTest.java

@@ -1,5 +1,6 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
+import cloud.localstack.LocalstackTestRunner;
 import cloud.localstack.awssdkv1.TestUtils;
 
 import static org.junit.Assert.assertEquals;

src/test/java/cloud/localstack/SESMessagingTest.java renamed to src/test/java/cloud/localstack/awssdkv1/SESMessagingTest.java

@@ -1,5 +1,6 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
+import cloud.localstack.LocalstackTestRunner;
 import cloud.localstack.awssdkv1.TestUtils;
 
 import java.util.UUID;

src/test/java/cloud/localstack/SNSMessagingTest.java renamed to src/test/java/cloud/localstack/awssdkv1/SNSMessagingTest.java

@@ -1,6 +1,7 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
-import cloud.localstack.utils.PromiseAsyncHandler;
+import cloud.localstack.LocalstackTestRunner;
+import cloud.localstack.awssdkv1.utils.PromiseAsyncHandler;
 import cloud.localstack.awssdkv1.TestUtils;
 
 import com.amazonaws.services.sns.AmazonSNS;

src/test/java/cloud/localstack/SQSMessagingTest.java renamed to src/test/java/cloud/localstack/awssdkv1/SQSMessagingTest.java

@@ -1,7 +1,8 @@
-package cloud.localstack;
+package cloud.localstack.awssdkv1;
 
-import cloud.localstack.utils.PromiseAsyncHandler;
+import cloud.localstack.*;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
+import cloud.localstack.awssdkv1.utils.PromiseAsyncHandler;
 import cloud.localstack.awssdkv1.TestUtils;
 
 import com.amazon.sqs.javamessaging.SQSConnection;

src/test/java/cloud/localstack/docker/BasicDockerFunctionalityTest.java renamed to src/test/java/cloud/localstack/awssdkv1/docker/BasicDockerFunctionalityTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack.sample;
+package cloud.localstack.awssdkv1.sample;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;

src/test/java/cloud/localstack/docker/ContainerTest.java renamed to src/test/java/cloud/localstack/awssdkv1/docker/ContainerTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack.sample;
+package cloud.localstack.awssdkv1.sample;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestStreamHandler;

src/test/java/cloud/localstack/docker/DockerOnlySQSFunctionalityTest.java renamed to src/test/java/cloud/localstack/awssdkv1/docker/DockerOnlySQSFunctionalityTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack.sample;
+package cloud.localstack.awssdkv1.sample;
 /*
  * Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *

src/test/java/cloud/localstack/docker/Junit5NestedTest.java renamed to src/test/java/cloud/localstack/awssdkv1/docker/Junit5NestedTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack.sample;
+package cloud.localstack.awssdkv1.sample;
 
 import cloud.localstack.awssdkv1.TestUtils;
 import com.amazonaws.services.lambda.runtime.Context;
@@ -19,12 +19,7 @@ public class SQSLambdaHandler implements RequestHandler<SQSEvent, Object> {
     protected AmazonS3 clientS3;
 
     public SQSLambdaHandler() {
-        try {
-            clientS3 = TestUtils.getClientS3();
-        } catch (Exception e) {
-            // fall back to deprecated TestUtils
-            clientS3 = cloud.localstack.deprecated.TestUtils.getClientS3();
-        }
+        clientS3 = TestUtils.getClientS3();
     }
 
     @Override

src/test/java/cloud/localstack/docker/LocalstackDockerPropertiesWithBindMountTest.java renamed to src/test/java/cloud/localstack/awssdkv1/docker/LocalstackDockerPropertiesWithBindMountTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack.sample;
+package cloud.localstack.awssdkv1.sample;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.amazonaws.services.lambda.runtime.RequestHandler;

src/test/java/cloud/localstack/docker/LocalstackDockerPropertiesWithImageNameTest.java renamed to src/test/java/cloud/localstack/awssdkv1/docker/LocalstackDockerPropertiesWithImageNameTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack.testcontainers;
+package cloud.localstack.awssdkv1.testcontainers;
 
 import cloud.localstack.Localstack;
 

src/test/java/cloud/localstack/docker/LocalstackDockerTest.java renamed to src/test/java/cloud/localstack/awssdkv1/docker/LocalstackDockerTest.java

@@ -1,4 +1,4 @@
-package cloud.localstack.utils;
+package cloud.localstack.awssdkv1.utils;
 
 import com.amazonaws.AmazonWebServiceRequest;
 import com.amazonaws.handlers.AsyncHandler;

src/test/java/cloud/localstack/docker/SingleContainerTest.java renamed to src/test/java/cloud/localstack/awssdkv1/docker/SingleContainerTest.java

@@ -4,7 +4,7 @@
 import cloud.localstack.LocalstackTestRunner;
 import cloud.localstack.docker.annotation.LocalstackDockerProperties;
 import cloud.localstack.sample.LambdaHandler;
-import cloud.localstack.utils.LocalTestUtil;
+import cloud.localstack.awssdkv2.LocalTestUtilSDKV2;
 
 import lombok.val;
 
@@ -166,22 +166,26 @@ public void testGetSsmParameter() throws Exception {
     @Test
     public void testGetSecretsManagerSecret() throws Exception {
         final SecretsManagerAsyncClient clientSecretsManager = TestUtils.getClientSecretsManagerAsyncV2();
+        final String secretName = "test-s-" + UUID.randomUUID().toString();
         clientSecretsManager.createSecret(
-            CreateSecretRequest.builder().name("testsecret").secretString("secretcontent").build()).join();
+            CreateSecretRequest.builder().name(secretName).secretString("secretcontent").build()).join();
         CompletableFuture<GetSecretValueResponse> getSecretResponse = clientSecretsManager.getSecretValue(
-            GetSecretValueRequest.builder().secretId("testsecret").build());
+            GetSecretValueRequest.builder().secretId(secretName).build());
         String secretValue = getSecretResponse.get().secretString();
 
         Assert.assertNotNull(secretValue);
         Assert.assertEquals("secretcontent", secretValue);
+
+        // clean up
+        clientSecretsManager.deleteSecret(DeleteSecretRequest.builder().secretId(secretName).build());
     }
 
     @Test
     public void testGetSecretAsParam() throws Exception {
         final SsmAsyncClient clientSsm = TestUtils.getClientSSMAsyncV2();
         final SecretsManagerAsyncClient clientSecretsManager = TestUtils.getClientSecretsManagerAsyncV2();
 
-        final String secretName = "test-s-"+UUID.randomUUID().toString();
+        final String secretName = "test-s-" + UUID.randomUUID().toString();
         clientSecretsManager.createSecret(CreateSecretRequest.builder()
             .name(secretName).secretString("secretcontent").build()).join();
 
@@ -266,7 +270,7 @@ public void testLambdaCreateListFunctions() throws Exception {
         val createFunctionRequest = CreateFunctionRequest.builder().functionName(functionName)
                 .runtime(Runtime.JAVA8)
                 .role("r1")
-                .code(LocalTestUtil.createFunctionCodeSDKV2(LambdaHandler.class))
+                .code(LocalTestUtilSDKV2.createFunctionCode(LambdaHandler.class))
                 .handler(LambdaHandler.class.getName()).build();
         val response = lambdaClient.createFunction(createFunctionRequest).get();
         Assert.assertNotNull(response);