chore: some more changes

Author: darklight3it

.env

@@ -7,7 +7,7 @@ HANDLERS_TO_BUILD=basic-lambda
 HANDLER=basic-lambda
 
 # Output directory for built binaries
-OUTPUT_DIR=/tmp/var-task
+OUTPUT_DIR=test/dockerized/tasks
 
 # Max concurrent Lambda invocations for LMI mode
 RIE_MAX_CONCURRENCY=4

.github/workflows/dockerized-test.yml

@@ -20,6 +20,9 @@ jobs:
     steps:
     - uses: actions/checkout@v6
 
+    - uses: dtolnay/rust-toolchain@stable
+    - uses: Swatinem/rust-cache@v2
+
     - name: Set up Python 3.14
       uses: actions/setup-python@v5
       with:
@@ -35,26 +38,19 @@ jobs:
           echo "OUTPUT_DIR=${OUTPUT_DIR}" >> $GITHUB_ENV
         fi
     
-    - name: Build the image
+    - name: Build Lambda artifacts for testing
       run: |
-        docker build . -t local/test -f Dockerfile.rie \
-          --build-arg HANDLERS_TO_BUILD="${HANDLERS_TO_BUILD}" \
-          --build-arg OUTPUT_DIR="${OUTPUT_DIR}"
-
-    - name: Test container manually
+        mkdir -p test/dockerized/tasks
+        OUTPUT_DIR="$(pwd)/test/dockerized/tasks" make build-examples
+        ls -la test/dockerized/tasks/
+    
+    - name: Build base test image with RIE and custom entrypoint
       run: |
-        docker run -d --name test-container -p 9000:8080 local/test basic-lambda
-        sleep 1
-        echo "Container logs after startup:"
-        docker logs test-container
-        echo "Attempting to invoke function:"
-        curl -XPOST "http://localhost:9000/2015-03-31/functions/function/invocations" -d '{"command":"test"}' || echo "Invocation failed"
-        echo "Final container logs:"
-        docker logs test-container
-        docker kill test-container || true
+        docker build . -t local/test-base -f Dockerfile.rie
 
     - name: Run tests
       uses: aws/containerized-test-runner-for-aws-lambda@main
       with:
         suiteFileArray: '["./test/dockerized/*.json"]'
-        dockerImageName: 'local/test'
+        dockerImageName: 'local/test-base'
+        taskFolder: './test/dockerized/tasks'

.gitignore

@@ -17,3 +17,7 @@ build
 
 node_modules
 cdk.out
+
+# Test artifacts
+Dockerfile.test-with-tasks
+test/dockerized/tasks/

Dockerfile.rie

@@ -1,36 +1,10 @@
-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}"
-
-ARG HANDLERS_TO_BUILD="basic-lambda"
-ARG OUTPUT_DIR="/var/task"
-
-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 /build/examples
-COPY scripts/build-examples.sh /build/
-
-WORKDIR /build
-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
 
-ARG OUTPUT_DIR="/var/task"
-
 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
 
-COPY --from=builder ${OUTPUT_DIR} /var/task
-
 ENTRYPOINT ["/usr/local/bin/lambda-entrypoint"]
 CMD ["basic-lambda"]

Makefile

@@ -6,7 +6,7 @@ INTEG_EXTENSIONS := extension-fn extension-trait logs-trait
 # Using musl to run extensions on both AL1 and AL2
 INTEG_ARCH := x86_64-unknown-linux-musl
 RIE_MAX_CONCURRENCY ?= 4
-OUTPUT_DIR ?= /tmp/var-task
+OUTPUT_DIR ?= test/dockerized/tasks
 HANDLERS_TO_BUILD ?=
 HANDLER ?=
 
@@ -124,19 +124,18 @@ fmt:
 	cargo +nightly fmt --all
 
 build-examples:
-	HANDLERS_TO_BUILD=${HANDLERS_TO_BUILD} ./scripts/build-examples.sh
+	HANDLERS_TO_BUILD=${HANDLERS_TO_BUILD} OUTPUT_DIR=${OUTPUT_DIR} ./scripts/build-examples.sh
 
 nuke:
 	docker kill $$(docker ps -q)
 
-test-dockerized:
+test-dockerized: build-examples
 	@echo "Running dockerized tests locally..."
-	@echo "Building Docker image..."
+	
+	@echo "Building base Docker image with RIE and custom entrypoint..."
 	docker build \
-	-t local/test \
+	-t local/test-base \
 	-f Dockerfile.rie \
-	--build-arg HANDLERS_TO_BUILD="${HANDLERS_TO_BUILD}" \
-	--build-arg OUTPUT_DIR="${OUTPUT_DIR}" \
 	.
 
 	@echo "Setting up containerized test runner..."
@@ -146,17 +145,17 @@ test-dockerized:
 	fi
 	@echo "Building test runner Docker image..."
 	@docker build -t test-runner:local -f .test-runner/Dockerfile .test-runner
+	
 	@echo "Running tests in Docker..."
-	@echo "Running actual tests..."
 	@docker run --rm \
-		--entrypoint suite \
-		-e DOCKER_API_VERSION=1.44 \
+		-e INPUT_SUITE_FILE_ARRAY='["./test/dockerized/suites/*.json"]' \
+		-e DOCKER_IMAGE_NAME=local/test-base \
+		-e TASK_FOLDER=./test/dockerized/tasks \
+		-e GITHUB_WORKSPACE=/workspace \
 		-v /var/run/docker.sock:/var/run/docker.sock \
-		-v "$(CURDIR)/test/dockerized:/tests:ro" \
-		test-runner:local \
-		--test-image local/test \
-		--debug \
-		/tests/*.json
+		-v "$(CURDIR):/workspace" \
+		-w /workspace \
+		test-runner:local
 
 test-rie:
 	HANDLER="$(HANDLER)" ./scripts/test-rie.sh