Merge from aws/aws-sam-cli/develop

Author: aws-sam-cli-bot

.github/dependabot.yml

@@ -9,7 +9,6 @@ updates:
       prefix: chore
       include: scope
     reviewers:
-      - aws/serverless-application-experience-sbt
       - aws/aws-lambda-tooling
     open-pull-requests-limit: 10
 
@@ -22,7 +21,6 @@ updates:
       prefix: chore
       include: scope
     reviewers:
-      -  aws/serverless-application-experience-sbt
       -  aws/aws-lambda-tooling
     open-pull-requests-limit: 10
     groups:

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.5/binaries/apache-maven-3.9.5-bin.zip -P /tmp"
+  - sh: "wget https://dlcdn.apache.org/maven/maven-3/3.9.10/binaries/apache-maven-3.9.10-bin.zip -P /tmp"
   - sh: "sudo unzip -d /opt/mvn /tmp/apache-maven-*.zip"
-  - sh: "PATH=/opt/mvn/apache-maven-3.9.5/bin:$PATH"
+  - sh: "PATH=/opt/mvn/apache-maven-3.9.10/bin:$PATH"
   - sh: "mvn --version"
 
   - sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate"

appveyor-ubuntu.yml

@@ -47,9 +47,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.5/binaries/apache-maven-3.9.5-bin.zip -P /tmp"
+  - sh: "wget https://dlcdn.apache.org/maven/maven-3/3.9.10/binaries/apache-maven-3.9.10-bin.zip -P /tmp"
   - sh: "sudo unzip -d /opt/mvn /tmp/apache-maven-*.zip"
-  - sh: "PATH=/opt/mvn/apache-maven-3.9.5/bin:$PATH"
+  - sh: "PATH=/opt/mvn/apache-maven-3.9.10/bin:$PATH"
   - sh: "mvn --version"
 
   - sh: "source ${HOME}/venv${PYTHON_VERSION}/bin/activate"

appveyor-windows-binary.yml

@@ -73,8 +73,20 @@ install:
   - "echo %PATH%"
   - "python --version"
   - ps: "Restart-Service docker"
+
   # Switch to Docker Linux containers
-  - ps: Switch-DockerLinux
+  - ps: |
+      $dockerCliPath = "$Env:ProgramFiles\Docker\Docker\DockerCli.exe"
+      if (Test-Path $dockerCliPath) {
+        & $dockerCliPath -SwitchLinuxEngine
+        Write-Host "Docker successfully switched to Linux container mode"
+      } else {
+        Write-Host "DockerCli.exe not found at expected location. Installing tree and exploring Docker directory structure..."
+        choco install tree
+        tree "$Env:ProgramFiles\Docker" /F /A
+        Write-Host "Build stopped for Docker CLI investigation."
+        exit 1
+      }
   - "docker info"
   - "docker version"
 
@@ -91,27 +103,27 @@ install:
   - "git --version"
 
   # Get testing env vars
-  - ps: "
-  If (Test-Path env:BY_CANARY){
-    python -m virtualenv venv_env_vars;
-    ./venv_env_vars/Scripts/pip install boto3;
-    $test_env_var = ./venv_env_vars/Scripts/python tests/get_testing_resources.py;
-    $test_env_var_json = ConvertFrom-Json $test_env_var;
-
-    $env:CI_ACCESS_ROLE_AWS_ACCESS_KEY_ID = $env:AWS_ACCESS_KEY_ID;
-    $env:CI_ACCESS_ROLE_AWS_SECRET_ACCESS_KEY = $env:AWS_SECRET_ACCESS_KEY;
-    $env:CI_ACCESS_ROLE_AWS_SESSION_TOKEN = $env:AWS_SESSION_TOKEN;
-
-    $env:AWS_ACCESS_KEY_ID = $test_env_var_json.accessKeyID;
-    $env:AWS_SECRET_ACCESS_KEY = $test_env_var_json.secretAccessKey;
-    $env:AWS_SESSION_TOKEN = $test_env_var_json.sessionToken;
-    $env:TASK_TOKEN = $test_env_var_json.taskToken;
-    $env:AWS_S3_TESTING = $test_env_var_json.TestBucketName;
-    $env:AWS_ECR_TESTING = $test_env_var_json.TestECRURI;
-    $env:AWS_KMS_KEY = $test_env_var_json.TestKMSKeyArn;
-    $env:AWS_SIGNING_PROFILE_NAME = $test_env_var_json.TestSigningProfileName;
-    $env:AWS_SIGNING_PROFILE_VERSION_ARN = $test_env_var_json.TestSigningProfileARN;
-  }"
+  - ps: |
+      If (Test-Path env:BY_CANARY){
+        python -m virtualenv venv_env_vars;
+        ./venv_env_vars/Scripts/pip install boto3;
+        $test_env_var = ./venv_env_vars/Scripts/python tests/get_testing_resources.py;
+        $test_env_var_json = ConvertFrom-Json $test_env_var;
+
+        $env:CI_ACCESS_ROLE_AWS_ACCESS_KEY_ID = $env:AWS_ACCESS_KEY_ID;
+        $env:CI_ACCESS_ROLE_AWS_SECRET_ACCESS_KEY = $env:AWS_SECRET_ACCESS_KEY;
+        $env:CI_ACCESS_ROLE_AWS_SESSION_TOKEN = $env:AWS_SESSION_TOKEN;
+
+        $env:AWS_ACCESS_KEY_ID = $test_env_var_json.accessKeyID;
+        $env:AWS_SECRET_ACCESS_KEY = $test_env_var_json.secretAccessKey;
+        $env:AWS_SESSION_TOKEN = $test_env_var_json.sessionToken;
+        $env:TASK_TOKEN = $test_env_var_json.taskToken;
+        $env:AWS_S3_TESTING = $test_env_var_json.TestBucketName;
+        $env:AWS_ECR_TESTING = $test_env_var_json.TestECRURI;
+        $env:AWS_KMS_KEY = $test_env_var_json.TestKMSKeyArn;
+        $env:AWS_SIGNING_PROFILE_NAME = $test_env_var_json.TestSigningProfileName;
+        $env:AWS_SIGNING_PROFILE_VERSION_ARN = $test_env_var_json.TestSigningProfileARN;
+      }
 
 
   # Create new virtual environment with chosen python version and activate it
