chore: fix backward compatibility with previous tests

Author: darklight3it

.github/workflows/dockerized-test.yml

@@ -46,7 +46,7 @@ jobs:
     
     - name: Build base test image with RIE and custom entrypoint
       run: |
-        docker build . -t local/test-base -f Dockerfile.rie
+        docker build . -t local/test-base -f Dockerfile.test
 
     - name: Run tests
       uses: aws/containerized-test-runner-for-aws-lambda@main

Dockerfile.rie

@@ -1,10 +1,25 @@
 FROM public.ecr.aws/lambda/provided:al2023
 
+RUN dnf install -y gcc
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 ADD https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/latest/download/aws-lambda-rie /usr/local/bin/aws-lambda-rie
 RUN chmod +x /usr/local/bin/aws-lambda-rie
 
-COPY scripts/custom-lambda-entrypoint.sh /usr/local/bin/lambda-entrypoint
-RUN chmod +x /usr/local/bin/lambda-entrypoint
+ARG EXAMPLE=basic-lambda
+
+COPY Cargo.* /build/
+COPY lambda-runtime /build/lambda-runtime
+COPY lambda-runtime-api-client /build/lambda-runtime-api-client
+COPY lambda-events /build/lambda-events
+COPY lambda-http /build/lambda-http
+COPY lambda-extension /build/lambda-extension
+COPY examples/${EXAMPLE} /build/examples/${EXAMPLE}
+
+WORKDIR /build/examples/${EXAMPLE}
+RUN cargo build --release
+RUN cp target/release/${EXAMPLE} ${LAMBDA_RUNTIME_DIR}/bootstrap
 
-ENTRYPOINT ["/usr/local/bin/lambda-entrypoint"]
-CMD ["basic-lambda"]
+ENTRYPOINT []
+CMD [ "/usr/local/bin/aws-lambda-rie", "/var/runtime/bootstrap" ]

Dockerfile.test

@@ -0,0 +1,10 @@
+FROM public.ecr.aws/lambda/provided:al2023
+
+ADD https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/latest/download/aws-lambda-rie /usr/local/bin/aws-lambda-rie
+RUN chmod +x /usr/local/bin/aws-lambda-rie
+
+COPY scripts/custom-lambda-entrypoint.sh /usr/local/bin/lambda-entrypoint
+RUN chmod +x /usr/local/bin/lambda-entrypoint
+
+ENTRYPOINT ["/usr/local/bin/lambda-entrypoint"]
+CMD ["basic-lambda"]

Makefile

@@ -135,7 +135,7 @@ test-dockerized: build-examples
 	@echo "Building base Docker image with RIE and custom entrypoint..."
 	docker build \
 	-t local/test-base \
-	-f Dockerfile.rie \
+	-f Dockerfile.test \
 	.
 
 	@echo "Setting up containerized test runner..."

scripts/test-rie.sh

@@ -1,28 +1,29 @@
 #!/bin/bash
 set -euo pipefail
 
+EXAMPLE=${1:-basic-lambda}
 # Optional: set RIE_MAX_CONCURRENCY to enable LMI mode (emulates AWS_LAMBDA_MAX_CONCURRENCY)
 RIE_MAX_CONCURRENCY=${RIE_MAX_CONCURRENCY:-}
-# Optional: specify which handler to run (defaults to first handler)
-HANDLER=${HANDLER:-basic-lambda}
 
-echo "Building Docker image with RIE (handlers: $HANDLER)"
-docker build -f Dockerfile.rie --build-arg HANDLERS_TO_BUILD="$HANDLER" -t rust-lambda-rie-test .
+echo "Building Docker image with RIE for example: $EXAMPLE..."
+docker build -f Dockerfile.rie --build-arg EXAMPLE=$EXAMPLE -t rust-lambda-rie-test .
 
-echo "Starting RIE container on port 9000 with handler: $HANDLER"
+echo "Starting RIE container on port 9000..."
 if [ -n "$RIE_MAX_CONCURRENCY" ]; then
     echo "Enabling LMI mode with AWS_LAMBDA_MAX_CONCURRENCY=$RIE_MAX_CONCURRENCY"
-    docker run -p 9000:8080 -e AWS_LAMBDA_MAX_CONCURRENCY="$RIE_MAX_CONCURRENCY" rust-lambda-rie-test "$HANDLER" &
+    docker run -p 9000:8080 -e AWS_LAMBDA_MAX_CONCURRENCY="$RIE_MAX_CONCURRENCY" rust-lambda-rie-test &
 else
-    docker run -p 9000:8080 rust-lambda-rie-test "$HANDLER" &
+    docker run -p 9000:8080 rust-lambda-rie-test &
 fi
 CONTAINER_PID=$!
 
 echo "Container started. Test with:"
-echo "curl -XPOST 'http://localhost:9000/2015-03-31/functions/function/invocations' -d '{\"command\": \"test from RIE\"}' -H 'Content-Type: application/json'"
-echo "or for a specific example check under examples/ for the expected payload format."
-
+if [ "$EXAMPLE" = "basic-lambda" ] || [ "$EXAMPLE" = "basic-lambda-concurrent" ]; then
+    echo "curl -XPOST 'http://localhost:9000/2015-03-31/functions/function/invocations' -d '{\"command\": \"test from RIE\"}' -H 'Content-Type: application/json'"
+else
+    echo "For example '$EXAMPLE', check examples/$EXAMPLE/src/main.rs for the expected payload format."
+fi
 echo ""
 echo "Press Ctrl+C to stop the container."
 
-wait $CONTAINER_PID
+wait $CONTAINER_PID