Merge branch 'develop' into feature/serverless-rules-lint

Author: seshubaws

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%"

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"

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"

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

requirements/dev.txt

@@ -15,7 +15,7 @@ types-pywin32==308.0.0.20241221; python_version<"3.9"
 types-PyYAML==6.0.12.20250402
 types-chevron==0.14.2.20250103
 types-psutil==7.0.0.20250401
-types-setuptools==78.1.0.20250329
+types-setuptools==79.0.0.20250422
 types-Pygments==2.19.0.20250305 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20250408
@@ -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

requirements/pyinstaller-build.txt

@@ -1,3 +1,3 @@
 # Executable binary builder requirements
 setuptools==75.6.0
-pyinstaller==6.12.0
+pyinstaller==6.13.0

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 \

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 \

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 \

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.

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

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
 

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.

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

samcli/lib/bootstrap/companion_stack/companion_stack_manager.py

@@ -1,5 +1,5 @@
 """
-    Companion stack manager
+Companion stack manager
 """
 
 import logging

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

samcli/lib/cookiecutter/exceptions.py

@@ -1,4 +1,4 @@
-""" Exceptions raised from the cookiecutter workflow"""
+"""Exceptions raised from the cookiecutter workflow"""
 
 
 class CookiecutterErrorException(Exception):

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
 

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

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

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)
 

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"

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":

samcli/lib/pipeline/bootstrap/resource.py

@@ -1,4 +1,4 @@
-""" Represents AWS resource"""
+"""Represents AWS resource"""
 
 from typing import Optional
 

samcli/lib/pipeline/bootstrap/stage.py

@@ -1,4 +1,4 @@
-""" Application Environment """
+"""Application Environment"""
 
 import hashlib
 import json

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

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

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

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"

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
 

samcli/lib/sync/sync_flow.py

@@ -1,4 +1,4 @@
-"""SyncFlow base class """
+"""SyncFlow base class"""
 
 import logging
 from abc import ABC, abstractmethod

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

samcli/lib/utils/git_repo.py

@@ -1,4 +1,4 @@
-""" Manage Git repo """
+"""Manage Git repo"""
 
 import logging
 import os

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
 

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:

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)

tests/integration/buildcmd/test_build_cmd.py

@@ -272,7 +272,7 @@ def test_building_ruby_3_2(self, use_container):
 
         self._test_with_default_gemfile("ruby3.2", use_container, "Ruby", self.test_data_path)
 
-    @parameterized.expand([("ruby3.3",)])
+    @parameterized.expand([("ruby3.3",), ("ruby3.4",)])
     @skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)
     @pytest.mark.al2023
     def test_building_ruby_al2023(self, runtime):
@@ -288,7 +288,14 @@ def test_building_ruby_3_2(self, use_container):
             self.skipTest(SKIP_DOCKER_MESSAGE)
         self._test_with_default_gemfile("ruby3.2", use_container, "Ruby32", self.test_data_path, "x86_64")
 
-    @parameterized.expand([("ruby3.3", "Ruby33", False), ("ruby3.3", "Ruby33", True)])
+    @parameterized.expand(
+        [
+            ("ruby3.3", "Ruby33", False),
+            ("ruby3.3", "Ruby33", True),
+            # ("ruby3.4", "Ruby34", False), # TODO: Try to make this work in AppVeyor (windows-al2023)
+            ("ruby3.4", "Ruby34", True),
+        ]
+    )
     @skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)
     @pytest.mark.al2023
     def test_building_ruby_al2023(self, runtime, codeuri, use_container):
@@ -301,7 +308,7 @@ class TestBuildCommand_RubyFunctionsWithGemfileInTheRoot(BuildIntegRubyBase):
     This doesn't apply to containerized build, since it copies only the function folder to the container
     """
 
-    @parameterized.expand([("ruby3.2"), ("ruby3.3")])
+    @parameterized.expand([("ruby3.2",), ("ruby3.3",), ("ruby3.4",)])
     def test_building_ruby_in_process_with_root_gemfile(self, runtime):
         self._prepare_application_environment(runtime)
         self._test_with_default_gemfile(runtime, False, "RubyWithRootGemfile", self.working_dir)
@@ -948,7 +955,7 @@ class TestBuildWithDedupBuilds(DedupBuildIntegBase):
             ),
             (False, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs20.x"),
             (False, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
-            (False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.2"),
+            (False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.4"),
             # container
             (
                 True,
@@ -959,7 +966,7 @@ class TestBuildWithDedupBuilds(DedupBuildIntegBase):
             ),
             (True, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs20.x"),
             (True, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
-            (True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.2"),
+            (True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.4"),
         ]
     )
     def test_dedup_build(self, use_container, code_uri, function1_handler, function2_handler, runtime):
@@ -1079,7 +1086,7 @@ class TestBuildWithCacheBuilds(CachedBuildIntegBase):
             ),
             (False, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs20.x"),
             (False, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
-            (False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.2"),
+            (False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.4"),
             # container
             (
                 True,
@@ -1090,7 +1097,7 @@ class TestBuildWithCacheBuilds(CachedBuildIntegBase):
             ),
             (True, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs20.x"),
             (True, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
-            (True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.2"),
+            (True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.4"),
         ]
     )
     def test_cache_build(self, use_container, code_uri, function1_handler, function2_handler, runtime):
@@ -1270,7 +1277,7 @@ class TestParallelBuilds(DedupBuildIntegBase):
             ),
             (False, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs20.x"),
             (False, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
-            (False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.2"),
+            (False, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.4"),
             # container
             (
                 True,
@@ -1281,7 +1288,7 @@ class TestParallelBuilds(DedupBuildIntegBase):
             ),
             (True, "Node", "main.lambdaHandler", "main.secondLambdaHandler", "nodejs20.x"),
             (True, "Python", "main.first_function_handler", "main.second_function_handler", "python3.9"),
-            (True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.2"),
+            (True, "Ruby", "app.lambda_handler", "app.second_lambda_handler", "ruby3.4"),
         ]
     )
     def test_dedup_build(self, use_container, code_uri, function1_handler, function2_handler, runtime):

tests/integration/buildcmd/test_build_cmd_arm64.py

@@ -182,7 +182,7 @@ def test_building_default_package_json_al2023(self, runtime, use_container):
 class TestBuildCommand_RubyFunctions_With_Architecture_arm64(BuildIntegRubyBase):
     template = "template_with_architecture.yaml"
 
-    @parameterized.expand([("ruby3.2", "Ruby32")])
+    @parameterized.expand([("ruby3.2", "Ruby32"), ("ruby3.4", "Ruby34")])
     @skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)
     def test_building_ruby_in_container_with_specified_architecture(self, runtime, code_uri):
         self._test_with_default_gemfile(runtime, "use_container", code_uri, self.test_data_path, ARM64)