getsentry · antonpirker · Feb 24, 2025 · Feb 19, 2025 · Feb 19, 2025 · Feb 19, 2025
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,4 +4,4 @@
 
 Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`.
 
-Running the test suite on your PR might require maintainer approval. The AWS Lambda tests additionally require a maintainer to add a special label, and they will fail until this label is added.
+Running the test suite on your PR might require maintainer approval.
diff --git a/.github/workflows/scripts/trigger_tests_on_label.py b/.github/workflows/scripts/trigger_tests_on_label.py
diff --git a/.github/workflows/test-integrations-aws.yml b/.github/workflows/test-integrations-aws.yml
diff --git a/.github/workflows/test-integrations-cloud.yml b/.github/workflows/test-integrations-cloud.yml
@@ -35,6 +35,10 @@ jobs:
         # ubuntu-20.04 is the last version that supported python3.6
         # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
         os: [ubuntu-20.04]
+    services:
+      docker:
+        image: docker:dind  # Required for Docker network management
+        options: --privileged  # Required for Docker-in-Docker operations
     steps:
       - uses: actions/checkout@v4.2.2
       - uses: actions/setup-python@v5
@@ -47,6 +51,10 @@ jobs:
       - name: Erase coverage
         run: |
           coverage erase
+      - name: Test aws_lambda latest
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-aws_lambda-latest"
       - name: Test boto3 latest
         run: |
           set -x # print commands that are executed
@@ -97,12 +105,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6","3.7","3.9","3.11","3.12","3.13"]
+        python-version: ["3.6","3.7","3.8","3.9","3.11","3.12","3.13"]
         # python3.6 reached EOL and is no longer being supported on
         # new versions of hosted runners on Github Actions
         # ubuntu-20.04 is the last version that supported python3.6
         # see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
         os: [ubuntu-20.04]
+    services:
+      docker:
+        image: docker:dind  # Required for Docker network management
+        options: --privileged  # Required for Docker-in-Docker operations
     steps:
       - uses: actions/checkout@v4.2.2
       - uses: actions/setup-python@v5
@@ -115,6 +127,10 @@ jobs:
       - name: Erase coverage
         run: |
           coverage erase
+      - name: Test aws_lambda pinned
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
       - name: Test boto3 pinned
         run: |
           set -x # print commands that are executed

diff --git a/scripts/aws-cleanup.sh b/scripts/aws-cleanup.sh
diff --git a/...ts/aws-attach-layer-to-lambda-function.sh → ...ws/aws-attach-layer-to-lambda-function.sh b/...ts/aws-attach-layer-to-lambda-function.sh → ...ws/aws-attach-layer-to-lambda-function.sh
diff --git a/scripts/aws-delete-lambda-layer-versions.sh → ...s/aws/aws-delete-lambda-layer-versions.sh b/scripts/aws-delete-lambda-layer-versions.sh → ...s/aws/aws-delete-lambda-layer-versions.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 #
 # Deletes all versions of the layer specified in LAYER_NAME in one region.
+# Use with caution!
 #
 
 set -euo pipefail

diff --git a/scripts/aws-deploy-local-layer.sh → scripts/aws/aws-deploy-local-layer.sh b/scripts/aws-deploy-local-layer.sh → scripts/aws/aws-deploy-local-layer.sh
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 #
-# Builds and deploys the Sentry AWS Lambda layer (including the Sentry SDK and the Sentry Lambda Extension)
+# Builds and deploys the `SentryPythonServerlessSDK-local-dev` AWS Lambda layer (containing the Sentry SDK)
 #
 # The currently checked out version of the SDK in your local directory is used.
-# The latest version of the Lambda Extension is fetched from the Sentry Release Registry.
 #
 
 set -euo pipefail

diff --git a/scripts/aws_lambda_functions/README.md b/scripts/aws_lambda_functions/README.md
diff --git a/scripts/aws_lambda_functions/sentryPythonDeleteTestFunctions/README.md b/scripts/aws_lambda_functions/sentryPythonDeleteTestFunctions/README.md
diff --git a/scripts/aws_lambda_functions/sentryPythonDeleteTestFunctions/lambda_function.py b/scripts/aws_lambda_functions/sentryPythonDeleteTestFunctions/lambda_function.py
diff --git a/scripts/populate_tox/tox.jinja b/scripts/populate_tox/tox.jinja
@@ -57,9 +57,6 @@ envlist =
     {py3.8,py3.11,py3.12}-asyncpg-latest
 
     # AWS Lambda
-    # The aws_lambda tests deploy to the real AWS and have their own
-    # matrix of Python versions to run the test lambda function in.
-    # see `lambda_runtime` fixture in tests/integrations/aws_lambda.py
     {py3.8,py3.9,py3.11,py3.13}-aws_lambda
 
     # Beam
@@ -533,8 +530,6 @@ setenv =
     socket: TESTPATH=tests/integrations/socket
 
 passenv =
-    SENTRY_PYTHON_TEST_AWS_ACCESS_KEY_ID
-    SENTRY_PYTHON_TEST_AWS_SECRET_ACCESS_KEY
     SENTRY_PYTHON_TEST_POSTGRES_HOST
     SENTRY_PYTHON_TEST_POSTGRES_USER
     SENTRY_PYTHON_TEST_POSTGRES_PASSWORD
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`.

		Running the test suite on your PR might require maintainer approval. The AWS Lambda tests additionally require a maintainer to add a special label, and they will fail until this label is added.
		Running the test suite on your PR might require maintainer approval.