fix(ls-api): fix AWS_LAMBDA_FUNCTION_VERSION panic, deduplicate docker flags

Two changes:

1. Add AWS_LAMBDA_FUNCTION_VERSION (and --platform/--add-host) to a shared
   RIE_DOCKER_OPTS variable in the Makefile. smoke-test.sh was missing this
   env var, causing a startup panic in the RIE. RIE_DOCKER_OPTS uses
   deferred assignment (=) so $$LATEST survives to recipe expansion time.

2. Replace the duplicated docker_opts array in smoke-test.sh with a call
   to the new start-rie-detached Makefile target. Both start-rie and
   start-rie-detached now use the same RIE_DOCKER_OPTS, so env vars
   stay in sync automatically.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: joe4dev

cmd/ls-api/Makefile

@@ -7,7 +7,25 @@ INTEROP_PORT := 9563
 RIE_BINARY   := $(REPO_ROOT)/bin/aws-lambda-rie-$(ARCH)
 LS_API_BIN   := $(REPO_ROOT)/bin/ls-api
 
-.PHONY: build-rie build-ls-api start-mock start-rie success fail smoke-test
+# Common docker flags for start-rie and start-rie-detached.
+# Uses deferred assignment (=) so $$LATEST is not expanded until recipe time,
+# where Make reduces $$ -> $ before passing the line to the shell.
+RIE_DOCKER_OPTS = \
+	--platform linux/amd64 \
+	--add-host=host.docker.internal:host-gateway \
+	-p $(INTEROP_PORT):$(INTEROP_PORT) \
+	-v $(RIE_BINARY):/var/rapid/init:ro \
+	-v $(THIS_MAKEFILE_DIR)/handler.py:/var/task/handler.py:ro \
+	-e LOCALSTACK_RUNTIME_ENDPOINT=http://host.docker.internal:$(MOCK_PORT) \
+	-e LOCALSTACK_RUNTIME_ID=test-runtime-id \
+	-e AWS_LAMBDA_FUNCTION_TIMEOUT=30 \
+	-e AWS_LAMBDA_FUNCTION_VERSION='$$LATEST' \
+	-e AWS_LAMBDA_FUNCTION_MEMORY_SIZE=128 \
+	-e AWS_REGION=us-east-1 \
+	-e _HANDLER=handler.handler \
+	--entrypoint /var/rapid/init
+
+.PHONY: build-rie build-ls-api start-mock start-rie start-rie-detached success fail smoke-test
 
 build-rie:  ## Build the RIE Linux binary via Go cross-compilation (works on macOS)
 	$(MAKE) -C $(REPO_ROOT) ARCH=$(ARCH) compile-lambda-linux
@@ -19,19 +37,10 @@ start-mock:  ## Run the ls-api LocalStack endpoint mock natively (no Docker need
 	go run $(THIS_MAKEFILE_DIR)
 
 start-rie: build-rie  ## Build and run the RIE inside a Docker Python Lambda container
-	docker run --rm \
-		-p $(INTEROP_PORT):$(INTEROP_PORT) \
-		-v $(RIE_BINARY):/var/rapid/init:ro \
-		-v $(THIS_MAKEFILE_DIR)/handler.py:/var/task/handler.py:ro \
-		-e LOCALSTACK_RUNTIME_ENDPOINT=http://host.docker.internal:$(MOCK_PORT) \
-		-e LOCALSTACK_RUNTIME_ID=test-runtime-id \
-		-e AWS_LAMBDA_FUNCTION_TIMEOUT=30 \
-		-e AWS_LAMBDA_FUNCTION_VERSION='$$LATEST' \
-		-e AWS_LAMBDA_FUNCTION_MEMORY_SIZE=128 \
-		-e AWS_REGION=us-east-1 \
-		-e _HANDLER=handler.handler \
-		--entrypoint /var/rapid/init \
-		public.ecr.aws/lambda/python:3.12
+	docker run --rm $(RIE_DOCKER_OPTS) public.ecr.aws/lambda/python:3.12
+
+start-rie-detached:  ## Start the RIE in detached mode; prints container ID (binaries must be pre-built)
+	@docker run --detach $(RIE_DOCKER_OPTS) public.ecr.aws/lambda/python:3.12
 
 success:  ## Trigger a successful invocation via the mock's /success endpoint
 	curl -sf http://localhost:$(MOCK_PORT)/success

cmd/ls-api/smoke-test.sh

@@ -8,8 +8,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
 
 MOCK_PORT=48490
-INTEROP_PORT=9563
-RIE_BINARY="$REPO_ROOT/bin/aws-lambda-rie-x86_64"
 LS_API_BIN="$REPO_ROOT/bin/ls-api"
 
 LOG_FILE=$(mktemp -t ls-api-smoke.XXXXXX)
@@ -55,25 +53,9 @@ MOCK_PID=$!
 for i in $(seq 1 10); do nc -z localhost $MOCK_PORT 2>/dev/null && break || sleep 1; done
 
 # ---- start RIE ----
+# Docker flags are defined once in the Makefile (RIE_DOCKER_OPTS) and shared with start-rie.
 echo ">>> Starting RIE in Docker"
-
-docker_opts=(
-    --detach
-    --platform linux/amd64
-    --add-host=host.docker.internal:host-gateway
-    -p "$INTEROP_PORT:$INTEROP_PORT"
-    -v "$RIE_BINARY:/var/rapid/init:ro"
-    -v "$SCRIPT_DIR/handler.py:/var/task/handler.py:ro"
-    -e "LOCALSTACK_RUNTIME_ENDPOINT=http://host.docker.internal:$MOCK_PORT"
-    -e "LOCALSTACK_RUNTIME_ID=smoke-test-runtime"
-    -e "AWS_LAMBDA_FUNCTION_TIMEOUT=30"
-    -e "AWS_LAMBDA_FUNCTION_MEMORY_SIZE=128"
-    -e "AWS_REGION=us-east-1"
-    -e "_HANDLER=handler.handler"
-    --entrypoint /var/rapid/init
-)
-
-CID=$(docker run "${docker_opts[@]}" public.ecr.aws/lambda/python:3.12)
+CID=$(make -s --no-print-directory -C "$SCRIPT_DIR" start-rie-detached)
 echo "$CID" > "$CID_FILE"
 echo ">>> RIE container: $CID"