Attempt fixes for amzn2023 in Test workflow

Author: brcarp

amzn2023/Dockerfile

@@ -1,15 +1,18 @@
 FROM public.ecr.aws/amazonlinux/amazonlinux:2023
 
-RUN dnf install -y gcc openssl-devel python3-pip
-RUN dnf clean all
-
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
+ENV PATH="~/.cargo/bin:${PATH}"
+
+RUN ~/.cargo/bin/rustup update \
+    && ~/.cargo/bin/rustup target add aarch64-unknown-linux-gnu
 
-RUN /root/.cargo/bin/rustup update \
-    && /root/.cargo/bin/rustup target add aarch64-unknown-linux-gnu
 RUN rustup default stable
-WORKDIR /var/task
+
+# Install required build dependencies
+RUN dnf install -y gcc openssl-devel python3-pip util-linux && \
+    pip3 install setuptools && \
+    dnf clean all
 
 ENV CRYPTEIA_BUILD_OS=amzn
 ENV CRYPTEIA_BUILD_TARGET=x86_64-unknown-linux-gnu
+

amzn2023/Dockerfile-arm64

@@ -1,15 +1,17 @@
 FROM public.ecr.aws/amazonlinux/amazonlinux:2023
 
-RUN dnf install -y gcc openssl-devel python3-pip
-RUN dnf clean all
-
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
+ENV PATH="~/.cargo/bin:${PATH}"
+
+RUN ~/.cargo/bin/rustup update \
+    && ~/.cargo/bin/rustup target add aarch64-unknown-linux-gnu
 
-RUN /root/.cargo/bin/rustup update \
-    && /root/.cargo/bin/rustup target add aarch64-unknown-linux-gnu
 RUN rustup default stable
-WORKDIR /var/task
+
+# Install required build dependencies
+RUN dnf install -y gcc openssl-devel python3-pip util-linux && \
+    pip3 install setuptools && \
+    dnf clean all
 
 ENV CRYPTEIA_BUILD_OS=amzn
 ENV CRYPTEIA_BUILD_TARGET=aarch64-unknown-linux-gnu

amzn2023/Dockerfile-test

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/lambda/provided:al2023
+FROM public.ecr.aws/lambda/nodejs:20
 
 COPY build/crypteia-amzn /opt/extensions/crypteia
 COPY build/libcrypteia-amzn.so /opt/lib/libcrypteia.so
@@ -10,5 +10,4 @@ ENV EXISTING=existingvalue
 ENV LD_PRELOAD=/opt/lib/libcrypteia.so
 
 # For assert.sh support
-RUN dnf install -y util-linux
-RUN dnf clean all
+RUN dnf install -y util-linux && dnf clean all

amzn2023/Dockerfile-test-arm64

@@ -0,0 +1,14 @@
+FROM public.ecr.aws/lambda/nodejs:20-arm64
+
+COPY build/crypteia-amzn-arm64 /opt/extensions/crypteia
+COPY build/libcrypteia-amzn-arm64.so /opt/lib/libcrypteia.so
+
+ENV CRYPTEIA_BUILD_OS=amzn
+ENV SKIP_CARGO_TEST=1
+
+ENV EXISTING=existingvalue
+ENV LD_PRELOAD=/opt/lib/libcrypteia.so
+
+# For assert.sh support
+RUN dnf install -y util-linux && dnf clean all
+

amzn2023/setup

@@ -11,3 +11,4 @@ docker run \
   --entrypoint "./bin/setup" \
   --volume "${PWD}:/var/task" \
   crypteia-lambda-amzn2023
+

amzn2023/setup-arm64

@@ -2,13 +2,13 @@
 set -e
 
 echo "== [amzn2023/Dockerfile-arm64] building... =="
-docker build --platform=linux/arm64 --tag crypteia-lambda-amzn2023-arm64 --file amzn2023/Dockerfile-arm64 .
+docker build --platform linux/arm64 --tag crypteia-lambda-amzn2023-arm64 --file amzn2023/Dockerfile-arm64 .
 
 echo "== [amzn2023/Dockerfile-arm64] bin/setup =="
 docker run \
+  --platform linux/arm64 \
   --rm \
   --user root \
   --entrypoint "./bin/setup" \
   --volume "${PWD}:/var/task" \
-  --platform=linux/arm64 \
   crypteia-lambda-amzn2023-arm64

amzn2023/test

@@ -21,3 +21,4 @@ docker run \
   --volume "${PWD}:/var/task" \
   --env TEST_LANG=node \
   crypteia-lambda-amzn2023-test
+

bin/test

@@ -14,7 +14,7 @@ if [ -z "${CRYPTEIA_BUILD_TARGET}" ]; then
       export CRYPTEIA_BUILD_TARGET="x86_64-unknown-linux-gnu"
       ;;
     *)
-      echo "Unsupported architecture: $(uname -m)"
+      echo "Unsupported architecture: $(uname -m)" >&2
       exit 1
       ;;
   esac