Merge from aws/aws-sam-cli/develop

aws-sam-cli-bot · web-flow · commit a184faac381b · 2025-03-27T14:10:05.000-07:00
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -11,7 +11,7 @@ aws-sam-translator==1.95.0
 docker~=7.1.0
 dateparser~=1.2
 requests~=2.32.3
-aws_lambda_builders==1.53.0
+aws_lambda_builders==1.54.0
 tomlkit==0.13.2
 # NOTE: For supporting watchdog in Python3.8, version is pinned to 4.0.2 as 
 # version 5.0.2 introduced some breaking changes for versions > Python3.8
@@ -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/dev.txt b/requirements/dev.txt
@@ -10,12 +10,12 @@ pytest-cov==5.0.0; python_version<"3.9"
 # 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==308.0.0.20250128; python_version>="3.9"
+types-pywin32==309.0.0.20250311; python_version>="3.9"
 types-pywin32==308.0.0.20241221; python_version<"3.9"
 types-PyYAML==6.0.12.20241230
 types-chevron==0.14.2.20250103
 types-psutil==7.0.0.20250218
-types-setuptools==75.8.2.20250305
+types-setuptools==76.0.0.20250313
 types-Pygments==2.19.0.20250305 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20250208
@@ -25,7 +25,7 @@ types-pyOpenSSL==24.1.0.20240722
 # lucashuy: pin `types-request` based on the Python version since newer versions of
 # the types require a newer version of requests, which is only installed in newer versions of Python
 types-requests==2.31.0.6; python_version<"3.10"
-types-requests==2.32.0.20250301; python_version>="3.10"
+types-requests==2.32.0.20250306; python_version>="3.10"
 types-urllib3==1.26.25.14
 
 # Test requirements
@@ -42,7 +42,7 @@ pytest-rerunfailures==14.0;  python_version<"3.9"
 pytest-metadata==3.1.1
 # NOTE (lucashuy): `pytest-json-report` was updated to `pytest-json-report-wip` as the original repository does not seem to be maintained anymore, if `-wip` is updated, validate the changes
 pytest-json-report-wip==1.5.1
-filelock==3.17.0;  python_version>="3.9"
+filelock==3.18.0;  python_version>="3.9"
 filelock==3.16.1;  python_version<"3.9"
 
 # formatter
diff --git a/requirements/reproducible-linux.txt b/requirements/reproducible-linux.txt
@@ -18,9 +18,9 @@ attrs==24.2.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.53.0 \
-    --hash=sha256:ca9ddd99214aef8a113a3fcd7d7fe3951ef0e078478484f03c398a3bdee04ccb \
-    --hash=sha256:d08bfa947fff590f1bedd16c2f4ec7722cbb8869aae80764d99215a41ff284a1
+aws-lambda-builders==1.54.0 \
+    --hash=sha256:168ccca3ee70c68a499741ecf5dc984fc16b169ae7b95baf8118091315b42eb5 \
+    --hash=sha256:c74353b6f4dfda981f3b01aa1e39180a492cbd323852122b6f6451faeb4d15f0
     # via aws-sam-cli (setup.py)
 aws-sam-translator==1.95.0 \
     --hash=sha256:c9e0f22cbe83c768f7d20a3afb7e654bd6bfc087b387528bd48e98366b82ae40 \
@@ -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
@@ -18,9 +18,9 @@ attrs==24.2.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.53.0 \
-    --hash=sha256:ca9ddd99214aef8a113a3fcd7d7fe3951ef0e078478484f03c398a3bdee04ccb \
-    --hash=sha256:d08bfa947fff590f1bedd16c2f4ec7722cbb8869aae80764d99215a41ff284a1
+aws-lambda-builders==1.54.0 \
+    --hash=sha256:168ccca3ee70c68a499741ecf5dc984fc16b169ae7b95baf8118091315b42eb5 \
+    --hash=sha256:c74353b6f4dfda981f3b01aa1e39180a492cbd323852122b6f6451faeb4d15f0
     # via aws-sam-cli (setup.py)
 aws-sam-translator==1.95.0 \
     --hash=sha256:c9e0f22cbe83c768f7d20a3afb7e654bd6bfc087b387528bd48e98366b82ae40 \
@@ -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
@@ -18,9 +18,9 @@ attrs==24.2.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.53.0 \
-    --hash=sha256:ca9ddd99214aef8a113a3fcd7d7fe3951ef0e078478484f03c398a3bdee04ccb \
-    --hash=sha256:d08bfa947fff590f1bedd16c2f4ec7722cbb8869aae80764d99215a41ff284a1
+aws-lambda-builders==1.54.0 \
+    --hash=sha256:168ccca3ee70c68a499741ecf5dc984fc16b169ae7b95baf8118091315b42eb5 \
+    --hash=sha256:c74353b6f4dfda981f3b01aa1e39180a492cbd323852122b6f6451faeb4d15f0
     # via aws-sam-cli (setup.py)
 aws-sam-translator==1.95.0 \
     --hash=sha256:c9e0f22cbe83c768f7d20a3afb7e654bd6bfc087b387528bd48e98366b82ae40 \
@@ -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/samcli/runtime_config.json b/samcli/runtime_config.json
@@ -1,3 +1,3 @@
 {
-    "app_template_repo_commit": "a30000876f1081322acf498babb09382ea191eb7"
+    "app_template_repo_commit": "75b4903a75205abadad59b8e1c4c21ae286b599c"
 }
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
diff --git a/tests/unit/lib/build_module/test_workflow_config.py b/tests/unit/lib/build_module/test_workflow_config.py
