Merge pull request #336 from andclt/events-v4-serialization-v2

Events v4 serialization v2

Author: andclt

README.md

@@ -73,7 +73,7 @@ ___
 'com.amazonaws:aws-lambda-java-tests:1.1.1'
 ```
 
-[Leiningen](http://leiningen.org) and [Boot](http://boot-clj.com)
+[Leiningen](http://leiningen.org)
 
 ```clojure
 [com.amazonaws/aws-lambda-java-core "1.2.1"]

aws-lambda-java-runtime-interface-client/Makefile

@@ -1,3 +1,9 @@
+x86_64_ALIAS := amd64
+aarch64_ALIAS := arm64
+ARCHITECTURE := $(shell arch)
+ARCHITECTURE_ALIAS := $($(shell echo "$(ARCHITECTURE)_ALIAS"))
+ARCHITECTURE_ALIAS := $(or $(ARCHITECTURE_ALIAS),amd64) # on any other archs defaulting to amd64
+
 .PHONY: target
 target:
 	$(info ${HELP_MESSAGE})
@@ -9,12 +15,16 @@ test:
 
 .PHONY: setup-codebuild-agent
 setup-codebuild-agent:
-	docker build -t codebuild-agent - < test/integration/codebuild-local/Dockerfile.agent
+	docker build -t codebuild-agent \
+	 --build-arg ARCHITECTURE=$(ARCHITECTURE_ALIAS) \
+	  - < test/integration/codebuild-local/Dockerfile.agent
 
 .PHONY: test-smoke
 test-smoke: setup-codebuild-agent
-	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.12 corretto11
-	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11
+	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 corretto11 linux/amd64
+	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 corretto11 linux/arm64/v8
+	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11 linux/amd64
+	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11 linux/arm64/v8
 
 .PHONY: test-integ
 test-integ: setup-codebuild-agent

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

@@ -24,7 +24,7 @@ The Runtime Interface Client library can be installed into the image separate fr
 Dockerfile
 ```dockerfile
 # we'll use Amazon Linux 2 + Corretto 11 as our base
-FROM amazoncorretto:11 as base
+FROM public.ecr.aws/amazoncorretto/amazoncorretto:11 as base
 
 # configure the build environment
 FROM base as build

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

@@ -19,13 +19,13 @@
  */
 public class ClasspathLoader {
 
-    private static final Set<String> BLACKLIST = new HashSet<>();
+    private static final Set<String> BLOCKLIST = new HashSet<>();
     private static final ClassLoader SYSTEM_CLASS_LOADER = ClassLoader.getSystemClassLoader();
     private static final int CLASS_SUFFIX_LEN = ".class".length();
 
     static {
         // NativeClient loads a native library and crashes if loaded here so just exclude it
-        BLACKLIST.add("lambdainternal.runtimeapi.NativeClient");
+        BLOCKLIST.add("com.amazonaws.services.lambda.runtime.api.client.runtimeapi.NativeClient");
     }
 
     private static String pathToClassName(final String path) {
@@ -52,7 +52,7 @@ private static void loadClassesInJar(File file) throws IOException {
 
             String name = pathToClassName(entry.getName());
 
-            if(BLACKLIST.contains(name)) {
+            if(BLOCKLIST.contains(name)) {
                 continue;
             }
 

aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.glibc

@@ -1,5 +1,5 @@
 # we use centos 7 to build against glibc 2.17
-FROM centos:7
+FROM public.ecr.aws/docker/library/centos:7
 
 ARG CURL_VERSION
 

aws-lambda-java-runtime-interface-client/src/main/jni/Dockerfile.musl

@@ -1,4 +1,4 @@
-FROM alpine:3
+FROM public.ecr.aws/docker/library/alpine:3
 
 ARG CURL_VERSION
 

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

@@ -6,7 +6,7 @@ set -euo pipefail
 SRC_DIR=$(dirname "$0")
 DST_DIR=${1}
 MULTI_ARCH=${2}
-CURL_VERSION=7.77.0
+CURL_VERSION=7.83.0
 
 # Not using associative arrays to maintain bash 3 compatibility with building on MacOS
 # MacOS ships with bash 3 and associative arrays require bash 4+

aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.77.0.tar.gz

@@ -1,5 +1,14 @@
 FROM public.ecr.aws/amazoncorretto/amazoncorretto:8
 
+ARG ARCHITECTURE="amd64"
+
+ENV DOCKER_CLI_PLUGIN_DIR="/root/.docker/cli-plugins"
+
 RUN amazon-linux-extras enable docker && \
     yum clean metadata && \
-    yum install -y docker tar maven unzip file
+    yum install -y docker tar maven unzip file wget
+RUN mkdir -p "${DOCKER_CLI_PLUGIN_DIR}"
+RUN wget \
+    "$(curl https://api.github.com/repos/docker/buildx/releases/latest | grep browser_download_url | grep "linux-${ARCHITECTURE}" | cut -d '"' -f 4)" \
+     -O "${DOCKER_CLI_PLUGIN_DIR}"/docker-buildx
+RUN chmod +x "${DOCKER_CLI_PLUGIN_DIR}"/docker-buildx