Merge branch 'develop' into dependabot/pip/develop/black-26.3.0

Author: roger-zhangg

.github/dependabot.yml

@@ -26,11 +26,12 @@ updates:
     groups:
       boto:
         patterns:
-        - "boto3"
+        - "boto3[crt]"
         - "boto3-stubs*"
-        - "botocore"
+        - "botocore[crt]"
         - "botocore-stubs"
         - "mypy-boto3-*"
+        - "types-awscrt"
       types:
         patterns:
         - "types-*"

.github/workflows/integration-tests.yml

@@ -13,12 +13,16 @@ init:
 		SAM_CLI_DEV=1 pip install -e '.[dev]'; \
 	fi
 
-# Set up a pytest venv with test dependencies (without installing sam-cli itself)
+# Set up a pytest venv with test dependencies
+# Set up a pytest venv with test dependencies (cross-platform)
 setup-pytest:
-	python3.11 -m venv $(HOME)/pytest
-	uv pip install --python $(HOME)/pytest/bin/python3 --only-deps --extra dev '.'
-	sudo ln -sf $(HOME)/pytest/bin/pytest /usr/local/bin/pytest
-	pytest --version
+	python3.11 -m venv $(HOME)/pytest || python3 -m venv $(HOME)/pytest || python -m venv $(HOME)/pytest
+	uv pip install --python $(HOME)/pytest/bin/python3 --only-deps --extra dev '.' 2>/dev/null || \
+	  uv pip install --python $(HOME)/pytest/Scripts/python.exe --only-deps --extra dev '.'
+	@if [ -f "$(HOME)/pytest/bin/pytest" ]; then \
+	  sudo ln -sf $(HOME)/pytest/bin/pytest /usr/local/bin/pytest 2>/dev/null || true; \
+	fi
+	$(HOME)/pytest/bin/pytest --version 2>/dev/null || $(HOME)/pytest/Scripts/pytest --version
 
 # Install SAM CLI nightly binary
 init-nightly:

Makefile

