Merge from aws/aws-sam-cli/develop

Author: aws-sam-cli-bot

.github/workflows/automated-updates-to-sam-cli.yml

@@ -97,7 +97,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
 
       - name: Update aws-sam-translator & commit
         run: |
@@ -166,7 +166,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
 
       - name: Upgrade aws_lambda_builders & commit
         run: |

.github/workflows/build.yml

@@ -65,7 +65,7 @@ jobs:
         echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV  
       if: ${{ matrix.os == 'windows-latest' }}
     - uses: actions/checkout@v6
-    - uses: astral-sh/setup-uv@v7
+    - uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
       with:
         python-version: ${{ matrix.python }}
         cache-python: false
@@ -79,12 +79,11 @@ jobs:
     name: Validate JSON schema
     if: github.repository_owner == 'aws'
     permissions:
-      pull-requests: write
-      contents: write
+      contents: read
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
         with:
           python-version: "3.11"
           cache-python: false
@@ -126,17 +125,19 @@ jobs:
         # folders that is commented below requires credentials, no need to spare time to run them
         tests_config:
           - name: "integ-buildcmd-arm64"
-            params: "-n 2 --reruns 3 tests/integration/buildcmd/test_build_cmd_arm64.py"
+            params: "-n 2 --reruns 3 -m 'not pr_skip' tests/integration/buildcmd/test_build_cmd_arm64.py"
+          - name: "integ-buildcmd-python"
+            params: "-n 2 --reruns 3 -m 'not pr_skip' tests/integration/buildcmd/test_build_cmd_python.py"
           - name: "integ-buildcmd-main"
-            params: "-n 2 --reruns 3 tests/integration/buildcmd/test_build_cmd_dotnet.py tests/integration/buildcmd/test_build_cmd_provided.py tests/integration/buildcmd/test_build_cmd_rust.py tests/integration/buildcmd/test_build_cmd_python.py tests/integration/buildcmd/test_build_cmd_node.py"
+            params: "-n 2 --reruns 3 -m 'not pr_skip' tests/integration/buildcmd/test_build_cmd_dotnet.py tests/integration/buildcmd/test_build_cmd_provided.py tests/integration/buildcmd/test_build_cmd_rust.py tests/integration/buildcmd/test_build_cmd_node.py"
           - name: "integ-buildcmd-java"
-            params: "-n 2 --reruns 5 tests/integration/buildcmd/test_build_cmd_java.py"
+            params: "-n 3 --reruns 5 tests/integration/buildcmd/test_build_cmd_java.py"
           - name: "integ-buildcmd-other"
             params: "-n 2 --reruns 3 tests/integration/buildcmd --ignore=tests/integration/buildcmd/test_build_cmd_arm64.py --ignore=tests/integration/buildcmd/test_build_cmd_dotnet.py --ignore=tests/integration/buildcmd/test_build_cmd_provided.py --ignore=tests/integration/buildcmd/test_build_cmd_rust.py --ignore=tests/integration/buildcmd/test_build_cmd_python.py --ignore=tests/integration/buildcmd/test_build_cmd_node.py --ignore=tests/integration/buildcmd/test_build_cmd_java.py"
           #- "delete"
           #- "deploy"
           - name: "integ-all-other"
-            params: "-n 2 --reruns 3 tests/integration/init tests/integration/local tests/integration/pipeline tests/integration/root tests/integration/scripts tests/integration/telemetry tests/integration/docs --ignore=tests/integration/local/invoke/test_invoke_durable.py --ignore=tests/integration/local/start_api/test_start_api_durable.py --ignore=tests/integration/local/start_lambda/test_start_lambda_durable.py"
+            params: "-n 2 --reruns 3 -m 'not pr_skip' tests/integration/init tests/integration/local tests/integration/pipeline tests/integration/root tests/integration/scripts tests/integration/telemetry tests/integration/docs --ignore=tests/integration/local/invoke/test_invoke_durable.py --ignore=tests/integration/local/start_api/test_start_api_durable.py --ignore=tests/integration/local/start_lambda/test_start_lambda_durable.py"
           - name: "durable-functions"
             params: "--reruns 3 tests/integration/local/invoke/test_invoke_durable.py tests/integration/local/start_api/test_start_api_durable.py tests/integration/local/start_lambda/test_start_lambda_durable.py"
           #- "list"
@@ -157,7 +158,7 @@ jobs:
           mkdir "D:\\Temp"
           echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV  
         if: ${{ matrix.os == 'windows-latest' }}
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
         with:
           python-version: ${{ matrix.python }}
           cache-python: false
