fix: add support for ARM based platforms (#300)

- Fixed build-jni-lib.sh script after refactoring it
- Upgrade jacoco maven plugin from 0.8.6 to 0.8.7 to solve a build error with JDK 17
- Update java-core and maven-compiler-plugin, 
- Use CodeBuild image from ECR

- Stage RIC 2.1.0, change to use Public ECR base image for amazoncorretto tests

Co-authored-by: Carl Zogheib <[email protected]>

Author: muellerc

README.md

@@ -52,7 +52,7 @@ ___
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-lambda-java-runtime-interface-client</artifactId>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
@@ -69,7 +69,7 @@ ___
 'com.amazonaws:aws-lambda-java-events:3.11.0'
 'com.amazonaws:aws-lambda-java-events-sdk-transformer:3.0.7'
 'com.amazonaws:aws-lambda-java-log4j2:1.5.1'
-'com.amazonaws:aws-lambda-java-runtime-interface-client:2.0.0'
+'com.amazonaws:aws-lambda-java-runtime-interface-client:2.1.0'
 'com.amazonaws:aws-lambda-java-tests:1.1.1'
 ```
 
@@ -80,7 +80,7 @@ ___
 [com.amazonaws/aws-lambda-java-events "3.11.0"]
 [com.amazonaws/aws-lambda-java-events-sdk-transformer "3.0.7"]
 [com.amazonaws/aws-lambda-java-log4j2 "1.5.1"]
-[com.amazonaws/aws-lambda-java-runtime-interface-client "2.0.0"]
+[com.amazonaws/aws-lambda-java-runtime-interface-client "2.1.0"]
 [com.amazonaws/aws-lambda-java-tests "1.1.1"]
 ```
 
@@ -91,7 +91,7 @@ ___
 "com.amazonaws" % "aws-lambda-java-events" % "3.11.0"
 "com.amazonaws" % "aws-lambda-java-events-sdk-transformer" % "3.0.7"
 "com.amazonaws" % "aws-lambda-java-log4j2" % "1.5.1"
-"com.amazonaws" % "aws-lambda-java-runtime-interface-client" % "2.0.0"
+"com.amazonaws" % "aws-lambda-java-runtime-interface-client" % "2.1.0"
 "com.amazonaws" % "aws-lambda-java-tests" % "1.1.1"
 ```
 

aws-lambda-java-events/pom.xml

@@ -34,6 +34,7 @@
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <lombok.version>1.18.22</lombok.version>
   </properties>
 
   <distributionManagement>
@@ -72,7 +73,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.16</version>
+      <version>${lombok.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -108,7 +109,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
+            <version>3.2.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -159,6 +160,29 @@
               <autoReleaseAfterClose>false</autoReleaseAfterClose>
             </configuration>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>3.2.0</version>
+            <configuration>
+              <encoding>UTF-8</encoding>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.8.1</version>
+            <configuration>
+              <annotationProcessorPaths>
+                <path>
+                  <groupId>org.projectlombok</groupId>
+                  <artifactId>lombok</artifactId>
+                  <version>${lombok.version}</version>
+                </path>
+              </annotationProcessorPaths>
+              <encoding>UTF-8</encoding>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>

aws-lambda-java-runtime-interface-client/README.md

@@ -13,7 +13,7 @@ You can include this package in your preferred base image to make that base imag
 
 Choose a preferred base image. The Runtime Interface Client is tested on Amazon Linux, Alpine, Ubuntu, Debian, and CentOS. The requirements are that the image is:
 
-* built for x86_64
+* built for x86_64 and ARM64
 * contains Java >= 8
 * contains glibc >= 2.17 or musl
 
@@ -70,7 +70,7 @@ pom.xml
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-lambda-java-runtime-interface-client</artifactId>
-      <version>2.0.0</version>
+      <version>2.1.0</version>
     </dependency>
   </dependencies>
   <build>

aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md

@@ -1,3 +1,7 @@
+### January 20, 2022
+`2.1.0`
+- fix: Added support for ARM64 architecture
+
 ### Sept 29, 2021
 `2.0.0`
 - Added support for ARM64 architecture
@@ -9,4 +13,4 @@
 
 ### December 01, 2020
 `1.0.0`:
-- Initial release of AWS Lambda Java Runtime Interface Client
+- Initial release of AWS Lambda Java Runtime Interface Client

aws-lambda-java-runtime-interface-client/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-lambda-java-runtime-interface-client</artifactId>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
   <packaging>jar</packaging>
 
   <name>AWS Lambda Java Runtime Interface Client</name>
@@ -31,15 +31,18 @@
   </developers>
 
   <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <jacoco.maven.plugin.version>0.8.7</jacoco.maven.plugin.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-lambda-java-core</artifactId>
-      <version>1.2.0</version>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
@@ -102,9 +105,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.8.1</version>
         <configuration>
           <encoding>UTF-8</encoding>
+          <source>${maven.compiler.source}</source>
+          <target>${maven.compiler.target}</target>
         </configuration>
       </plugin>
       <plugin>
@@ -123,7 +128,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.6</version>
+        <version>${jacoco.maven.plugin.version}</version>
         <executions>
           <execution>
             <id>default-prepare-agent</id>

aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/NativeClient.java

@@ -13,15 +13,20 @@
  */
 class NativeClient {
     private static final String nativeLibPath = "/tmp/.aws-lambda-runtime-interface-client";
+    private static final String architecturePathSuffix = "/" + getArchIdentifier();
+    // Implementation based on AWS CRT, but adopted to support 64-bit architectures only (ref. https://github.com/awslabs/aws-crt-java/blob/0e9c3db8b07258b57c2503cfc47c787ccef10670/src/main/java/software/amazon/awssdk/crt/CRT.java#L106-L134)
+    private static final String supported_arm_architectures = "^(aarch64.*|arm64.*)$";
+    private static final String supported_x86_architectures = "^(x8664|amd64|ia32e|em64t|x64|x86_64)$";
     private static final String[] libsToTry = {
-            "/aws-lambda-runtime-interface-client.glibc.so",
-            "/aws-lambda-runtime-interface-client.musl.so",
+            "aws-lambda-runtime-interface-client.glibc.so",
+            "aws-lambda-runtime-interface-client.musl.so",
     };
     private static final Throwable[] exceptions = new Throwable[libsToTry.length];
     static {
             boolean loaded = false;
             for (int i = 0; !loaded && i < libsToTry.length; ++i) {
-                try (InputStream lib = NativeClient.class.getResourceAsStream(libsToTry[i])) {
+                try (InputStream lib = NativeClient.class.getResourceAsStream(
+                        Paths.get(architecturePathSuffix, libsToTry[i]).toString())) {
                     Files.copy(lib, Paths.get(nativeLibPath), StandardCopyOption.REPLACE_EXISTING);
                     System.load(nativeLibPath);
                     loaded = true;
@@ -44,10 +49,25 @@ class NativeClient {
             initializeClient(userAgent.getBytes());
     }
 
+    /**
+     * @return a string describing the detected architecture the RIC is executing on
+     * @throws UnknownPlatformException
+     */
+    static String getArchIdentifier() {
+        String arch = System.getProperty("os.arch");
+
+        if (arch.matches(supported_x86_architectures)) {
+            return "x86_64";
+        } else if (arch.matches(supported_arm_architectures)) {
+            return "arm64";
+        }
+
+        throw new UnknownPlatformException("architecture not supported: " + arch);
+    }
+
     static native void initializeClient(byte[] userAgent);
 
     static native InvocationRequest next();
 
     static native void postInvocationResponse(byte[] requestId, byte[] response);
-
 }

aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/UnknownPlatformException.java

@@ -0,0 +1,11 @@
+package com.amazonaws.services.lambda.runtime.api.client.runtimeapi;
+
+/**
+ * Copyright (c) 2022 Amazon. All rights reserved.
+ */
+public class UnknownPlatformException extends RuntimeException {
+
+    public UnknownPlatformException(String message) {
+        super(message);
+    }
+}

aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh

@@ -7,10 +7,25 @@ SRC_DIR=$(dirname "$0")
 DST_DIR=${1}
 CURL_VERSION=7.77.0
 
-# compile the native library
-docker build -f "${SRC_DIR}/Dockerfile.glibc" --build-arg CURL_VERSION=${CURL_VERSION} -t lambda-java-jni-lib-glibc "${SRC_DIR}"
-docker run --rm --entrypoint /bin/cat lambda-java-jni-lib-glibc /src/aws-lambda-runtime-interface-client.so > "${DST_DIR}"/classes/aws-lambda-runtime-interface-client.glibc.so
+# Not using associative arrays to maintain bash 3 compatibility with building on MacOS
+# MacOS ships with bash 3 and associative arrays require bash 4+
+# Declaring a map as an array with the column character as a separator :
+declare -a ARCHITECTURES_TO_PLATFORM=(
+    "x86_64:linux/amd64"
+    "arm64:linux/arm64/v8"
+)
 
-docker build -f "${SRC_DIR}/Dockerfile.musl" --build-arg CURL_VERSION=${CURL_VERSION} -t lambda-java-jni-lib-musl "${SRC_DIR}"
-docker run --rm --entrypoint /bin/cat lambda-java-jni-lib-musl /src/aws-lambda-runtime-interface-client.so > "${DST_DIR}"/classes/aws-lambda-runtime-interface-client.musl.so
+declare -a TARGETS=("glibc" "musl")
 
+for pair in "${ARCHITECTURES_TO_PLATFORM[@]}"; do
+    arch=${pair%%:*}
+    platform=${pair#*:}
+
+    mkdir -p "${DST_DIR}"/classes/"${arch}"
+
+    for target in "${TARGETS[@]}"; do
+        echo "Compiling the native library for target ${target} on architecture ${arch} using Docker platform ${platform}"
+        docker build --platform="${platform}" -f "${SRC_DIR}"/Dockerfile."${target}" --build-arg CURL_VERSION=${CURL_VERSION} -t lambda-java-jni-lib-"${target}"-"${arch}" "${SRC_DIR}"
+        docker run --rm --entrypoint /bin/cat lambda-java-jni-lib-"${target}"-"${arch}" /src/aws-lambda-runtime-interface-client.so > "${DST_DIR}"/classes/"${arch}"/aws-lambda-runtime-interface-client."${target}".so
+    done
+done

aws-lambda-java-runtime-interface-client/test/integration/codebuild-local/codebuild_build.sh

@@ -176,7 +176,7 @@ else
     docker_command+=" -e \"INITIATOR=$USER\""
 fi
 
-docker_command+=" amazon/aws-codebuild-local:latest"
+docker_command+=" public.ecr.aws/codebuild/local-builds:latest"
 
 # Note we do not expose the AWS_SECRET_ACCESS_KEY or the AWS_SESSION_TOKEN
 exposed_command=$docker_command

aws-lambda-java-runtime-interface-client/test/integration/docker/Dockerfile.function.amazoncorretto

@@ -1,6 +1,6 @@
 ARG RUNTIME_VERSION
 
-FROM amazoncorretto:${RUNTIME_VERSION}
+FROM public.ecr.aws/amazoncorretto/amazoncorretto:${RUNTIME_VERSION}
 
 ADD aws-lambda-java-runtime-interface-client/test/integration/test-handler/target/HelloWorld-1.0.jar .
 

aws-lambda-java-runtime-interface-client/test/integration/test-handler/pom.xml

@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-runtime-interface-client</artifactId>
-            <version>2.0.0</version>
+            <version>2.1.0</version>
         </dependency>
     </dependencies>
 

aws-lambda-java-tests/pom.xml

@@ -33,6 +33,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <junit.version>5.7.0</junit.version>
+        <jacoco.maven.plugin.version>0.8.7</jacoco.maven.plugin.version>
     </properties>
 
     <dependencies>
@@ -127,7 +128,7 @@
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.8.6</version>
+                        <version>${jacoco.maven.plugin.version}</version>
                         <executions>
                             <execution>
                                 <id>default-prepare-agent</id>