@@ -45,7 +45,7 @@ dependencies = [
     "docker~=7.1.0",
     "dateparser~=1.3",
     "requests~=2.32.5",
-    "aws_lambda_builders==1.62.0",
+    "aws_lambda_builders==1.63.0",
     "tomlkit==0.14.0",
     "watchdog==4.0.2",
     "rich~=14.3.3",

pyproject.toml

@@ -14,9 +14,9 @@ attrs==25.4.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.62.0 \
-    --hash=sha256:008afea8aa14bd10a1cf8b7c736ceee893b38d8dca15519e6121a384bd86e52f \
-    --hash=sha256:2f1a4baa61c165941d26fdf05966aa4c2e95a66af06b7309bb09558daea4a561
+aws-lambda-builders==1.63.0 \
+    --hash=sha256:58662561bd52d931d62b3ba327acfa0c8e9117c4593eb816b3454ce6b47f4076 \
+    --hash=sha256:9e03d163d78950d8896055afa4f19c0999ea0103076dfa8b0f2012d2503b1657
     # via aws-sam-cli (pyproject.toml)
 aws-sam-translator==1.107.0 \
     --hash=sha256:95b2a03a87fb61d9a9e9e431a18e6221c4780b32792eed4b239e72ef7366d63b \

requirements/reproducible-linux.txt

@@ -14,9 +14,9 @@ attrs==25.4.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.62.0 \
-    --hash=sha256:008afea8aa14bd10a1cf8b7c736ceee893b38d8dca15519e6121a384bd86e52f \
-    --hash=sha256:2f1a4baa61c165941d26fdf05966aa4c2e95a66af06b7309bb09558daea4a561
+aws-lambda-builders==1.63.0 \
+    --hash=sha256:58662561bd52d931d62b3ba327acfa0c8e9117c4593eb816b3454ce6b47f4076 \
+    --hash=sha256:9e03d163d78950d8896055afa4f19c0999ea0103076dfa8b0f2012d2503b1657
     # via aws-sam-cli (pyproject.toml)
 aws-sam-translator==1.107.0 \
     --hash=sha256:95b2a03a87fb61d9a9e9e431a18e6221c4780b32792eed4b239e72ef7366d63b \

requirements/reproducible-mac.txt

@@ -14,9 +14,9 @@ attrs==25.4.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.62.0 \
-    --hash=sha256:008afea8aa14bd10a1cf8b7c736ceee893b38d8dca15519e6121a384bd86e52f \
-    --hash=sha256:2f1a4baa61c165941d26fdf05966aa4c2e95a66af06b7309bb09558daea4a561
+aws-lambda-builders==1.63.0 \
+    --hash=sha256:58662561bd52d931d62b3ba327acfa0c8e9117c4593eb816b3454ce6b47f4076 \
+    --hash=sha256:9e03d163d78950d8896055afa4f19c0999ea0103076dfa8b0f2012d2503b1657
     # via aws-sam-cli (pyproject.toml)
 aws-sam-translator==1.107.0 \
     --hash=sha256:95b2a03a87fb61d9a9e9e431a18e6221c4780b32792eed4b239e72ef7366d63b \

requirements/reproducible-win.txt

@@ -1,8 +1,16 @@
 #!/bin/bash
-# Free up disk space on CI runners if root partition has less than 50GB free.
-# Removes common unused resources that ship with GitHub Actions runners.
+# Free up disk space on CI runners.
+# On Linux: cleans up unused packages if root partition has less than 50GB free.
+# On Windows: just reports disk usage for debugging.
 set -e
 
+# Windows: just show disk usage and exit
+if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
+    echo "=== Windows Disk Usage ==="
+    powershell.exe -Command "Get-PSDrive -PSProvider FileSystem | Format-Table Name, @{N='Used(GB)';E={[math]::Round(\$_.Used/1GB,1)}}, @{N='Free(GB)';E={[math]::Round(\$_.Free/1GB,1)}}, @{N='Total(GB)';E={[math]::Round((\$_.Used+\$_.Free)/1GB,1)}} -AutoSize"
+    exit 0
+fi
+
 echo "=== Disk usage before cleanup ==="
 df -h
 

tests/free_disk_space.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+# Install Maven 3.9.13 and Gradle 9.3.1 for SAM CLI integration tests.
+# Supports both Linux and Windows (Git Bash on GitHub Actions).
+set -euo pipefail
+
+MAVEN_VERSION="3.9.13"
+GRADLE_VERSION="9.3.1"
+
+# Check if correct versions are already installed
+MAVEN_INSTALLED=$(mvn --version 2>/dev/null | head -1 | grep -o "${MAVEN_VERSION}" || true)
+GRADLE_INSTALLED=$(gradle --version 2>/dev/null | grep "Gradle ${GRADLE_VERSION}" || true)
+
+if [[ -n "$MAVEN_INSTALLED" && -n "$GRADLE_INSTALLED" ]]; then
+  echo "Maven ${MAVEN_VERSION} and Gradle ${GRADLE_VERSION} are already installed, skipping."
+  mvn --version
+  gradle --version
+  exit 0
+fi
+
+if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
+  echo "=== Installing Maven ${MAVEN_VERSION} and Gradle ${GRADLE_VERSION} on Windows via choco ==="
+  [[ -z "$MAVEN_INSTALLED" ]] && choco install maven --version="${MAVEN_VERSION}" -y --allow-downgrade
+  [[ -z "$GRADLE_INSTALLED" ]] && choco install gradle --version="${GRADLE_VERSION}" -y --allow-downgrade
+
+  # Chocolatey updates the system PATH in the registry but the current bash session
+  # doesn't see it. Explicitly add the known install paths so mvn/gradle are available
+  # in this session and in subsequent workflow steps.
+  CHOCO_MAVEN_BIN="C:/ProgramData/chocolatey/lib/maven/apache-maven-${MAVEN_VERSION}/bin"
+  CHOCO_GRADLE_BIN="C:/ProgramData/chocolatey/lib/gradle/gradle-${GRADLE_VERSION}/bin"
+  export PATH="${CHOCO_MAVEN_BIN}:${CHOCO_GRADLE_BIN}:${PATH}"
+  echo "${CHOCO_MAVEN_BIN}" >> "$GITHUB_PATH"
+  echo "${CHOCO_GRADLE_BIN}" >> "$GITHUB_PATH"
+else
+  echo "=== Installing Maven ${MAVEN_VERSION} and Gradle ${GRADLE_VERSION} on Linux ==="
+  sudo apt-get remove -y maven || true
+
+  wget -q "https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.zip" -P /tmp
+  sudo unzip -o -q /tmp/apache-maven-*.zip -d /opt/mvn
+
+  wget -q "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" -P /tmp
+  sudo unzip -o -q /tmp/gradle-*.zip -d /opt/gradle
+
+  sudo ln -sf "/opt/mvn/apache-maven-${MAVEN_VERSION}/bin/mvn" /usr/local/bin/mvn
+  sudo ln -sf "/opt/gradle/gradle-${GRADLE_VERSION}/bin/gradle" /usr/local/bin/gradle
+
+  echo "/opt/mvn/apache-maven-${MAVEN_VERSION}/bin" >> "$GITHUB_PATH"
+  echo "/opt/gradle/gradle-${GRADLE_VERSION}/bin" >> "$GITHUB_PATH"
+  echo "MAVEN_HOME=/opt/mvn/apache-maven-${MAVEN_VERSION}" >> "$GITHUB_ENV"
+
+  export PATH="/opt/mvn/apache-maven-${MAVEN_VERSION}/bin:/opt/gradle/gradle-${GRADLE_VERSION}/bin:$PATH"
+fi
+
+mvn --version || echo "WARNING: mvn --version failed"
+gradle --version || echo "WARNING: gradle --version failed"
+echo "=== Maven and Gradle installation complete ==="

tests/install-maven-gradle.sh

@@ -16,33 +16,54 @@ CARGO_LAMBDA_VERSION="${1:-${CARGO_LAMBDA_VERSION:-v0.17.1}}"
 # Install rustup if not present
 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
-  source "$HOME/.cargo/env"
+  # source cargo env (file doesn't exist on Windows where Rust is pre-installed)
+  if [ -f "$HOME/.cargo/env" ]; then
+    source "$HOME/.cargo/env"
+  fi
   if [ -n "${GITHUB_PATH:-}" ]; then
     echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> "$GITHUB_PATH"
   fi
 fi
 
 rustup toolchain install stable --profile minimal --no-self-update
 rustup default stable
-rustup target add x86_64-unknown-linux-gnu --toolchain stable
-rustup target add aarch64-unknown-linux-gnu --toolchain stable
+
+if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
+  # On Windows, add Windows-native targets
+  rustup target add x86_64-pc-windows-msvc --toolchain stable || true
+else
+  rustup target add x86_64-unknown-linux-gnu --toolchain stable
+  rustup target add aarch64-unknown-linux-gnu --toolchain stable
+fi
 
 # Install cargo-lambda and ziglang
 if [ "$USE_UV" = true ]; then
   PYTHON311="$(uv python find 3.11)"
   PYTHON311_BIN="$(dirname "$PYTHON311")"
-  uv pip install --break-system-packages --python "$PYTHON311" "cargo-lambda==$CARGO_LAMBDA_VERSION"
+  uv pip install --break-system-packages --python "$PYTHON311" "cargo-lambda==$CARGO_LAMBDA_VERSION" ziglang
+  PYTHON_CMD="$PYTHON311"
   if [ -n "${GITHUB_PATH:-}" ]; then
     echo "$PYTHON311_BIN" >> "$GITHUB_PATH"
   fi
 else
-  python3.11 -m pip install "cargo-lambda==$CARGO_LAMBDA_VERSION"
-  PYTHON311="python3.11"
+  python3.11 -m pip install "cargo-lambda==$CARGO_LAMBDA_VERSION" ziglang
+  PYTHON_CMD="python3.11"
 fi
 
 # Create a zig wrapper so SAM CLI's cargo-lambda can find it
-printf '#!/bin/bash\nexec %s -m ziglang "$@"\n' "$PYTHON311" | sudo tee /usr/local/bin/zig > /dev/null
-sudo chmod +x /usr/local/bin/zig
+if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
+  # Install zig via chocolatey (most reliable on Windows)
+  choco install zig --no-progress -y 2>/dev/null || true
+  # Fallback: create wrappers using the Python that has ziglang installed
+  if ! command -v zig &>/dev/null; then
+    ZIG_PYTHON="$PYTHON_CMD"
+    printf '#!/bin/bash\nexec "%s" -m ziglang "$@"\n' "$ZIG_PYTHON" > /c/Windows/zig
+    printf '@echo off\r\n"%s" -m ziglang %%*\r\n' "$ZIG_PYTHON" > /c/Windows/zig.cmd
+  fi
+else
+  printf '#!/bin/bash\nexec %s -m ziglang "$@"\n' "$PYTHON_CMD" | sudo tee /usr/local/bin/zig > /dev/null
+  sudo chmod +x /usr/local/bin/zig
+fi
 
 rustc -V
 cargo -V