Merge branch 'master' into MEP-LambdaDevX-LDM_base_samples

Author: MEPalma

emr-serverless-python-dependencies/.gitignore

@@ -0,0 +1 @@
+pyspark_env

emr-serverless-python-dependencies/Dockerfile-localstack

@@ -22,9 +22,11 @@ COPY . .
 ##  Build and export stages for standard Python projects
 ## ----------------------------------------------------------------------------
 # Build stage - installs required dependencies and creates a venv package
-FROM base as build-poetry
-RUN poetry self add poetry-plugin-bundle && \
-    poetry bundle venv dist/bundle
+FROM base AS build-poetry
+WORKDIR /app
+
+RUN poetry self add [email protected]
+RUN poetry bundle venv /app/dist/bundle --clear
 
-FROM scratch as export-poetry
+FROM scratch AS export-poetry
 COPY --from=build-poetry /app/dist/bundle /pyspark_env/

emr-serverless-python-dependencies/Makefile

@@ -14,7 +14,7 @@ build-aws:
 	docker build . --file Dockerfile-aws --output .
 
 deploy:
-	docker-compose up --detach
+	docker compose up --detach
 	terraform workspace select local
 	AWS_ENDPOINT_URL=https://localhost.localstack.cloud:4566 terraform apply --auto-approve
 
@@ -31,7 +31,11 @@ run-aws:
 	./start_job.sh aws
 
 stop:
-	docker-compose down
+	docker compose down
+
+logs:
+	@localstack logs > logs.txt
+	cat logs.txt
 
 destroy:
 	terraform workspace select local
@@ -44,5 +48,5 @@ destroy-aws:
 	terraform destroy --auto-approve
 
 test-ci:
-	make init build deploy run; return_code=`echo $$?`;\
-	make stop; exit $$return_code;
+	make init build deploy logs run; return_code=`echo $$?`;\
+	make logs; make stop; exit $$return_code;

lambda-mounting-and-debugging/javascript/README.md

@@ -29,7 +29,6 @@ Alternatively, you can use the following `localstack` CLI configuration:
 
 ```sh
 LAMBDA_DOCKER_FLAGS='-e NODE_OPTIONS=--inspect-brk=0.0.0.0:9229 -p 9229:9229' \
-    LAMBDA_REMOTE_DOCKER=0 \
     localstack start -d
 ```
 

lambda-mounting-and-debugging/javascript/docker-compose.yml

@@ -9,7 +9,6 @@ services:
       - "127.0.0.1:4510-4559:4510-4559"  # external services port range
     environment:
       - DEBUG=1
-      - LAMBDA_REMOTE_DOCKER=0
       - LAMBDA_DOCKER_FLAGS=-e NODE_OPTIONS=--inspect-brk=0.0.0.0:9229 -p 9229:9229
       - LAMBDA_EXECUTOR=${LAMBDA_EXECUTOR-}
       - DOCKER_HOST=unix:///var/run/docker.sock

lambda-mounting-and-debugging/python/README.md

@@ -21,13 +21,10 @@ make install
 Make sure that LocalStack is started with the following configuration:
 ```
 LOCALSTACK_AUTH_TOKEN=... \
-    LAMBDA_REMOTE_DOCKER=0 \
     LAMBDA_DOCKER_FLAGS='-p 19891:19891' \
     DEBUG=1 localstack start
 ```
 
-Please note that `LAMBDA_REMOTE_DOCKER=0` needs to be configured in order to properly run the sample app (required for local Docker volume mounts).
-
 The config option `LAMBDA_DOCKER_FLAGS='-p 19891:19891'` defines a Docker flag that exposes port `19891` for debugging the Lambda handler code that will run inside the container.
 
 ## Running the Sample