@@ -120,19 +132,18 @@ install:
   - "python --version"
 
   # Install testing pre-reqs without installing sam-cli from source
-  - pip install -r requirements/pre-dev.txt"
-  - pip install -r requirements/dev.txt"
-  - pip install -r requirements/base.txt
-  - pytest --version
+  - "pip install -r requirements/pre-dev.txt"
+  - "pip install -r requirements/dev.txt"
+  - "pip install -r requirements/base.txt"
+  - "pytest --version"
 
   # Install aws cli
   - "pip install awscli"
 
   # Install aws-sam-cli MSI binary
-  - ps: "
-    Invoke-WebRequest -Uri https://github.com/aws/aws-sam-cli/releases/download/sam-cli-nightly/AWS_SAM_CLI_64_PY3.msi -OutFile aws-sam-cli-installer.msi;
-    Start-Process 'C:\\Windows\\System32\\msiexec.exe' -ArgumentList '/i aws-sam-cli-installer.msi /qn /norestart' -wait -PassThru;
-  "
+  - ps: |
+      Invoke-WebRequest -Uri https://github.com/aws/aws-sam-cli/releases/download/sam-cli-nightly/AWS_SAM_CLI_64_PY3.msi -OutFile aws-sam-cli-installer.msi;
+      Start-Process 'C:\\Windows\\System32\\msiexec.exe' -ArgumentList '/i aws-sam-cli-installer.msi /qn /norestart' -wait -PassThru;
   - 'set PATH=C:\Program Files\Amazon\AWSSAMCLI_NIGHTLY\bin\;%PATH%'
   - 'sam-nightly --version'
 
@@ -141,11 +152,10 @@ install:
 
   # use amazon-ecr-credential-helper
   - choco install amazon-ecr-credential-helper
-  - ps: "
-    $docker_config = Get-Content $env:HOME/.docker/config.json -raw | ConvertFrom-Json;
-    $docker_config.credsStore = 'ecr-login';
-    $docker_config | ConvertTo-Json | set-content $env:HOME/.docker/config.json;
-  "
+  - ps: |
+      $docker_config = Get-Content $env:HOME/.docker/config.json -raw | ConvertFrom-Json;
+      $docker_config.credsStore = 'ecr-login';
+      $docker_config | ConvertTo-Json | set-content $env:HOME/.docker/config.json;
   - ps: "get-content $env:HOME/.docker/config.json"
 
   # claim some disk space before starting the tests
@@ -156,22 +166,22 @@ install:
 on_finish:
   # Upload test reports as artifacts
   - ps: Get-ChildItem .\TEST_REPORT-*.json | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-  - ps: '
-  If (Test-Path env:BY_CANARY){
-    $env:AWS_ACCESS_KEY_ID = $env:TEST_REPORT_S3_BUCKET_ACCESS_KEY_ID;
-    $env:AWS_SECRET_ACCESS_KEY = $env:TEST_REPORT_S3_BUCKET_SECRET_ACCESS_KEY;
-    $env:AWS_SESSION_TOKEN = $env:TEST_REPORT_S3_BUCKET_SESSION_TOKEN;
-    aws s3 cp ".\" "s3://$env:TEST_REPORT_S3_BUCKET_NAME/appveyor/$env:APPVEYOR_PROJECT_SLUG/$env:APPVEYOR_BUILD_ID/$env:APPVEYOR_JOB_ID/" --recursive --exclude "*" --include "TEST_REPORT-*.json" --region us-west-2
-  }'
+  - ps: |
+      If (Test-Path env:BY_CANARY){
+        $env:AWS_ACCESS_KEY_ID = $env:TEST_REPORT_S3_BUCKET_ACCESS_KEY_ID;
+        $env:AWS_SECRET_ACCESS_KEY = $env:TEST_REPORT_S3_BUCKET_SECRET_ACCESS_KEY;
+        $env:AWS_SESSION_TOKEN = $env:TEST_REPORT_S3_BUCKET_SESSION_TOKEN;
+        aws s3 cp ".\" "s3://$env:TEST_REPORT_S3_BUCKET_NAME/appveyor/$env:APPVEYOR_PROJECT_SLUG/$env:APPVEYOR_BUILD_ID/$env:APPVEYOR_JOB_ID/" --recursive --exclude "*" --include "TEST_REPORT-*.json" --region us-west-2
+      }
 
   # notify success
