Merge from aws/aws-sam-cli/develop

Author: aws-sam-cli-bot

.github/workflows/build.yml

@@ -160,7 +160,8 @@ jobs:
       - uses: actions/setup-go@v6
         with:
           go-version: '1.19'
-      - uses: ruby/setup-ruby@v1
+      # Pin to specific version until Lambda Builders support bundler 4.0.0
+      - uses: ruby/setup-ruby@v1.268.0
         with:
           ruby-version: "3.3"
       - uses: actions/setup-node@v6
@@ -175,6 +176,9 @@ jobs:
             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
         if: ${{ matrix.os == 'ubuntu-latest' }}

.github/workflows/integration-tests.yml

@@ -108,13 +108,13 @@ jobs:
           fi
 
       - name: Configure AWS credentials via OIDC
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
           aws-region: us-east-1
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: |
             3.11
@@ -126,13 +126,13 @@ jobs:
 
       - name: Set up Node.js
         if: contains(fromJSON('["build-integ", "build-integ-java-python-provided", "build-integ-dotnet-node-ruby", "build-integ-arm64"]'), matrix.test_suite) && matrix.container_runtime == 'no-container'
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Set up Java 25
         if: (contains(fromJSON('["build-integ", "build-integ-java-python-provided", "build-integ-arm64", "build-integ-arm64-java"]'), matrix.test_suite) && matrix.container_runtime == 'no-container') || matrix.test_suite == 'sync'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
           java-version: '25'
@@ -149,35 +149,35 @@ jobs:
           # Remove system Maven if it exists
           sudo apt-get remove -y maven || true
           
-          # Install Maven 3.9.11
-          wget https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip -P /tmp
+          # Install Maven 3.9.12
+          wget https://dlcdn.apache.org/maven/maven-3/3.9.12/binaries/apache-maven-3.9.12-bin.zip -P /tmp
           sudo unzip -d /opt/mvn /tmp/apache-maven-*.zip
           
           # Install Gradle 9.2.0
           wget https://services.gradle.org/distributions/gradle-9.2.0-bin.zip -P /tmp
           sudo unzip -d /opt/gradle /tmp/gradle-*.zip
           
           # Create symlinks to ensure our Maven is used
-          sudo ln -sf /opt/mvn/apache-maven-3.9.11/bin/mvn /usr/local/bin/mvn
+          sudo ln -sf /opt/mvn/apache-maven-3.9.12/bin/mvn /usr/local/bin/mvn
           sudo ln -sf /opt/gradle/gradle-9.2.0/bin/gradle /usr/local/bin/gradle
           
           # Add to PATH (prepend to ensure our versions are used first)
-          echo "/opt/mvn/apache-maven-3.9.11/bin" >> $GITHUB_PATH
+          echo "/opt/mvn/apache-maven-3.9.12/bin" >> $GITHUB_PATH
           echo "/opt/gradle/gradle-9.2.0/bin" >> $GITHUB_PATH
           
           # Set MAVEN_HOME
-          echo "MAVEN_HOME=/opt/mvn/apache-maven-3.9.11" >> $GITHUB_ENV
+          echo "MAVEN_HOME=/opt/mvn/apache-maven-3.9.12" >> $GITHUB_ENV
           
           # Verify versions
-          export PATH="/opt/mvn/apache-maven-3.9.11/bin:/opt/gradle/gradle-9.2.0/bin:$PATH"
+          export PATH="/opt/mvn/apache-maven-3.9.12/bin:/opt/gradle/gradle-9.2.0/bin:$PATH"
           mvn --version
           gradle --version
 
-      - name: Install .NET 8 SDK
+      - name: Install .NET 10 SDK
         if: contains(fromJSON('["build-integ-java-python-provided", "build-integ-dotnet-node-ruby", "build-integ-arm64"]'), matrix.test_suite) && matrix.container_runtime == 'no-container' || matrix.test_suite == 'other-and-e2e'
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '10.0.x'
 
       - name: Set up Ruby 3.3.7
         if: (contains(fromJSON('["build-integ","build-integ-dotnet-node-ruby", "build-integ-arm64"]'), matrix.test_suite) && matrix.container_runtime == 'no-container') || matrix.test_suite == 'other-and-e2e'
@@ -396,7 +396,7 @@ jobs:
 
       - name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: test-results-${{ matrix.test_suite }}-${{ matrix.container_runtime }}
           path: TEST_REPORT-*.json

appveyor-linux-binary.yml

@@ -46,9 +46,9 @@ install:
   - sh: "ls /usr/"
   # install latest maven which is compatible with jdk17
   - sh: "sudo apt-get -y remove maven"
