refactor: ♻️ some small fixes

Author: darklight3it

Dockerfile.rie

@@ -3,8 +3,9 @@ FROM public.ecr.aws/lambda/provided:al2023 AS builder
 RUN dnf install -y gcc make
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
-ENV EXAMPLES="basic-lambda"
-ENV OUTPUT_DIR="/var/task"
+
+ARG HANDLERS_TO_BUILD="basic-lambda"
+ARG OUTPUT_DIR="/var/task"
 
 COPY Cargo.* /build/
 COPY lambda-runtime /build/lambda-runtime
@@ -16,7 +17,7 @@ COPY examples /build/examples
 COPY scripts/build-examples.sh /build/
 
 WORKDIR /build
-RUN chmod +x build-examples.sh && ./build-examples.sh
+RUN chmod +x build-examples.sh && HANDLERS_TO_BUILD="$HANDLERS_TO_BUILD" OUTPUT_DIR="$OUTPUT_DIR" ./build-examples.sh
 
 # Final Image
 FROM public.ecr.aws/lambda/provided:al2023

Makefile

@@ -7,7 +7,8 @@ INTEG_EXTENSIONS := extension-fn extension-trait logs-trait
 INTEG_ARCH := x86_64-unknown-linux-musl
 RIE_MAX_CONCURRENCY ?= 4
 OUTPUT_DIR ?= /tmp/var-task
-EXAMPLES ?=
+HANDLERS_TO_BUILD ?= basic-lambda
+HANDLER ?= basic-lambda
 
 .PHONY: help pr-check integration-tests check-event-features fmt build-examples test-rie test-rie-lmi nuke test-dockerized
 
@@ -119,7 +120,10 @@ fmt:
 	cargo +nightly fmt --all
 
 build-examples:
-	./scripts/build-examples.sh
+	HANDLERS_TO_BUILD=${HANDLERS_TO_BUILD} ./scripts/build-examples.sh
+
+nuke:
+	docker kill $$(docker ps -q)
 
 test-dockerized:
 	@echo "Running dockerized tests locally..."
