Solve PR comments

Author: AntoniaSzecsi

.dockerignore

@@ -0,0 +1,50 @@
+name: Test with RIE
+
+on:
+  pull_request:
+    branches: [ main ]
+  push:
+    branches: [ main ]
+
+jobs:
+  test-rie:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        example: [basic-lambda, basic-sqs]
+    
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Build and test ${{ matrix.example }} with RIE
+      run: |
+        docker build -f Dockerfile.rie --build-arg EXAMPLE=${{ matrix.example }} -t rust-lambda-rie-test-${{ matrix.example }} .
+        
+        # Start container in background
+        docker run -d -p 9000:8080 --name rie-test-${{ matrix.example }} rust-lambda-rie-test-${{ matrix.example }}
+        
+        # Wait for container to be ready
+        sleep 5
+        
+        # Test the function based on example type
+        if [ "${{ matrix.example }}" = "basic-lambda" ]; then
+          PAYLOAD='{"command": "test from CI"}'
+        elif [ "${{ matrix.example }}" = "basic-sqs" ]; then
+          PAYLOAD='{"Records": [{"body": "{\"id\": \"123\", \"text\": \"hello from SQS\"}", "messageId": "test-id", "receiptHandle": "test-handle", "attributes": {}, "messageAttributes": {}, "md5OfBody": "test-md5", "eventSource": "aws:sqs", "eventSourceARN": "arn:aws:sqs:us-east-1:123456789012:test-queue", "awsRegion": "us-east-1"}]}'
+        fi
+        
+        # Make request and verify response
+        RESPONSE=$(curl -s -XPOST 'http://localhost:9000/2015-03-31/functions/function/invocations' \
+          -d "$PAYLOAD" \
+          -H 'Content-Type: application/json')
+        
+        echo "Response: $RESPONSE"
+        
+        # Basic validation that we got a response (not empty)
+        if [ -z "$RESPONSE" ]; then
+          echo "Error: Empty response"
+          exit 1
+        fi
+        
+        # Stop container
+        docker stop rie-test-${{ matrix.example }}

.github/workflows/test-rie.yml

@@ -9,7 +9,7 @@ members = [
     "lambda-events",
 ]
 
-exclude = ["examples", "test-handler"]
+exclude = ["examples"]
 
 [workspace.dependencies]
 base64 = "0.22"

Cargo.toml

@@ -7,10 +7,19 @@ 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 . /build
-WORKDIR /build/test-handler
+ARG EXAMPLE=basic-lambda
+
+COPY Cargo.toml Cargo.lock /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/test-handler ${LAMBDA_RUNTIME_DIR}/bootstrap
+RUN cp target/release/${EXAMPLE} ${LAMBDA_RUNTIME_DIR}/bootstrap
 
 ENTRYPOINT []
 CMD [ "/usr/local/bin/aws-lambda-rie", "/var/runtime/bootstrap" ]

Dockerfile.rie

@@ -111,4 +111,4 @@ fmt:
 	cargo +nightly fmt --all
 
 test-rie:
-	./scripts/test-rie.sh
+	./scripts/test-rie.sh $(EXAMPLE)

Makefile

@@ -400,19 +400,20 @@ For testing with the official AWS Lambda Runtime Interface Emulator, use the pro
 make test-rie
 ```
 
+By default, this uses the `basic-lambda` example. To test a different example:
+
+```bash
+make test-rie EXAMPLE=basic-sqs
+make test-rie EXAMPLE=http-basic-lambda
+```
+
 This command will:
 1. Build a Docker image with Rust toolchain and RIE
-2. Compile the test handler inside the Linux container
+2. Compile the specified example inside the Linux container
 3. Start the RIE container on port 9000
-4. Display the curl command to test your function
+4. Display the appropriate curl command for testing
 
-Once running, test the function from another terminal:
-
-```bash
-curl -XPOST 'http://localhost:9000/2015-03-31/functions/function/invocations' \
-  -d '{"command": "test from RIE"}' \
-  -H 'Content-Type: application/json'
-```
+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.
 

README.md

@@ -1,13 +1,22 @@
 #!/bin/bash
 set -euo pipefail
 
-echo "Building Docker image with RIE..."
-docker build -f Dockerfile.rie -t rust-lambda-rie-test .
+EXAMPLE=${1:-basic-lambda}
+
+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..."
-docker run -p 9000:8080 rust-lambda-rie-test
+docker run -p 9000:8080 rust-lambda-rie-test &
+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'"
+if [ "$EXAMPLE" = "basic-lambda" ]; 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."
+echo "Press Ctrl+C to stop the container."
+
+wait $CONTAINER_PID