@@ -166,7 +167,7 @@ jobs:
       - uses: actions/setup-go@v6
         with:
           go-version: '1.19'
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@4dc28cf14d77b0afa6832d9765ac422dbf0dfedd # v1
         with:
           ruby-version: "3.3"
       - uses: actions/setup-node@v6
@@ -215,30 +216,38 @@ jobs:
           - "3.10"
           - "3.11"
         tests_config:
-          - name: "Smoke & Functional Tests - All"
+          - name: "Smoke Tests - First Half"
+            os: ubuntu-latest
+            params: "-n 4 tests/smoke"
+            env_vars: "first-half"
+          - name: "Smoke Tests - Second Half & Functional Tests"
             os: ubuntu-latest
             params: "-n 4 tests/smoke tests/functional"
-            env_vars: "all"
-          - name: "Smoke Tests - First Third"
+            env_vars: "second-half"
+          - name: "Smoke Tests - First Quarter"
+            os: windows-latest
+            params: "-n 4 tests/smoke"
+            env_vars: "first-quarter"
+          - name: "Smoke Tests - Second Quarter"
             os: windows-latest
             params: "-n 4 tests/smoke"
-            env_vars: "first-third"
-          - name: "Smoke Tests - Second Third"
+            env_vars: "second-quarter"
+          - name: "Smoke Tests - Third Quarter"
             os: windows-latest
             params: "-n 4 tests/smoke"
-            env_vars: "second-third"
-          - name: "Smoke Tests - Third Third & Functional Tests"
+            env_vars: "third-quarter"
+          - name: "Smoke Tests - Fourth Quarter & Functional Tests"
             os: windows-latest
             params: "-n 4 tests/smoke tests/functional"
-            env_vars: "third-third"
+            env_vars: "fourth-quarter"
     steps:
       - uses: actions/checkout@v6
       - name: Set TEMP to D:/Temp
         run: |
           mkdir "D:\\Temp"
           echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV  
         if: ${{ matrix.os == 'windows-latest' }}
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
         with:
           python-version: ${{ matrix.python }}
           cache-python: false
@@ -270,7 +279,7 @@ jobs:
           mkdir "D:\\Temp"
           echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV  
         if: ${{ matrix.os == 'windows-latest' }}
-      - uses: astral-sh/setup-uv@v7
+      - uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
         with:
           python-version: "3.10"
           cache-python: false

.github/workflows/integration-tests.yml

@@ -130,7 +130,7 @@ jobs:
         run: bash tests/setup-wsl.sh
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
         with:
           python-version: "3.11"
           cache-python: false
@@ -178,19 +178,19 @@ jobs:
 
       - name: Set up Ruby 3.3.7
         if: contains(fromJSON('["build-x86-1", "build-x86-2", "build-arm64", "other-and-e2e", "cloud-based-tests"]'), matrix.test_suite)
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@4dc28cf14d77b0afa6832d9765ac422dbf0dfedd # v1
         with:
           ruby-version: '3.3.7'
 
       - name: Set up Ruby 3.2.7
         if: contains(fromJSON('["build-x86-1", "build-x86-2", "build-arm64", "other-and-e2e", "cloud-based-tests"]'), matrix.test_suite)
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@4dc28cf14d77b0afa6832d9765ac422dbf0dfedd # v1
         with:
           ruby-version: '3.2.7'
 
       - name: Set up Ruby 3.4.7
         if: contains(fromJSON('["build-x86-1", "build-x86-2", "build-arm64", "sync-code", "sync-watch", "other-and-e2e", "cloud-based-tests", "tier1-finch", "tier1-windows-build-1", "tier1-windows-build-2", "tier1-windows-build-3", "tier1-windows-other"]'), matrix.test_suite)
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@4dc28cf14d77b0afa6832d9765ac422dbf0dfedd # v1
         with:
           ruby-version: '3.4.7'
           windows-toolchain: none
@@ -202,8 +202,9 @@ jobs:
 
       - name: Install Terraform
         if: contains(fromJSON('["terraform-build", "terraform-start-api", "terraform-invoke-start-lambda", "cloud-based-tests", "tier1-finch", "tier1-windows-build-1", "tier1-windows-build-2", "tier1-windows-build-3", "tier1-windows-other"]'), matrix.test_suite)
-        shell: bash
-        run: bash tests/install-terraform.sh
+        uses: hashicorp/setup-terraform@5e8dbf3c6d9deaf4193ca7a8fb23f2ac83bb6c85 # v4.0.0
+        with:
+          terraform_wrapper: false
 
       - name: Setup Finch runtime
         if: matrix.test_suite == 'tier1-finch'

.github/workflows/update-reproducibles.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           python-version: "3.11"
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
       - name: Update all reproducible requirements
         run: make update-reproducible-reqs-uv
       - name: Push changes
