Merge branch 'develop' into expanded-parameter-overrides

Author: vicheey

.github/workflows/build.yml

@@ -120,7 +120,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"
@@ -154,15 +154,17 @@ jobs:
             3.11
             3.12
             3.13
+            3.14
             ${{ matrix.python }}
           cache: 'pip'
       - 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@v5
+      - uses: actions/setup-node@v6
         with:
           node-version: 22
       - uses: actions/setup-java@v5
@@ -173,6 +175,10 @@ 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
         if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -268,6 +274,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/integration-tests.yml

@@ -32,7 +32,7 @@ jobs:
           sudo ./sam-installation/install
           sam-beta --version
           ./tests/sanity-check.sh
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: pyinstaller-linux-zip
           path: .build/output/aws-sam-cli-linux-x86_64.zip
@@ -61,7 +61,7 @@ jobs:
           sudo ./sam-installation/install
           sam-beta --version
           ./tests/sanity-check.sh
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: pyinstaller-macos-zip
           path: .build/output/aws-sam-cli-macos-x86_64.zip

.github/workflows/validate_pyinstaller.yml

@@ -10,7 +10,6 @@
 .idea/**/tasks.xml
 .idea/dictionaries
 .idea
-.vscode
 
 # Sensitive or high-churn files:
 .idea/**/dataSources/
@@ -376,10 +375,7 @@ GitHub.sublime-settings
 
 ### VisualStudioCode ###
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
+!.vscode/launch.json.template
 .history
 
 ### Theia editor (GitPod)
@@ -425,4 +421,8 @@ samcli/lib/init/templates/cookiecutter-aws-sam-hello-java-gradle/**/.gradle/
 # Installer build folder
 .build
 
-.kiro
+.kiro
+mise.toml
+
+# Durable executions
+**/.durable-executions-local/

.gitignore

@@ -0,0 +1,67 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Run: Remote Invoke Sync",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${workspaceFolder}/samcli/__main__.py",
+      "python": "${command:python.interpreterPath}",
+      "args": [
+        "remote",
+        "invoke",
+        "<REMOTE_LAMBDA_ARN>",
+        "--debug",
+        "--output",
+        "json"
+      ],
+      "env": {
+        "PYTHONPATH": "${workspaceFolder}"
+      },
+      "console": "integratedTerminal",
+      "justMyCode": false
+    },
+    {
+      "name": "Run: Remote Invoke Streaming Response",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${workspaceFolder}/samcli/__main__.py",
+      "python": "${command:python.interpreterPath}",
+      "args": [
+        "remote",
+        "invoke",
+        "<REMOTE_LAMBDA_ARN>",
+        "--debug",
+        "--output",
+        "json"
+      ],
+      "env": {
+        "PYTHONPATH": "${workspaceFolder}"
+      },
+      "console": "integratedTerminal",
+      "justMyCode": false
+    },
+    {
+      "name": "Test: Run current test file",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "pytest",
+      "args": ["${file}", "-v"],
+      "python": "${command:python.interpreterPath}",
+      "console": "integratedTerminal",
+      "justMyCode": false
+    },
+    {
+      "name": "Format and PR",
+      "type": "node",
+      "request": "launch",
+      "runtimeExecutable": "bash",
+      "runtimeArgs": [
+        "-c",
+        "cd \"${workspaceFolder}\" && make black && make pr"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
+    }
+  ]
+}

.vscode/launch.json.template