-  - sh: "wget https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip -P /tmp"
+  - sh: "wget https://dlcdn.apache.org/maven/maven-3/3.9.12/binaries/apache-maven-3.9.12-bin.zip -P /tmp"
   - sh: "sudo unzip -d /opt/mvn /tmp/apache-maven-*.zip"
-  - sh: "PATH=/opt/mvn/apache-maven-3.9.11/bin:$PATH"
+  - sh: "PATH=/opt/mvn/apache-maven-3.9.12/bin:$PATH"
   - sh: "mvn --version"
 
   - sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate"

appveyor-ubuntu.yml

@@ -58,9 +58,9 @@ install:
   - sh: "ls /usr/"
   # install latest maven which is compatible with jdk17
   - sh: "sudo apt-get -y remove maven"
-  - sh: "wget https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.zip -P /tmp"
+  - sh: "wget https://dlcdn.apache.org/maven/maven-3/3.9.12/binaries/apache-maven-3.9.12-bin.zip -P /tmp"
   - sh: "sudo unzip -d /opt/mvn /tmp/apache-maven-*.zip"
-  - sh: "PATH=/opt/mvn/apache-maven-3.9.11/bin:$PATH"
+  - sh: "PATH=/opt/mvn/apache-maven-3.9.12/bin:$PATH"
   - sh: "mvn --version"
 
   # Finch Runtime Setup (Steps 1-7)
@@ -306,7 +306,6 @@ install:
   - sh: 'export AWS_SIGNING_PROFILE_VERSION_ARN=$(echo "$test_env_var" | jq -j ".TestSigningProfileARN")'
   - sh: 'export LMI_SUBNET_ID=$(echo "$test_env_var" | jq -j ".LMISubnetId")'
   - sh: 'export LMI_SECURITY_GROUP_ID=$(echo "$test_env_var" | jq -j ".LMISecurityGroupId")'
-  - sh: 'export LMI_OPERATOR_ROLE_ARN=$(echo "$test_env_var" | jq -j ".LMIOperatorRoleArn")'
 
   # Runtime-aware Docker Hub authentication with fail-fast
   - sh: |

appveyor-windows-al2023.yml

@@ -104,7 +104,6 @@ install:
     $env:AWS_SIGNING_PROFILE_VERSION_ARN = $test_env_var_json.TestSigningProfileARN;
     $env:LMI_SUBNET_ID = $test_env_var_json.LMISubnetId;
     $env:LMI_SECURITY_GROUP_ID = $test_env_var_json.LMISecurityGroupId;
-    $env:LMI_OPERATOR_ROLE_ARN = $test_env_var_json.LMIOperatorRoleArn;
   }"
 
 

appveyor-windows.yml

@@ -114,7 +114,6 @@ install:
     $env:AWS_SIGNING_PROFILE_VERSION_ARN = $test_env_var_json.TestSigningProfileARN;
     $env:LMI_SUBNET_ID = $test_env_var_json.LMISubnetId;
     $env:LMI_SECURITY_GROUP_ID = $test_env_var_json.LMISecurityGroupId;
-    $env:LMI_OPERATOR_ROLE_ARN = $test_env_var_json.LMIOperatorRoleArn;
   }"
 
 

requirements/base.txt

@@ -6,12 +6,12 @@ jmespath~=1.0.1
 ruamel_yaml~=0.18.16
 PyYAML~=6.0
 cookiecutter~=2.6.0
-aws-sam-translator==1.105.0
+aws-sam-translator==1.106.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=7.1.0
 dateparser~=1.2
 requests~=2.32.5
-aws_lambda_builders==1.60.0
+aws_lambda_builders==1.61.0
 tomlkit==0.13.3
 # NOTE: For supporting watchdog in Python3.8, version is pinned to 4.0.2 as 
 # version 5.0.2 introduced some breaking changes for versions > Python3.8
@@ -31,7 +31,7 @@ regex!=2021.10.8
 tzlocal==5.3.1
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=1.42.0
+cfn-lint~=1.43.0
 
 # Type checking boto3 objects
 boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]>=1.41.0

requirements/dev.txt

@@ -14,12 +14,12 @@ types-pywin32==311.0.0.20251008; python_version>="3.9"
 types-pywin32==308.0.0.20241221; python_version<"3.9"
 types-PyYAML==6.0.12.20250915
 types-chevron==0.14.2.20250103
-types-psutil==7.0.0.20251001
+types-psutil==7.1.3.20251202
 types-setuptools==80.9.0.20250822
-types-Pygments==2.19.0.20250809 
+types-Pygments==2.19.0.20251121 
 types-colorama==0.4.15.20250801
 types-dateparser==1.2.2.20250809
-types-docutils==0.22.2.20251006
+types-docutils==0.22.3.20251115
 types-jsonschema==4.25.1.20251009
 types-pyOpenSSL==24.1.0.20240722
 # lucashuy: pin `types-request` based on the Python version since newer versions of