@@ -47,7 +47,7 @@ jobs:
         with:
           python-version: "3.11"
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
       - name: Check reproducible requirements are up to date
         run: make update-reproducible-reqs-uv
       - name: Fail if requirements are out of date

.github/workflows/validate_pyinstaller.yml

@@ -21,8 +21,12 @@ jobs:
         run: chmod +x ./installer/pyinstaller/build-linux.sh
       - name: Build PyInstaller in manylinux container
         run: |
-          docker run --rm -v .:/samcli -w /samcli -e CI_OVERRIDE='1' \
-          quay.io/pypa/manylinux2014_x86_64:latest /samcli/installer/pyinstaller/build-linux.sh aws-sam-cli-linux-x86_64.zip
+          for i in 1 2 3; do
+            docker run --rm -v .:/samcli -w /samcli -e CI_OVERRIDE='1' \
+            quay.io/pypa/manylinux2014_x86_64:latest /samcli/installer/pyinstaller/build-linux.sh aws-sam-cli-linux-x86_64.zip && break
+            echo "Attempt $i failed, retrying..."
+            sleep 10
+          done
       - uses: actions/setup-python@v6
         with:
           python-version: 3.11

CONTRIBUTING.md

@@ -123,6 +123,20 @@ def test_tier1_my_feature_in_container(self):
 
 4. Each runtime should have one non-container and one container tier 1 test.
 
+### Skipping tests in PR workflow (`pr_skip`)
+
+Tests marked with `@pytest.mark.pr_skip` are excluded from the PR workflow (`.github/workflows/build.yml`) but still run in the integration workflow (`.github/workflows/integration-tests.yml`). Use this marker for tests that are redundant with other tests in the same file or low-risk for PR validation.
+
+```python
+@pytest.mark.pr_skip
+class TestMyRedundantFeature(TestBase):
+    ...
+```
+
+The marker is registered in `pytest.ini`. PR workflow jobs filter with `-m "not pr_skip"`.
+
+Before adding `pr_skip`, verify the test is covered by at least one job in `integration-tests.yml`.
+
 
 ## Finding contributions to work on
 Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/aws/aws-sam-cli/labels/help%20wanted) issues is a great place to start. 

pyproject.toml

@@ -40,11 +40,11 @@ dependencies = [
     "ruamel_yaml~=0.19.1",
     "PyYAML~=6.0",
     "cookiecutter>=2.6,<2.8",
-    "aws-sam-translator==1.108.0",
+    "aws-sam-translator==1.109.0",
     # docker minor version updates can include breaking changes. Auto update micro version only.
     "docker~=7.1.0",
     "dateparser~=1.3",
-    "requests~=2.32.5",
+    "requests>=2.32.5,<2.34.0",
     "aws_lambda_builders==1.63.0",
     "tomlkit==0.14.0",
     "watchdog==4.0.2",
@@ -56,18 +56,18 @@ dependencies = [
     # regex is not a direct dependency of SAM CLI, exclude version 2021.10.8 due to not working on M1 Mac
     "regex!=2021.10.8",
     "tzlocal==5.3.1",
-    "cfn-lint>=1.45,<1.48",
+    "cfn-lint>=1.45,<1.49",
     "boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]>=1.41.0",
     "python-dotenv>=1.0,<1.3",
 ]
 
 [project.optional-dependencies]
 pre-dev = [
-    "ruff==0.15.6",
+    "ruff==0.15.8",
 ]
 dev = [
     "aws-sam-cli[pre-dev]",
-    "coverage==7.13.4",
+    "coverage==7.13.5",
     "pytest-cov==7.1.0",
     "mypy==1.19.1",
     "types-pywin32==311.0.0.20260323",
@@ -77,11 +77,11 @@ dev = [
     "types-setuptools==82.0.0.20260210",
     "types-Pygments==2.19.0.20251121",
     "types-colorama==0.4.15.20250801",
-    "types-dateparser==1.3.0.20260211",
-    "types-docutils==0.22.3.20260316",
+    "types-dateparser==1.4.0.20260328",
+    "types-docutils==0.22.3.20260322",
     "types-jsonschema==4.26.0.20260202",
     "types-pyOpenSSL==24.1.0.20240722",
-    "types-requests==2.32.4.20260107",
+    "types-requests==2.33.0.20260327",
     "types-urllib3==1.26.25.14",
     "pytest==9.0.2",
     "parameterized==0.9.0",

pytest.ini

@@ -27,3 +27,4 @@ markers =
     provided
     dotnet
     al2023: Marker to note tests that require a newer Docker version on Windows
+    pr_skip: Tests skipped in PR workflow but run in nightly/integration tests