test: Add Ruby3.4 to integ tests (aws#7984)

Also change the runtime of the Ruby `init` template to 3.4 (when the full list
can't be retrieved online)

Co-authored-by: vicheey <[email protected]>
Co-authored-by: Roger Zhang <[email protected]>

Author: 3 people

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"

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"

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)

tests/integration/testdata/buildcmd/Ruby34/.ruby-version

@@ -0,0 +1 @@
+3.4.2

tests/integration/testdata/buildcmd/Ruby34/Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "aws-eventstream"
+
+ruby '~> 3.4'

tests/integration/testdata/buildcmd/Ruby34/app.rb

@@ -0,0 +1,9 @@
+require 'json'
+
+def lambda_handler(event:, context:)
+  "Hello World"
+end
+
+def second_lambda_handler(event:, context:)
+  "Hello Mars"
+end