-  - ps: "
-  If (Test-Path env:BY_CANARY){
-    $env:AWS_ACCESS_KEY_ID = $env:CI_ACCESS_ROLE_AWS_ACCESS_KEY_ID;
-    $env:AWS_SECRET_ACCESS_KEY = $env:CI_ACCESS_ROLE_AWS_SECRET_ACCESS_KEY;
-    $env:AWS_SESSION_TOKEN = $env:CI_ACCESS_ROLE_AWS_SESSION_TOKEN;
-    aws stepfunctions send-task-success --task-token \"$env:TASK_TOKEN\" --task-output \"{}\" --region us-west-2;
-  }"
+  - ps: |
+      If (Test-Path env:BY_CANARY){
+        $env:AWS_ACCESS_KEY_ID = $env:CI_ACCESS_ROLE_AWS_ACCESS_KEY_ID;
+        $env:AWS_SECRET_ACCESS_KEY = $env:CI_ACCESS_ROLE_AWS_SECRET_ACCESS_KEY;
+        $env:AWS_SESSION_TOKEN = $env:CI_ACCESS_ROLE_AWS_SESSION_TOKEN;
+        aws stepfunctions send-task-success --task-token "$env:TASK_TOKEN" --task-output "{}" --region us-west-2;
+      }
 
 
 for:
@@ -307,4 +317,3 @@ for:
 # Uncomment for RDP
 # on_finish:
 #   - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-  

appveyor-windows.yml

@@ -71,7 +71,7 @@ install:
   - "python --version"
   - ps: "Restart-Service docker"
   # Switch to Docker Linux containers
-  - ps: Switch-DockerLinux
+  - ps: '& $Env:ProgramFiles\Docker\Docker\DockerCli.exe -SwitchLinuxEngine'
   - "docker info"
   - "docker version"
 

requirements/base.txt

@@ -3,24 +3,24 @@ click==8.1.8
 Flask<3.2
 boto3>=1.29.2,<2
 jmespath~=1.0.1
-ruamel_yaml~=0.18.12
+ruamel_yaml~=0.18.14
 PyYAML~=6.0
 cookiecutter~=2.6.0
-aws-sam-translator==1.98.0
+aws-sam-translator==1.99.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=7.1.0
 dateparser~=1.2
-requests~=2.32.3
+requests~=2.32.4
 aws_lambda_builders==1.54.0
-tomlkit==0.13.2
+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
 watchdog==4.0.2
 
 rich~=14.0.0
-pyopenssl~=24.3.0
+pyopenssl~=25.1.0
 # Pin to <4.18 to until SAM-T no longer uses RefResolver
-jsonschema<4.24
+jsonschema<4.25
 
 # Needed for supporting Protocol in Python 3.7, Protocol class became public with python3.8
 typing_extensions>=4.4.0,<5
@@ -31,7 +31,7 @@ regex!=2021.10.8
 tzlocal==5.3.1
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=1.35.4
+cfn-lint~=1.36.0
 
 # Type checking boto3 objects
-boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.38.29
+boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.38.39

requirements/dev.txt

@@ -1,8 +1,8 @@
 -r pre-dev.txt
 
-coverage==7.8.0; python_version>="3.9"
+coverage==7.8.2; python_version>="3.9"
 coverage==7.6.1; python_version<"3.9"
-pytest-cov==6.1.1; python_version>="3.9"
+pytest-cov==6.2.1; python_version>="3.9"
 pytest-cov==5.0.0; python_version<"3.9"
 
 
@@ -19,18 +19,18 @@ types-setuptools==80.9.0.20250529
 types-Pygments==2.19.0.20250516 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20250601
-types-docutils==0.21.0.20250526
+types-docutils==0.21.0.20250604
 types-jsonschema==4.24.0.20250528
 types-pyOpenSSL==24.1.0.20240722
 # lucashuy: pin `types-request` based on the Python version since newer versions of
 # the types require a newer version of requests, which is only installed in newer versions of Python
 types-requests==2.31.0.6; python_version<"3.10"
-types-requests==2.32.0.20250602; python_version>="3.10"
+types-requests==2.32.4.20250611; python_version>="3.10"
 types-urllib3==1.26.25.14
 
 # Test requirements
 
-pytest==8.4.0
+pytest==8.4.1
 
 parameterized==0.9.0
 pytest-xdist==3.7.0

requirements/pre-dev.txt

@@ -1 +1 @@
-ruff==0.11.12
+ruff==0.11.13

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
-setuptools==78.1.1
-pyinstaller==6.13.0
+setuptools==80.9.0
+pyinstaller==6.14.1