Merge from aws/aws-sam-cli/develop

Author: aws-sam-cli-bot

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,6 +14,7 @@
 #### Mandatory Checklist
 **PRs will only be reviewed after checklist is complete**
 
+- [ ] Review the [generative AI contribution guidelines](https://github.com/aws/aws-sam-cli/blob/develop/CONTRIBUTING.md#ai-usage)
 - [ ] Add input/output [type hints](https://docs.python.org/3/library/typing.html) to new functions/methods
 - [ ] Write design document if needed ([Do I need to write a design document?](https://github.com/aws/aws-sam-cli/blob/develop/DEVELOPMENT_GUIDE.md#design-document))
 - [ ] Write/update unit tests

.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,6 +154,7 @@ jobs:
             3.11
             3.12
             3.13
+            3.14
             ${{ matrix.python }}
           cache: 'pip'
       - uses: actions/setup-go@v6
@@ -162,7 +163,7 @@ 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
       - uses: actions/setup-java@v5
@@ -173,6 +174,7 @@ jobs:
             11
             17
             21
+            25
        # Install and configure Rust & Cargo Lambda
       - name: Install and configure Rust & Cargo Lambda
         if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -268,6 +270,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

@@ -414,13 +414,16 @@ coverage.xml
 tests/integration/buildcmd/scratch
 tests/integration/testdata/buildcmd/Dotnet*/bin
 tests/integration/testdata/buildcmd/Dotnet*/obj
+tests/integration/testdata/buildcmd/Java/**/build/
 tests/integration/testdata/invoke/credential_tests/inprocess/dotnet/STS/obj
 tests/integration/testdata/sync/code/after/dotnet_function/src/HelloWorld/obj/
 tests/integration/testdata/sync/code/before/dotnet_function/src/HelloWorld/obj/
+samcli/lib/init/templates/cookiecutter-aws-sam-hello-java-gradle/**/.gradle/
 
 # End of https://www.gitignore.io/api/osx,node,macos,linux,python,windows,pycharm,intellij,sublimetext,visualstudiocode
 
 # Installer build folder
 .build
 
-.kiro
+.kiro
+mise.toml

.gitignore

@@ -8,6 +8,17 @@ documentation, we greatly value feedback and contributions from our community.
 Please read through this document before submitting any issues or pull requests to ensure we have all the necessary 
 information to effectively respond to your bug report or contribution.
 
+## AI Usage
+
+While using generative AI is allowed when contributing to this project, please keep the following points in mind:
+
+* Review all code yourself before you submit it.
+* Understand all the code you have submitted in order to answer any questions the maintainers could have when reviewing your PR.
+* Avoid being overly verbose in code and testing - extra code can be hard to review.
+  * For example, avoid writing unit tests that duplicate existing ones, or test libraries that you're using.
+* Keep PR descriptions, comments, and follow ups concise.
+* Ensure AI-generated code meets the same quality standards as human-written code.
+
 ## Development Guide
 
 Refer to the [Development Guide](DEVELOPMENT_GUIDE.md) for help with environment setup, running tests, submitting a PR, or anything that will make you more productive.

CONTRIBUTING.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

@@ -79,7 +79,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
@@ -237,11 +237,11 @@ install:
   - sh: "npm install [email protected] -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"

appveyor-ubuntu.yml

@@ -57,7 +57,7 @@ install:
   # 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%"