@@ -110,8 +110,18 @@ samdev --version  # this will print something like "SAM CLI, version x.xx.x"
 echo '__version__ = "123.456.789"' >> samcli/__init__.py
 samdev --version  # this will print "SAM CLI, version 123.456.789"
 ```
+### 3 VS Code Debugger
 
-### 3. (Optional) Install development version of SAM Transformer
+For VS Code Launch configuration, run the following command to create your local VS Code launch configuration:
+
+```bash
+cp .vscode/launch.json.template .vscode/launch.json
+```
+
+This will create a local copy of the launch configuration that you can customize without affecting the shared template.
+
+
+### 4. (Optional) Install development version of SAM Transformer
 
 If you want to run the latest version of [SAM Transformer](https://github.com/aws/serverless-application-model/)
 or work on it at the same time, you can clone it locally and install it in your virtual environment. 

DEVELOPMENT_GUIDE.md

@@ -13,8 +13,7 @@ init:
 	fi
 
 test:
-	# Run unit tests
-	# Fail if coverage falls below 95%
+	# Run unit tests and fail if coverage falls below 94%
 	pytest --cov samcli --cov schema --cov-report term-missing --cov-fail-under 94 tests/unit
 
 test-cov-report:

Makefile

@@ -46,14 +46,15 @@ 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"
+  - sh: "git -C ~/.rbenv/plugins/ruby-build pull"
   - sh: "rbenv install 3.3.7"
-  - sh: "rbenv install 3.4.2"
+  - sh: "rbenv install 3.4.7"
   - sh: "rbenv install 3.2.7"
   - sh: "rbenv global 3.3.7"
   - sh: "ruby --version"
@@ -79,7 +80,7 @@ install:
   - sh: "./aws_cli/bin/python -m pip install awscli"
   - sh: "PATH=$(echo $PWD'/aws_cli/bin'):$PATH"
 
-  - sh: "PATH=$PATH:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin:$HOME/venv3.13/bin"
+  - sh: "PATH=$PATH:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin:$HOME/venv3.13/bin:$HOME/venv3.14/bin"
 
   # Install pytest
   - sh: "python3.9 -m venv $HOME/pytest"

appveyor-linux-binary.yml

@@ -44,11 +44,11 @@ install:
   # AppVeyor's apt-get cache might be outdated, and the package could potentially be 404.
   - sh: "sudo apt-get update --allow-releaseinfo-change"
 
-  # install coretto 21
+  # install coretto 25
   - sh: wget -O - https://apt.corretto.aws/corretto.key | sudo gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg
   - sh: echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | sudo tee /etc/apt/sources.list.d/corretto.list
-  - sh: sudo apt-get update; sudo apt-get install -y java-21-amazon-corretto-jdk
-  - sh: JAVA_HOME=/usr/lib/jvm/java-21-amazon-corretto
+  - sh: sudo apt-get update; sudo apt-get install -y java-25-amazon-corretto-jdk
+  - sh: JAVA_HOME=/usr/lib/jvm/java-25-amazon-corretto
   - sh: PATH=$JAVA_HOME/bin:$PATH
   - sh: java --version
   - sh: javac --version
@@ -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)
@@ -237,11 +237,11 @@ install:
   - sh: "npm install npm@10.2.3 -g"
   - sh: "npm -v"
 
-  # Install latest gradle
+  # Install latest gradle comptabile with Java 25
   - sh: "sudo apt-get -y remove gradle"
-  - sh: "wget https://services.gradle.org/distributions/gradle-9.0.0-bin.zip -P /tmp"
+  - sh: "wget https://services.gradle.org/distributions/gradle-9.2.0-bin.zip -P /tmp"
   - sh: "sudo unzip -d /opt/gradle /tmp/gradle-*.zip"
-  - sh: "PATH=/opt/gradle/gradle-9.0.0/bin:$PATH"
+  - sh: "PATH=/opt/gradle/gradle-9.2.0/bin:$PATH"
   - sh: "gradle --version"
 
   # Install dotnet8 SDK
@@ -253,7 +253,16 @@ install:
   - sh: "./aws_cli/bin/python -m pip install awscli"
   - sh: "PATH=$(echo $PWD'/aws_cli/bin'):$PATH"
 
-  - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin:$HOME/venv3.13/bin"
+  # install python 3.14
+  - sh: |
+      DEST="$HOME/venv3.14"
+      URL="https://github.com/astral-sh/python-build-standalone/releases/download/20251031/cpython-3.14.0+20251031-x86_64-unknown-linux-gnu-install_only.tar.gz"
+      curl -L "$URL" | tar -xz
+      mv python $DEST
+      $HOME/venv3.14/bin/python --version
+      $HOME/venv3.14/bin/pip --version
+
+  - sh: "PATH=$PATH:$HOME/venv3.7/bin:$HOME/venv3.8/bin:$HOME/venv3.9/bin:$HOME/venv3.10/bin:$HOME/venv3.11/bin:$HOME/venv3.12/bin:$HOME/venv3.13/bin:$HOME/venv3.14/bin"
 
   # update ca-certificates which causes failures with newest golang library
   - sh: "sudo apt-get install --reinstall ca-certificates"
@@ -295,6 +304,8 @@ install:
   - sh: 'export AWS_KMS_KEY=$(echo "$test_env_var" | jq -j ".TestKMSKeyArn")'
   - sh: 'export AWS_SIGNING_PROFILE_NAME=$(echo "$test_env_var" | jq -j ".TestSigningProfileName")'
   - 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")'
 
   # Runtime-aware Docker Hub authentication with fail-fast
   - sh: |
@@ -444,8 +455,9 @@ for:
 
     test_script:
       # Install Ruby for Ruby build tests
+      - sh: "git -C ~/.rbenv/plugins/ruby-build pull"
       - sh: "rbenv install 3.3.7"
-      - sh: "rbenv install 3.4.2"
+      - sh: "rbenv install 3.4.7"
       - sh: "rbenv install 3.2.7"
       - sh: "rbenv global 3.3.7"
       - sh: "ruby --version"
@@ -465,8 +477,9 @@ for:
 
     test_script:
       # Install Ruby for Ruby ARM64 build tests
+      - sh: "git -C ~/.rbenv/plugins/ruby-build pull"
       - sh: "rbenv install 3.3.7"
-      - sh: "rbenv install 3.4.2"
+      - sh: "rbenv install 3.4.7"
       - sh: "rbenv install 3.2.7"
       - sh: "rbenv global 3.3.7"
       - sh: "ruby --version"
@@ -510,8 +523,9 @@ for:
 
     test_script:
       # Install Ruby for Ruby sync tests
+      - sh: "git -C ~/.rbenv/plugins/ruby-build pull"
       - sh: "rbenv install 3.3.7"
-      - sh: "rbenv install 3.4.2"
+      - sh: "rbenv install 3.4.7"
       - sh: "rbenv install 3.2.7"
       - sh: "rbenv global 3.3.7"
       - sh: "ruby --version"
@@ -556,8 +570,9 @@ for:
 
     test_script:
       # Install Ruby for Ruby validation and other tests
+      - sh: "git -C ~/.rbenv/plugins/ruby-build pull"
       - sh: "rbenv install 3.3.7"
-      - sh: "rbenv install 3.4.2"
+      - sh: "rbenv install 3.4.7"
       - sh: "rbenv install 3.2.7"
       - sh: "rbenv global 3.3.7"
       - sh: "ruby --version"

appveyor-ubuntu.yml

@@ -50,14 +50,14 @@ install:
   - choco upgrade gradle --version=9.0.0
   - choco install ruby --version=3.2.7.1
   - choco install ruby --version=3.3.7.1
-  - choco install ruby --version=3.4.2.1
+  - choco install ruby --version=3.4.7.1
   - "gradle -v"
   - "mvn --version"
 
   # Make sure the temp directory exists for Python to use.
   - ps: "mkdir -Force C:\\tmp"
   - "python --version"
-  - 'set PATH=%PYTHON_HOME%;C:\Ruby32-x64\bin;C:\Ruby33-x64\bin;C:\Ruby34-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64;C:\Python313-x64'
+  - 'set PATH=%PYTHON_HOME%;C:\Ruby32-x64\bin;C:\Ruby33-x64\bin;C:\Ruby34-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64;C:\Python313-x64;C:\Python314-x64'
   - "node --version"
   - "echo %PYTHON_HOME%"
   - "echo %PATH%"
@@ -102,6 +102,8 @@ install:
     $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;
+    $env:LMI_SUBNET_ID = $test_env_var_json.LMISubnetId;
+    $env:LMI_SECURITY_GROUP_ID = $test_env_var_json.LMISecurityGroupId;
   }"