@@ -144,14 +148,11 @@ test-dockerized:
 		/tests/*.json
 
 test-rie:
-	./scripts/test-rie.sh
-
-nuke:
-	docker kill $$(docker ps -q)
+	HANDLER="$(HANDLER)" ./scripts/test-rie.sh
 
 # Run RIE in Lambda Managed Instance (LMI) mode with concurrent polling.
 test-rie-lmi:
-	RIE_MAX_CONCURRENCY=$(RIE_MAX_CONCURRENCY) ./scripts/test-rie.sh $(EXAMPLE)
+	RIE_MAX_CONCURRENCY=$(RIE_MAX_CONCURRENCY) HANDLER="$(HANDLER)" ./scripts/test-rie.sh $(EXAMPLE)
 
 help: ## Show this help message
 	@echo 'Usage: make [target]'
@@ -162,14 +163,18 @@ help: ## Show this help message
 	@echo '  check-event-features  Test individual event features'
 	@echo '  fmt                   Format code with cargo fmt'
 	@echo '  build-examples        Build example Lambda functions'
-	@echo '                        Usage: EXAMPLES="basic-lambda" make build-examples'
+	@echo '                        Usage: EXAMPLES="basic-lambda" OUTPUT_DIR=/make build-examples'
 	@echo '  test-rie              Test Lambda with Runtime Interface Emulator'
+	@echo '                        Usage: HANDLERS_TO_BUILD="basic-lambda basic-sqs" make test-rie'
+	@echo '                        Usage: HANDLERS_TO_BUILD="basic-lambda" HANDLER="basic-lambda" make test-rie'
 	@echo '  test-rie-lmi          Test RIE in Lambda Managed Instance mode'
-	@echo '                        Usage: RIE_MAX_CONCURRENCY=4 make test-rie-lmi'
+	@echo '                        Usage: RIE_MAX_CONCURRENCY=4 HANDLERS_TO_BUILD="basic-lambda-concurrent" make test-rie-lmi'
 	@echo '  test-dockerized       Run dockerized test harness'
 	@echo '  nuke                  Kill all running Docker containers'
 	@echo ''
 	@echo 'Environment variables:'
-	@echo '  EXAMPLES              Space-separated list of examples to build'
-	@echo '  OUTPUT_DIR            Directory for built binaries (default: /tmp/var-task)'
-	@echo '  RIE_MAX_CONCURRENCY   Max concurrent Lambda invocations for LMI mode'
+	@echo '  EXAMPLES              Space-separated list of examples to build (for build-examples)'
+	@echo '  HANDLERS_TO_BUILD     Space-separated list of handlers to build for RIE (for test-rie)'
+	@echo '  HANDLER               Specific handler to run (defaults to first in HANDLERS_TO_BUILD)'
+	@echo '  OUTPUT_DIR            Directory for built binaries (default: /tmp/var-task for build-examples, /var/task for Docker)'
+	@echo '  RIE_MAX_CONCURRENCY   Max concurrent Lambda invocations for LMI mode (for test-rie-lmi)'

README.md

@@ -392,35 +392,26 @@ You can read more about how [cargo lambda watch](https://www.cargo-lambda.info/c
 
 ### Local testing with Runtime Interface Emulator (RIE)
 
-For testing with the official AWS Lambda Runtime Interface Emulator, use the provided RIE testing infrastructure:
+For testing with the official AWS Lambda Runtime Interface Emulator:
 
 ```bash
 make test-rie
 ```
 
-By default, this uses the `basic-lambda` example. To test a different example:
+By default, this builds and tests the `basic-lambda` example. To build and test a custom handler:
 
 ```bash
-make test-rie EXAMPLE=basic-sqs
-make test-rie EXAMPLE=http-basic-lambda
+HANDLER="basic-tenant-id" make test-rie
 ```
 
-To test Lambda Managed Instances (concurrent polling), use:
+To test Lambda Managed Instances (concurrent polling):
 
 ```bash
-make test-rie-lmi EXAMPLE=basic-lambda-concurrent
+RIE_MAX_CONCURRENCY=4 make test-rie
 ```
 
-This command will:
-1. Build a Docker image with Rust toolchain and RIE
-2. Compile the specified example inside the Linux container
-3. Start the RIE container on port 9000
-4. Display the appropriate curl command for testing
-
 Different examples expect different payload formats. Check the example's source code in `examples/EXAMPLE_NAME/src/main.rs`
 
-This provides automated testing with Docker and RIE, ensuring your Lambda functions work in a Linux environment identical to AWS Lambda.
-
 ### Lambda Debug Proxy
 
 Lambdas can be run and debugged locally using a special [Lambda debug proxy](https://github.com/rimutaka/lambda-debug-proxy) (a non-AWS repo maintained by @rimutaka), which is a Lambda function that forwards incoming requests to one AWS SQS queue and reads responses from another queue. A local proxy running on your development computer reads the queue, calls your Lambda locally and sends back the response. This approach allows debugging of Lambda functions locally while being part of your AWS workflow. The Lambda handler code does not need to be modified between the local and AWS versions.

scripts/build-examples.sh

@@ -2,21 +2,21 @@
 set -e
 
 OUTPUT_DIR="${OUTPUT_DIR:-/tmp/var-task}"
-EXAMPLES="${EXAMPLES:-}"
+HANDLERS_TO_BUILD="${HANDLERS_TO_BUILD:-}"
 
 mkdir -p "$OUTPUT_DIR"
 
-echo "Building examples: $(EXAMPLES)"
+echo "Building handlers: ${HANDLERS_TO_BUILD}"
 
 
-for example in ${EXAMPLES}; do
-    dir="examples/$example"
-    [ ! -f "$dir/Cargo.toml" ] && echo "✗ $example not found" && continue
+for handler in ${HANDLERS_TO_BUILD}; do
+    dir="examples/$handler"
+    [ ! -f "$dir/Cargo.toml" ] && echo "✗ $handler not found" && continue
 
-    echo "Building $example..."
+    echo "Building $handler..."
     (cd "$dir" && cargo build --release) || continue
 
-    [ -f "$dir/target/release/$example" ] && cp "$dir/target/release/$example" "$OUTPUT_DIR/" && echo "✓ $example"
+    [ -f "$dir/target/release/$handler" ] && cp "$dir/target/release/$handler" "$OUTPUT_DIR/" && echo "✓ $handler"
 done
 
 echo ""

scripts/test-rie.sh

@@ -3,22 +3,24 @@ set -euo pipefail
 
 # 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"
-docker build -f Dockerfile.rie -t rust-lambda-rie-test .
+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 "Starting RIE container on port 9000..."
+echo "Starting RIE container on port 9000 with handler: $HANDLER"
 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 &
+    docker run -p 9000:8080 -e AWS_LAMBDA_MAX_CONCURRENCY="$RIE_MAX_CONCURRENCY" rust-lambda-rie-test "$HANDLER" &
 else
-    docker run -p 9000:8080 rust-lambda-rie-test &
+    docker run -p 9000:8080 rust-lambda-rie-test "$HANDLER" &
 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."
+echo "or for a specific example check under examples/ for the expected payload format."
 
 echo ""
 echo "Press Ctrl+C to stop the container."

tests/dockerized/core.json

@@ -0,0 +1,19 @@
+{
+    "tests": [
+        {
+            "name": "test_echo",
+            "handler": "basic-lambda",
+            "request": {
+                "command": "test"
+            },
+            "assertions": [
+                {
+                    "response": {
+                        "msg": "Command test executed."
+                    },
+                    "transform": "{msg: .msg}"
+                }
+            ]
+        }
+    ]
+}