add support for ARM based platforms

Author: muellerc

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 ARM
 * 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 @@
+### Dec 30, 2021
+`2.1.0`
+- 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,6 +31,8 @@
   </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>
   </properties>

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

@@ -13,15 +13,17 @@
  */
 class NativeClient {
     private static final String nativeLibPath = "/tmp/.aws-lambda-runtime-interface-client";
+    private static final String architecturePathSuffix = "/" + getArchIdentifier();
     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 +46,25 @@ class NativeClient {
             initializeClient(userAgent.getBytes());
     }
 
+    /**
+     * @return a string describing the detected architecture the RIC is executing on
+     * @throws RuntimeException
+     */
+    static String getArchIdentifier() {
+        String arch = System.getProperty("os.arch");
+
+        if (arch.matches("^(x8664|amd64|ia32e|em64t|x64|x86_64|x8632|x86|i[3-6]86|ia32|x32)$")) {
+            return "x86";
+        } else if (arch.matches("^(armeabi.*|arm64.*|aarch64.*|arm)$")) {
+            return "arm";
+        }
+
+        throw new RuntimeException("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/jni/build-jni-lib.sh

@@ -7,10 +7,18 @@ 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
+# compile the native library for x86
+mkdir "${DST_DIR}"/classes/x86
+docker build --platform=linux/amd64 -f "${SRC_DIR}/Dockerfile.glibc" --build-arg CURL_VERSION=${CURL_VERSION} -t lambda-java-jni-lib-glibc-x86 "${SRC_DIR}"
+docker run --rm --entrypoint /bin/cat lambda-java-jni-lib-glibc-x86 /src/aws-lambda-runtime-interface-client.so > "${DST_DIR}"/classes/x86/aws-lambda-runtime-interface-client.glibc.so
 
-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
+docker build --platform=linux/amd64 -f "${SRC_DIR}/Dockerfile.musl" --build-arg CURL_VERSION=${CURL_VERSION} -t lambda-java-jni-lib-musl-x86 "${SRC_DIR}"
+docker run --rm --entrypoint /bin/cat lambda-java-jni-lib-musl-x86 /src/aws-lambda-runtime-interface-client.so > "${DST_DIR}"/classes/x86/aws-lambda-runtime-interface-client.musl.so
 
+# compile the native library for ARM
+mkdir "${DST_DIR}"/classes/arm
+docker build --platform=linux/arm64/v8 -f "${SRC_DIR}/Dockerfile.glibc" --build-arg CURL_VERSION=${CURL_VERSION} -t lambda-java-jni-lib-glibc-arm "${SRC_DIR}"
+docker run --rm --entrypoint /bin/cat lambda-java-jni-lib-glibc-arm /src/aws-lambda-runtime-interface-client.so > "${DST_DIR}"/classes/arm/aws-lambda-runtime-interface-client.glibc.so
+
+docker build --platform=linux/arm64/v8 -f "${SRC_DIR}/Dockerfile.musl" --build-arg CURL_VERSION=${CURL_VERSION} -t lambda-java-jni-lib-musl-arm "${SRC_DIR}"
+docker run --rm --entrypoint /bin/cat lambda-java-jni-lib-musl-arm /src/aws-lambda-runtime-interface-client.so > "${DST_DIR}"/classes/arm/aws-lambda-runtime-interface-client.musl.so