Merge from aws/aws-sam-cli/develop

aws-sam-cli-bot · web-flow · commit 46f78e4b8838 · 2025-05-02T09:56:59.000-07:00
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 # AWS SAM CLI
 
-![Apache 2.0 License](https://img.shields.io/github/license/aws/aws-sam-cli)
+[![Apache 2.0 License](https://img.shields.io/github/license/aws/aws-sam-cli)](https://github.com/aws/aws-sam-cli/blob/develop/LICENSE)
 ![SAM CLI Version](https://img.shields.io/github/release/aws/aws-sam-cli.svg?label=CLI%20Version)
 ![Install](https://img.shields.io/badge/brew-aws/tap/aws--sam--cli-orange)
 ![pip](https://img.shields.io/badge/pip-aws--sam--cli-9cf)
diff --git a/appveyor-windows-al2023.yml b/appveyor-windows-al2023.yml
@@ -54,7 +54,7 @@ install:
   # Make sure the temp directory exists for Python to use.
   - ps: "mkdir -Force C:\\tmp"
   - "python --version"
-  - 'set PATH=%PYTHON_HOME%;C:\Ruby33-x64\bin;C:\Ruby32-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64;C:\Python313-x64'
+  - 'set PATH=%PYTHON_HOME%;C:\Ruby33-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64;C:\Python313-x64'
   - "node --version"
   - "echo %PYTHON_HOME%"
   - "echo %PATH%"
diff --git a/appveyor-windows-binary.yml b/appveyor-windows-binary.yml
@@ -64,6 +64,7 @@ install:
   - "gradle -v"
   - "mvn --version"
   - choco install ruby --version=3.3.0.1
+  - choco install ruby --version=3.4.2.1
 
   # Make sure the temp directory exists for Python to use.
   - ps: "mkdir -Force C:\\tmp"
diff --git a/appveyor-windows.yml b/appveyor-windows.yml
@@ -62,7 +62,6 @@ install:
   - choco upgrade gradle --version=8.4.0
   - "gradle -v"
   - "mvn --version"
-  - choco install ruby --version=3.3.0.1
 
   # Make sure the temp directory exists for Python to use.
   - ps: "mkdir -Force C:\\tmp"
diff --git a/installer/pyinstaller/build-linux.sh b/installer/pyinstaller/build-linux.sh
@@ -16,7 +16,7 @@ if [ "$python_version" = "" ]; then
 fi
 
 if [ "$openssl_version" = "" ]; then
-    openssl_version="3.3.1";
+    openssl_version="3.3.3";
 fi
 
 if [ "$zlib_version" = "" ]; then
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -31,7 +31,7 @@ regex!=2021.10.8
 tzlocal==5.2
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=1.32.3
+cfn-lint~=1.34.1
 
 # Type checking boto3 objects
 boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.71
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -2,23 +2,23 @@
 
 coverage==7.8.0; python_version>="3.9"
 coverage==7.6.1; python_version<"3.9"
-pytest-cov==6.0.0; python_version>="3.9"
+pytest-cov==6.1.1; python_version>="3.9"
 pytest-cov==5.0.0; python_version<"3.9"
 
 
 # type checking and related stubs
 # mypy adds new rules in new minor versions, which could cause our PR check to fail
 # here we fix its version and upgrade it manually in the future
 mypy==1.15.0
-types-pywin32==310.0.0.20250319; python_version>="3.9"
+types-pywin32==310.0.0.20250429; python_version>="3.9"
 types-pywin32==308.0.0.20241221; python_version<"3.9"
-types-PyYAML==6.0.12.20250326
+types-PyYAML==6.0.12.20250402
 types-chevron==0.14.2.20250103
-types-psutil==7.0.0.20250218
-types-setuptools==77.0.2.20250328
+types-psutil==7.0.0.20250401
+types-setuptools==80.0.0.20250429
 types-Pygments==2.19.0.20250305 
 types-colorama==0.4.15.20240311
-types-dateparser==1.2.0.20250208
+types-dateparser==1.2.0.20250408
 types-docutils==0.21.0.20241128
 types-jsonschema==4.23.0.20241208
 types-pyOpenSSL==24.1.0.20240722
@@ -46,6 +46,6 @@ filelock==3.18.0;  python_version>="3.9"
 filelock==3.16.1;  python_version<"3.9"
 
 # formatter
-black==24.10.0; python_version>="3.9"
+black==25.1.0; python_version>="3.9"
 black==24.8.0; python_version<"3.9"
 psutil==7.0.0
diff --git a/requirements/pre-dev.txt b/requirements/pre-dev.txt
@@ -1 +1 @@
-ruff==0.11.2
+ruff==0.11.7
diff --git a/requirements/pyinstaller-build.txt b/requirements/pyinstaller-build.txt
@@ -1,3 +1,3 @@
 # Executable binary builder requirements
 setuptools==75.6.0
-pyinstaller==6.12.0
+pyinstaller==6.13.0
diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
@@ -129,9 +129,9 @@ cffi==1.17.1 \
     --hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
     --hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
     # via cryptography
-cfn-lint==1.32.3 \
-    --hash=sha256:94ec87e9186dc2cd7d718eb14b4330cbc77889753310fa35600d8c94470bf8d5 \
-    --hash=sha256:a5723e7c7ef537d70b098d43f42f9670ea9856cb21d1699efd7fd9e3aaab26c1
+cfn-lint==1.34.1 \
+    --hash=sha256:2c21a908fa5d9b0c1caac2081c10261eaae7fce88364e4edc607717892f36d68 \
+    --hash=sha256:58f4352c370a710b72b389eda0acd6762e62f926e534d2eb1609d5326ded4bed
     # via aws-sam-cli (setup.py)
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
diff --git a/requirements/reproducible-mac.txt b/requirements/reproducible-mac.txt
@@ -129,9 +129,9 @@ cffi==1.17.1 \
     --hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
     --hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
     # via cryptography
-cfn-lint==1.32.3 \
-    --hash=sha256:94ec87e9186dc2cd7d718eb14b4330cbc77889753310fa35600d8c94470bf8d5 \
-    --hash=sha256:a5723e7c7ef537d70b098d43f42f9670ea9856cb21d1699efd7fd9e3aaab26c1
+cfn-lint==1.34.1 \
+    --hash=sha256:2c21a908fa5d9b0c1caac2081c10261eaae7fce88364e4edc607717892f36d68 \
+    --hash=sha256:58f4352c370a710b72b389eda0acd6762e62f926e534d2eb1609d5326ded4bed
     # via aws-sam-cli (setup.py)
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
diff --git a/requirements/reproducible-win.txt b/requirements/reproducible-win.txt
@@ -129,9 +129,9 @@ cffi==1.17.1 \
     --hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
     --hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
     # via cryptography
-cfn-lint==1.32.3 \
-    --hash=sha256:94ec87e9186dc2cd7d718eb14b4330cbc77889753310fa35600d8c94470bf8d5 \
-    --hash=sha256:a5723e7c7ef537d70b098d43f42f9670ea9856cb21d1699efd7fd9e3aaab26c1
+cfn-lint==1.34.1 \
+    --hash=sha256:2c21a908fa5d9b0c1caac2081c10261eaae7fce88364e4edc607717892f36d68 \
+    --hash=sha256:58f4352c370a710b72b389eda0acd6762e62f926e534d2eb1609d5326ded4bed
     # via aws-sam-cli (setup.py)
 chardet==5.2.0 \
     --hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \
diff --git a/samcli/__init__.py b/samcli/__init__.py
@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.137.1"
+__version__ = "1.138.0"
diff --git a/samcli/hook_packages/terraform/copy_terraform_built_artifacts.py b/samcli/hook_packages/terraform/copy_terraform_built_artifacts.py
@@ -1,13 +1,13 @@
 """
-Python script that prepares artifacts for SAM CLI to invoke. 
+Python script that prepares artifacts for SAM CLI to invoke.
 This script will work in both Linux/MacOS and Windows.
 
 It consists of 5 steps:
 1. create a temporary TF backend (create_backend_override)
 2. run `terraform init -reconfigure`
 3. run `terraform apply` on the SAM CLI Metadata resource
 4. run `terraform out` to produce an output
-5. parse the output to locate the built artifact, and move it to the SAM CLI 
+5. parse the output to locate the built artifact, and move it to the SAM CLI
 build artifact directory (find_and_copy_assets)
 
 Note: This script intentionally does not use Python3 specific syntax.
diff --git a/samcli/hook_packages/terraform/hooks/prepare/types.py b/samcli/hook_packages/terraform/hooks/prepare/types.py
@@ -1,4 +1,4 @@
-""" Contains the data types used in the TF prepare hook"""
+"""Contains the data types used in the TF prepare hook"""
 
 from abc import ABC
 from copy import deepcopy
diff --git a/samcli/hook_packages/terraform/hooks/prepare/utilities.py b/samcli/hook_packages/terraform/hooks/prepare/utilities.py
@@ -1,4 +1,4 @@
-""" Maintain the utilities functions used in prepare hook """
+"""Maintain the utilities functions used in prepare hook"""
 
 from samcli.hook_packages.terraform.hooks.prepare.constants import COMPILED_REGULAR_EXPRESSION
 
diff --git a/samcli/hook_packages/terraform/lib/utils.py b/samcli/hook_packages/terraform/lib/utils.py
@@ -52,7 +52,7 @@ def build_cfn_logical_id(tf_address: str) -> str:
 
 
 def _calculate_configuration_attribute_value_hash(
-    configuration_attribute_value: Union[str, List[Union[ConstantValue, ResolvedReference]]]
+    configuration_attribute_value: Union[str, List[Union[ConstantValue, ResolvedReference]]],
 ) -> str:
     """
     Create a hash value of an attribute value of the resource configuration.
diff --git a/samcli/lib/bootstrap/companion_stack/companion_stack_builder.py b/samcli/lib/bootstrap/companion_stack/companion_stack_builder.py
@@ -1,5 +1,5 @@
 """
-    Companion stack template builder
+Companion stack template builder
 """
 
 from typing import Dict, cast
diff --git a/samcli/lib/bootstrap/companion_stack/companion_stack_manager.py b/samcli/lib/bootstrap/companion_stack/companion_stack_manager.py
@@ -1,5 +1,5 @@
 """
-    Companion stack manager
+Companion stack manager
 """
 
 import logging
diff --git a/samcli/lib/bootstrap/companion_stack/data_types.py b/samcli/lib/bootstrap/companion_stack/data_types.py
@@ -1,5 +1,5 @@
 """
-    Date type classes for companion stacks
+Date type classes for companion stacks
 """
 
 import posixpath
diff --git a/samcli/lib/cookiecutter/exceptions.py b/samcli/lib/cookiecutter/exceptions.py
@@ -1,4 +1,4 @@
-""" Exceptions raised from the cookiecutter workflow"""
+"""Exceptions raised from the cookiecutter workflow"""
 
 
 class CookiecutterErrorException(Exception):
diff --git a/samcli/lib/cookiecutter/interactive_flow_creator.py b/samcli/lib/cookiecutter/interactive_flow_creator.py
@@ -1,4 +1,4 @@
-""" This module parses a json/yaml file that defines a flow of questions to fulfill the cookiecutter context"""
+"""This module parses a json/yaml file that defines a flow of questions to fulfill the cookiecutter context"""
 
 from typing import Dict, Optional, Tuple
 
diff --git a/samcli/lib/cookiecutter/processor.py b/samcli/lib/cookiecutter/processor.py
@@ -1,4 +1,4 @@
-""" Define a processor to process the cookiecutter context before/after generating a cookiecutter project"""
+"""Define a processor to process the cookiecutter context before/after generating a cookiecutter project"""
 
 from abc import ABC, abstractmethod
 from typing import Dict
diff --git a/samcli/lib/cookiecutter/question.py b/samcli/lib/cookiecutter/question.py
@@ -1,4 +1,4 @@
-""" This module represents the questions to ask to the user to fulfill the cookiecutter context. """
+"""This module represents the questions to ask to the user to fulfill the cookiecutter context."""
 
 from abc import ABC, abstractmethod
 from enum import Enum
diff --git a/samcli/lib/init/templates/cookiecutter-aws-sam-hello-ruby/README.md b/samcli/lib/init/templates/cookiecutter-aws-sam-hello-ruby/README.md
@@ -10,7 +10,7 @@ A cookiecutter template to create a Ruby Hello world boilerplate using [Serverle
 
 Generate a boilerplate template in your current project directory using the following syntax:
 
-* **Ruby 3.2**: `sam init --runtime ruby3.2`
+* **Ruby 3.4**: `sam init --runtime ruby3.4`
 
 > **NOTE**: ``--name`` allows you to specify a different project folder name (`sam-app` is the default)
 
diff --git a/samcli/lib/init/templates/cookiecutter-aws-sam-hello-ruby/cookiecutter.json b/samcli/lib/init/templates/cookiecutter-aws-sam-hello-ruby/cookiecutter.json
@@ -1,6 +1,6 @@
 {
     "project_name": "Name of the project",
-    "runtime": "ruby3.2",
+    "runtime": "ruby3.4",
     "architectures": {
         "value": [
             "x86_64"
diff --git a/samcli/lib/package/stream_cursor_utils.py b/samcli/lib/package/stream_cursor_utils.py
@@ -7,7 +7,7 @@
 
 # NOTE: ANSI escape codes.
 # NOTE: Still needs investigation on non terminal environments.
-ESC = "\u001B["
+ESC = "\u001b["
 
 # Enables ANSI escape codes on Windows
 if platform.system().lower() == "windows":
diff --git a/samcli/lib/pipeline/bootstrap/resource.py b/samcli/lib/pipeline/bootstrap/resource.py
@@ -1,4 +1,4 @@
-""" Represents AWS resource"""
+"""Represents AWS resource"""
 
 from typing import Optional
 
diff --git a/samcli/lib/pipeline/bootstrap/stage.py b/samcli/lib/pipeline/bootstrap/stage.py
@@ -1,4 +1,4 @@
-""" Application Environment """
+"""Application Environment"""
 
 import hashlib
 import json
diff --git a/samcli/lib/schemas/schemas_api_caller.py b/samcli/lib/schemas/schemas_api_caller.py
@@ -1,4 +1,4 @@
-""" To isolate Schemas API calls """
+"""To isolate Schemas API calls"""
 
 import json
 import logging
diff --git a/samcli/lib/schemas/schemas_aws_config.py b/samcli/lib/schemas/schemas_aws_config.py
@@ -1,4 +1,4 @@
-""" configure Schemas client based on AWS configuration provided by user """
+"""configure Schemas client based on AWS configuration provided by user"""
 
 import click
 from boto3.session import Session
diff --git a/samcli/lib/schemas/schemas_code_manager.py b/samcli/lib/schemas/schemas_code_manager.py
@@ -1,4 +1,4 @@
-""" Isolates code download and merge logic for dynamic Schemas template """
+"""Isolates code download and merge logic for dynamic Schemas template"""
 
 import json
 import os
diff --git a/samcli/lib/schemas/schemas_constants.py b/samcli/lib/schemas/schemas_constants.py
@@ -1,4 +1,4 @@
-""" Constant related to Schemas """
+"""Constant related to Schemas"""
 
 # cookiecutter template parameter
 SCHEMAS_REGISTRY = "AWS_Schema_registry"
diff --git a/samcli/lib/schemas/schemas_directory_hierarchy_builder.py b/samcli/lib/schemas/schemas_directory_hierarchy_builder.py
@@ -1,4 +1,4 @@
-""" Responsible for building schema code directory hierarchy based on schema name """
+"""Responsible for building schema code directory hierarchy based on schema name"""
 
 import re
 
diff --git a/samcli/lib/sync/sync_flow.py b/samcli/lib/sync/sync_flow.py
@@ -1,4 +1,4 @@
-"""SyncFlow base class """
+"""SyncFlow base class"""
 
 import logging
 from abc import ABC, abstractmethod
diff --git a/samcli/lib/utils/configuration.py b/samcli/lib/utils/configuration.py
@@ -1,4 +1,4 @@
-""" Read info from runtime_config.json file"""
+"""Read info from runtime_config.json file"""
 
 import json
 import logging
diff --git a/samcli/lib/utils/git_repo.py b/samcli/lib/utils/git_repo.py
@@ -1,4 +1,4 @@
-""" Manage Git repo """
+"""Manage Git repo"""
 
 import logging
 import os
diff --git a/samcli/lib/utils/graphql_api.py b/samcli/lib/utils/graphql_api.py
@@ -1,5 +1,4 @@
-"""Helper functions to work with SAM GraphQLApi resource
-"""
+"""Helper functions to work with SAM GraphQLApi resource"""
 
 from typing import Any, Dict, List, Tuple, Union
 
diff --git a/samcli/lib/utils/managed_cloudformation_stack.py b/samcli/lib/utils/managed_cloudformation_stack.py
@@ -296,7 +296,7 @@ def _update_stack(
 
 
 def _generate_stack_parameters(
-    parameter_overrides: Optional[Dict[str, Union[str, List[str]]]] = None
+    parameter_overrides: Optional[Dict[str, Union[str, List[str]]]] = None,
 ) -> List[Dict[str, str]]:
     parameters = []
     if parameter_overrides:
diff --git a/tests/end_to_end/test_runtimes_e2e.py b/tests/end_to_end/test_runtimes_e2e.py
@@ -1,10 +1,8 @@
-from distutils.dir_util import copy_tree
+import shutil
+import os
 from unittest import skipIf
-
 import json
 from pathlib import Path
-
-import os
 from parameterized import parameterized_class
 
 from tests.end_to_end.end_to_end_base import EndToEndBase
@@ -181,7 +179,7 @@ def test_integration(self):
         with EndToEndTestContext(self.app_name) as e2e_context:
             project_path = str(self.e2e_test_data_path / "esbuild-datadog-integration")
             os.mkdir(e2e_context.project_directory)
-            copy_tree(project_path, e2e_context.project_directory)
+            shutil.copytree(project_path, e2e_context.project_directory, dirs_exist_ok=True)
             self.template_path = e2e_context.template_path
             build_command_list = self.get_command_list()
             deploy_command_list = self._get_deploy_command(stack_name)
diff --git a/tests/integration/buildcmd/test_build_cmd.py b/tests/integration/buildcmd/test_build_cmd.py
diff --git a/tests/integration/buildcmd/test_build_cmd_arm64.py b/tests/integration/buildcmd/test_build_cmd_arm64.py
diff --git a/tests/integration/local/invoke/test_integration_cli_images.py b/tests/integration/local/invoke/test_integration_cli_images.py
diff --git a/tests/integration/local/invoke/test_integrations_cli.py b/tests/integration/local/invoke/test_integrations_cli.py
diff --git a/tests/integration/testdata/buildcmd/Ruby34/.ruby-version b/tests/integration/testdata/buildcmd/Ruby34/.ruby-version
diff --git a/tests/integration/testdata/buildcmd/Ruby34/Gemfile b/tests/integration/testdata/buildcmd/Ruby34/Gemfile
diff --git a/tests/integration/testdata/buildcmd/Ruby34/app.rb b/tests/integration/testdata/buildcmd/Ruby34/app.rb
diff --git a/tests/integration/validate/test_validate_command.py b/tests/integration/validate/test_validate_command.py
diff --git a/tests/unit/commands/samconfig/test_samconfig.py b/tests/unit/commands/samconfig/test_samconfig.py
diff --git a/tests/unit/lib/schemas/test_schemas_aws_config.py b/tests/unit/lib/schemas/test_schemas_aws_config.py
