Merge branch 'develop' into dependabot/pip/requirements/develop/coverage-7.7.1

vicheey · web-flow · commit 381c0caafadc · 2025-03-28T13:29:27.000-07:00
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.25.1
+cfn-lint~=1.32.0
 
 # 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/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.25.1 \
-    --hash=sha256:717012566c6034ffa7e60fcf1b350804d093ee37589a1e91a1fd867f33a930b7 \
-    --hash=sha256:bbf6c2d95689da466dc427217ab7ed8f3a2a4a134df70876cc63e41aaad9385a
+cfn-lint==1.32.1 \
+    --hash=sha256:10282c0ec7fc6391da4877d9381a6b954f3c54ddcc0d3c97ee86f4783b5ae680 \
+    --hash=sha256:a8ea63ac8daa69a66a54a796998362fd063d9ba1e9c1fc3c932213b0c027669c
     # 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.25.1 \
-    --hash=sha256:717012566c6034ffa7e60fcf1b350804d093ee37589a1e91a1fd867f33a930b7 \
-    --hash=sha256:bbf6c2d95689da466dc427217ab7ed8f3a2a4a134df70876cc63e41aaad9385a
+cfn-lint==1.32.1 \
+    --hash=sha256:10282c0ec7fc6391da4877d9381a6b954f3c54ddcc0d3c97ee86f4783b5ae680 \
+    --hash=sha256:a8ea63ac8daa69a66a54a796998362fd063d9ba1e9c1fc3c932213b0c027669c
     # 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.25.1 \
-    --hash=sha256:717012566c6034ffa7e60fcf1b350804d093ee37589a1e91a1fd867f33a930b7 \
-    --hash=sha256:bbf6c2d95689da466dc427217ab7ed8f3a2a4a134df70876cc63e41aaad9385a
+cfn-lint==1.32.1 \
+    --hash=sha256:10282c0ec7fc6391da4877d9381a6b954f3c54ddcc0d3c97ee86f4783b5ae680 \
+    --hash=sha256:a8ea63ac8daa69a66a54a796998362fd063d9ba1e9c1fc3c932213b0c027669c
     # 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.135.0"
+__version__ = "1.136.0"
diff --git a/samcli/commands/build/command.py b/samcli/commands/build/command.py
@@ -58,7 +58,7 @@
   ------------------
   1. Python 3.8, 3.9, 3.10, 3.11, 3.12, 3.13 using PIP\n
   2. Nodejs 22.x, Nodejs 20.x, 18.x, 16.x, 14.x, 12.x using NPM\n
-  3. Ruby 3.2, 3.3 using Bundler\n
+  3. Ruby 3.2, 3.3, 3.4 using Bundler\n
   4. Java 8, Java 11, Java 17, Java 21 using Gradle and Maven\n
   5. Dotnet8, Dotnet6 using Dotnet CLI\n
   6. Go 1.x using Go Modules (without --use-container)\n
diff --git a/samcli/lib/build/workflow_config.py b/samcli/lib/build/workflow_config.py
@@ -100,6 +100,7 @@ def get_layer_subfolder(build_workflow: str) -> str:
         "nodejs22.x": "nodejs",
         "ruby3.2": "ruby/lib",
         "ruby3.3": "ruby/lib",
+        "ruby3.4": "ruby/lib",
         "java11": "java",
         "java8.al2": "java",
         "java17": "java",
@@ -167,6 +168,7 @@ def get_workflow_config(
         "nodejs22.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "ruby3.2": BasicWorkflowSelector(RUBY_BUNDLER_CONFIG),
         "ruby3.3": BasicWorkflowSelector(RUBY_BUNDLER_CONFIG),
+        "ruby3.4": BasicWorkflowSelector(RUBY_BUNDLER_CONFIG),
         "dotnet6": BasicWorkflowSelector(DOTNET_CLIPACKAGE_CONFIG),
         "dotnet8": BasicWorkflowSelector(DOTNET_CLIPACKAGE_CONFIG),
         "go1.x": BasicWorkflowSelector(GO_MOD_CONFIG),
diff --git a/samcli/lib/utils/architecture.py b/samcli/lib/utils/architecture.py
@@ -27,6 +27,7 @@
     "python3.13": [ARM64, X86_64],
     "ruby3.2": [ARM64, X86_64],
     "ruby3.3": [ARM64, X86_64],
+    "ruby3.4": [ARM64, X86_64],
     "java8.al2": [ARM64, X86_64],
     "java11": [ARM64, X86_64],
     "java17": [ARM64, X86_64],
diff --git a/samcli/local/common/runtime_template.py b/samcli/local/common/runtime_template.py
@@ -24,7 +24,7 @@
     ],
     "ruby": [
         {
-            "runtimes": ["ruby3.3", "ruby3.2"],
+            "runtimes": ["ruby3.4", "ruby3.3", "ruby3.2"],
             "dependency_manager": "bundler",
             "init_location": os.path.join(_templates, "cookiecutter-aws-sam-hello-ruby"),
             "build": True,
@@ -125,6 +125,7 @@ def get_local_lambda_images_location(mapping, runtime):
     "python3.9",
     "python3.8",
     # ruby runtimes in descending order
+    "ruby3.4",
     "ruby3.3",
     "ruby3.2",
 ]
@@ -150,6 +151,7 @@ def get_local_lambda_images_location(mapping, runtime):
     "python3.10": "amazon/python3.10-base",
     "python3.9": "amazon/python3.9-base",
     "python3.8": "amazon/python3.8-base",
+    "ruby3.4": "amazon/ruby3.4-base",
     "ruby3.3": "amazon/ruby3.3-base",
     "ruby3.2": "amazon/ruby3.2-base",
 }
diff --git a/samcli/local/docker/lambda_image.py b/samcli/local/docker/lambda_image.py
@@ -47,6 +47,7 @@ class Runtime(Enum):
     python313 = "python3.13"
     ruby32 = "ruby3.2"
     ruby33 = "ruby3.3"
+    ruby34 = "ruby3.4"
     java8al2 = "java8.al2"
     java11 = "java11"
     java17 = "java17"
diff --git a/schema/samcli.json b/schema/samcli.json
diff --git a/tests/integration/buildcmd/test_build_cmd.py b/tests/integration/buildcmd/test_build_cmd.py
@@ -316,7 +316,7 @@ def _prepare_application_environment(self, runtime):
         └── template.yaml
         """
         # copy .ruby-version to the root of the project
-        ruby_runtime_path = "Ruby32" if runtime == "ruby3.2" else "Ruby33"
+        ruby_runtime_path = runtime.replace(".", "").title()  # ruby3.X to Ruby3X
         shutil.copyfile(
             Path(self.template_path).parent.joinpath(ruby_runtime_path, ".ruby-version"),
             Path(self.working_dir).joinpath(".ruby-version"),
diff --git a/tests/unit/lib/build_module/test_workflow_config.py b/tests/unit/lib/build_module/test_workflow_config.py
@@ -101,7 +101,7 @@ def test_raise_exception_for_bad_specified_workflow(self, runtime):
         with self.assertRaises(UnsupportedBuilderException):
             get_workflow_config(runtime, self.code_dir, self.project_dir, specified_workflow="Wrong")
 
-    @parameterized.expand([("ruby3.2",)])
+    @parameterized.expand([("ruby3.2",), ("ruby3.3",), ("ruby3.4",)])
     def test_must_work_for_ruby(self, runtime):
         result = get_workflow_config(runtime, self.code_dir, self.project_dir)
         self.assertEqual(result.language, "ruby")
