Merge branch 'develop' into feature/dotenv-support

Author: reedham-aws

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

@@ -13,14 +13,24 @@ jobs:
     if: github.repository == 'aws/aws-sam-cli'
     runs-on: ubuntu-latest
     steps:
+      - name: Check if PR already exists
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_COUNT=$(gh pr list --repo aws/aws-sam-cli --head update_app_templates_hash --json id --jq length)
+          if [ "$PR_COUNT" -ge 1 ]; then
+            echo "PR already exists for update_app_templates_hash, skipping workflow"
+            exit 1
+          fi
+
       - name: Checkout App Templates
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: aws/aws-sam-cli-app-templates
           path: aws-sam-cli-app-templates
 
       - name: Checkout SAM CLI
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: aws/aws-sam-cli
           path: aws-sam-cli
@@ -58,20 +68,37 @@ jobs:
     if: github.repository == 'aws/aws-sam-cli'
     runs-on: ubuntu-latest
     steps:
+      - name: Check if PR already exists
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_COUNT=$(gh pr list --repo aws/aws-sam-cli --head update_sam_transform_version --json id --jq length)
+          if [ "$PR_COUNT" -ge 1 ]; then
+            echo "PR already exists for update_sam_transform_version, skipping workflow"
+            exit 1
+          fi
+
       - name: Checkout SAM
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: aws/serverless-application-model
           path: serverless-application-model
           ref: main
           fetch-depth: 0
 
       - name: Checkout SAM CLI
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: aws/aws-sam-cli
           path: aws-sam-cli
 
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.11"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
       - name: Update aws-sam-translator & commit
         run: |
           git config --global user.email "action@github.com"
@@ -86,6 +113,7 @@ jobs:
           git reset --hard develop
           sed -i "s/$SAM_T_PRE_VERSION/aws-sam-translator==$SAM_T_CUR_VERSION/g" requirements/base.txt
           cp -r ../serverless-application-model/tests/translator/input ./tests/functional/commands/validate/lib/models
+          make update-reproducible-reqs-uv
           git status
           git diff --quiet && exit 0 # exit if there is no change
           echo "is_new_sam_t=1" >> $GITHUB_ENV # set env variable for next step run decision
@@ -109,20 +137,37 @@ jobs:
     if: github.repository == 'aws/aws-sam-cli'
     runs-on: ubuntu-latest
     steps:
+      - name: Check if PR already exists
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_COUNT=$(gh pr list --repo aws/aws-sam-cli --head update_lambda_builders_version --json id --jq length)
+          if [ "$PR_COUNT" -ge 1 ]; then
+            echo "PR already exists for update_lambda_builders_version, skipping workflow"
+            exit 1
+          fi
+
       - name: Checkout Lambda Builders
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: aws/aws-lambda-builders
           path: aws-lambda-builders
           ref: main
           fetch-depth: 0
 
       - name: Checkout SAM CLI
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: aws/aws-sam-cli
           path: aws-sam-cli
 
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.11"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
       - name: Upgrade aws_lambda_builders & commit
         run: |
           git config --global user.email "action@github.com"
@@ -136,6 +181,7 @@ jobs:
           echo "Lambda Builders pre version is $BUILDERS_PRE_VERSION"
           git reset --hard develop
           sed -i "s/$BUILDERS_PRE_VERSION/aws_lambda_builders==$BUILDERS_CUR_VERSION/g" requirements/base.txt
+          make update-reproducible-reqs-uv
           git status
           git diff --quiet && exit 0 # exit if there is no change
           echo "is_new_lambda_builders=1" >> $GITHUB_ENV # set env variable for next step run decision

.github/workflows/build.yml

@@ -64,10 +64,11 @@ jobs:
         mkdir "D:\\Temp"
         echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV  
       if: ${{ matrix.os == 'windows-latest' }}
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python }}
+    - uses: astral-sh/setup-uv@v7
     - run: test -f "./.github/ISSUE_TEMPLATE/Bug_report.md"  # prevent Bug_report.md from being renamed or deleted
     - run: make pr
 
@@ -79,7 +80,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         name: Install Python 3.11
         with:
@@ -120,7 +121,7 @@ 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 tests/integration/buildcmd/test_build_cmd_arm64.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"
           - name: "integ-buildcmd-java"
@@ -130,16 +131,22 @@ jobs:
           #- "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"
+            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"
+          - 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"
           #- "logs"
           #- "package"
           #- "publish"
           #- "sync"
           #- "traces"
           #- "validate"
+        exclude:
+          - os: windows-latest
+            tests_config:
+              name: "durable-functions"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set TEMP to D:/Temp
         run: |
           mkdir "D:\\Temp"
@@ -154,6 +161,7 @@ jobs:
             3.11
             3.12
             3.13
+            3.14
             ${{ matrix.python }}
           cache: 'pip'
       - uses: actions/setup-go@v6
@@ -162,9 +170,9 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.3"
-      - uses: actions/setup-node@v5
+      - uses: actions/setup-node@v6
         with:
-          node-version: 22
+          node-version: 24
       - uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
@@ -173,25 +181,22 @@ jobs:
             11
             17
             21
+            25
+      - uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: '10.0.x'
        # Install and configure Rust & Cargo Lambda
-      - name: Install and configure Rust & Cargo Lambda
+      - name: Install Rust toolchain and cargo-lambda
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: |
-          : install rustup if needed
-          if ! command -v rustup &> /dev/null ; then
-            curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
-            echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH
-          fi
-          rustup toolchain install stable --profile minimal --no-self-update
-          rustup default stable
-          pip install cargo-lambda==$CARGO_LAMBDA_VERSION
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
+        run: bash tests/install-rust.sh
       - name: Init samdev
         run: make init
       - name: uv install setuptools in Python3.12
         run: uv pip install --system --python python3.12 --upgrade pip setuptools
       - name: Run integration tests for ${{ matrix.tests_config.name }}
         run: pytest -vv ${{ matrix.tests_config.params }}
+        env:
+          FORCE_RUN_DOCKER_TEST: ${{ matrix.tests_config.name == 'durable-functions' && '1' || '' }}
 
   smoke-and-functional-tests:
     name: ${{ matrix.tests_config.name }} / ${{ matrix.tests_config.os }} / ${{ matrix.python }}
@@ -228,7 +233,7 @@ jobs:
             params: "-n 4 tests/smoke tests/functional"
             env_vars: "third-third"
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set TEMP to D:/Temp
         run: |
           mkdir "D:\\Temp"
@@ -258,7 +263,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set TEMP to D:/Temp
         run: |
           mkdir "D:\\Temp"
@@ -268,6 +273,7 @@ jobs:
         with:
           # These are the versions of Python that correspond to the supported Lambda runtimes
           python-version: |
+            3.14
             3.9
             3.10
             3.11

.github/workflows/codeql.yml

@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    if: github.repository_owner == 'aws'
+    if: github.repository == 'aws/aws-sam-cli'
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -42,7 +42,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL