adjust CI config to use new make targets; fix imports for SDK v1/v2 compatibility

Author: whummer

Diff for: .travis.yml

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

Diff for: Makefile

@@ -7,7 +7,7 @@ build:           ## Build the code using Maven
 	mvn -Pfatjar $(ADDITIONAL_MVN_ARGS) clean javadoc:jar source:jar package $(ADDITIONAL_MVN_TARGETS)
 
 compile:
-	mvn -Pawssdkv1,awssdkv2 -DskipTests compile test-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="-DskipTests" make build

Diff for: pom.xml

@@ -87,6 +87,14 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- core AWS libs (independent of v1/v2 SDK) -->
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>${lambda.core.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- required to build on java 9+ -->
         <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -206,12 +214,6 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
-                <dependency>
-                    <groupId>com.amazonaws</groupId>
-                    <artifactId>aws-lambda-java-core</artifactId>
-                    <version>${lambda.core.version}</version>
-                    <scope>provided</scope>
-                </dependency>
                 <dependency>
                     <groupId>com.amazonaws</groupId>
                     <artifactId>aws-lambda-java-events</artifactId>

Diff for: src/main/java/cloud/localstack/docker/Container.java

@@ -125,7 +125,10 @@ public int getExternalPortFor(int internalPort) {
                 .map(PortMapping::getExternalPort)
                 .findFirst().orElse(null);
 
-        if (externalPort == null && internalPort == Localstack.DEFAULT_EDGE_PORT) {
+        if (externalPort != null) {
+            return externalPort;
+        }
+        if (internalPort == Localstack.DEFAULT_EDGE_PORT) {
             return internalPort;
         }
 

Diff for: src/test/java/cloud/localstack/awssdkv2/KinesisSchedulerTest.java

@@ -78,16 +78,13 @@ public Scheduler createScheduler(ConfigsBuilder configsBuilder) {
   public void createStream(KinesisAsyncClient kinesisClient) throws Exception {
     CreateStreamRequest request = CreateStreamRequest.builder().streamName(streamName).shardCount(1).build();
     CreateStreamResponse response = kinesisClient.createStream(request).get();
-
     Assert.assertNotNull(response);
   }
 
   public void putRecord(KinesisAsyncClient kinesisClient) throws Exception {
-    System.out.println("PUTTING RECORD");
     PutRecordRequest request = PutRecordRequest.builder().partitionKey("partitionkey").streamName(streamName)
         .data(SdkBytes.fromUtf8String(testMessage)).build();
     PutRecordResponse response = kinesisClient.putRecord(request).get();
-
     Assert.assertNotNull(response);
   }
 

Diff for: src/test/java/cloud/localstack/awssdkv2/consumer/DeliveryStatusProcessor.java

@@ -36,7 +36,7 @@ public void processRecords(ProcessRecordsInput processRecordsInput) {
     }
 
     public void processRecord(KinesisClientRecord record) throws IOException {
-        LOG.info("RECORD PROCESSING");
+        LOG.info("Processing record: " + record);
         this.eventProcessor.RECORD_RECEIVED = true;
         byte[] message = new byte[record.data().remaining()];
         record.data().get(message);

Diff for: src/test/java/cloud/localstack/utils/LocalTestUtil.java

@@ -9,34 +9,29 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import com.amazonaws.services.lambda.runtime.events.SQSEvent;
 import lombok.val;
 import org.apache.commons.io.IOUtils;
 
-import com.amazonaws.services.kinesis.model.Record;
-import com.amazonaws.services.lambda.model.FunctionCode;
-import software.amazon.awssdk.core.SdkBytes;
-
 /**
  * Utility methods used for the LocalStack unit and integration tests.
  *
  * @author Waldemar Hummer
  */
 public class LocalTestUtil {
 
-	public static FunctionCode createFunctionCode(Class<?> clazz) throws Exception {
-		val code = new FunctionCode();
-		code.setZipFile(createFunctionByteBuffer(clazz));
+	public static com.amazonaws.services.lambda.model.FunctionCode createFunctionCode(Class<?> clazz) throws Exception {
+		val code = new com.amazonaws.services.lambda.model.FunctionCode();
+		code.setZipFile(createFunctionByteBuffer(clazz, false));
 		return code;
 	}
 
 	public static software.amazon.awssdk.services.lambda.model.FunctionCode createFunctionCodeSDKV2(Class<?> clazz) throws Exception{
 		val codeBuilder = software.amazon.awssdk.services.lambda.model.FunctionCode.builder();
-		codeBuilder.zipFile(SdkBytes.fromByteBuffer(createFunctionByteBuffer(clazz)));
+		codeBuilder.zipFile(software.amazon.awssdk.core.SdkBytes.fromByteBuffer(createFunctionByteBuffer(clazz, true)));
 		return codeBuilder.build();
 	}
 
-	private static ByteBuffer createFunctionByteBuffer(Class<?> clazz) throws Exception{
+	private static ByteBuffer createFunctionByteBuffer(Class<?> clazz, boolean sdkv2) throws Exception{
 		ByteArrayOutputStream zipOut = new ByteArrayOutputStream();
 		ByteArrayOutputStream jarOut = new ByteArrayOutputStream();
 		// create zip file
@@ -46,8 +41,10 @@ private static ByteBuffer createFunctionByteBuffer(Class<?> clazz) throws Except
 
 		// write class files into jar stream
 		addClassToJar(clazz, jarStream);
-		addClassToJar(Record.class, jarStream);
-		addClassToJar(SQSEvent.class, jarStream);
+		if (!sdkv2) {
+            addClassToJar(com.amazonaws.services.kinesis.model.Record.class, jarStream);
+            addClassToJar(com.amazonaws.services.lambda.runtime.events.SQSEvent.class, jarStream);
+        }
 		// write MANIFEST into jar stream
 		JarEntry mfEntry = new JarEntry("META-INF/MANIFEST.MF");
 		jarStream.putNextEntry(mfEntry);