From f6fb21474c980feb1189d415ac8ada7741d8fbea Mon Sep 17 00:00:00 2001 From: Haresh Nasit Date: Tue, 6 Feb 2024 16:12:51 -0800 Subject: [PATCH] Remove ruby2.7 runtime init templates --- .github/workflows/build_test_invoke.yml | 6 ---- manifest-v2.json | 28 ------------------- ruby/hello-img/cookiecutter.json | 5 +--- ruby/hello/cookiecutter.json | 5 +--- ruby/step-func/cookiecutter.json | 5 +--- .../integration/build_invoke/test_ruby_2_7.py | 24 ---------------- .../unit_test/test_unit_test_ruby2_7.py | 17 ----------- 7 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 tests/integration/build_invoke/test_ruby_2_7.py delete mode 100644 tests/integration/unit_test/test_unit_test_ruby2_7.py diff --git a/.github/workflows/build_test_invoke.yml b/.github/workflows/build_test_invoke.yml index 813205301..b4b318cbd 100644 --- a/.github/workflows/build_test_invoke.yml +++ b/.github/workflows/build_test_invoke.yml @@ -235,12 +235,6 @@ jobs: fail-fast: false matrix: include: - - version: '2.7' - type: 'Test' - file: 'tests/integration/unit_test/test_unit_test_ruby2_7.py' - - version: '2.7' - type: 'Invoke' - file: 'tests/integration/build_invoke/test_ruby_2_7.py' - version: '3.2' type: 'Test' file: 'tests/integration/unit_test/test_unit_test_ruby3_2.py' diff --git a/manifest-v2.json b/manifest-v2.json index 259a0e722..712ee3d97 100644 --- a/manifest-v2.json +++ b/manifest-v2.json @@ -1278,24 +1278,6 @@ "useCaseName": "Multi-step workflow with Connectors" } ], - "ruby2.7": [ - { - "directory": "ruby/hello", - "displayName": "Hello World Example", - "dependencyManager": "bundler", - "appTemplate": "hello-world", - "packageType": "Zip", - "useCaseName": "Hello World Example" - }, - { - "directory": "ruby/step-func", - "displayName": "Step Functions Sample App (Stock Trader)", - "dependencyManager": "bundler", - "appTemplate": "step-functions-sample-app", - "packageType": "Zip", - "useCaseName": "Multi-step workflow" - } - ], "ruby3.2": [ { "directory": "ruby/hello", @@ -1536,16 +1518,6 @@ "useCaseName": "Machine Learning" } ], - "amazon/ruby2.7-base": [ - { - "directory": "ruby/hello-img", - "displayName": "Hello World Lambda Image Example", - "dependencyManager": "bundler", - "appTemplate": "hello-world-lambda-image", - "packageType": "Image", - "useCaseName": "Hello World Example" - } - ], "amazon/ruby3.2-base": [ { "directory": "ruby/hello-img", diff --git a/ruby/hello-img/cookiecutter.json b/ruby/hello-img/cookiecutter.json index f2b04c9d2..58645bec9 100644 --- a/ruby/hello-img/cookiecutter.json +++ b/ruby/hello-img/cookiecutter.json @@ -1,15 +1,12 @@ { "project_name": "Name of the project", - "runtime": ["ruby2.7", "ruby3.2"], + "runtime": ["ruby3.2"], "architectures": { "value": [ "x86_64", "arm64" ] }, "options": { - "ruby2.7": { - "version": "2.7" - }, "ruby3.2": { "version": "3.2" } diff --git a/ruby/hello/cookiecutter.json b/ruby/hello/cookiecutter.json index f2b04c9d2..58645bec9 100644 --- a/ruby/hello/cookiecutter.json +++ b/ruby/hello/cookiecutter.json @@ -1,15 +1,12 @@ { "project_name": "Name of the project", - "runtime": ["ruby2.7", "ruby3.2"], + "runtime": ["ruby3.2"], "architectures": { "value": [ "x86_64", "arm64" ] }, "options": { - "ruby2.7": { - "version": "2.7" - }, "ruby3.2": { "version": "3.2" } diff --git a/ruby/step-func/cookiecutter.json b/ruby/step-func/cookiecutter.json index f2b04c9d2..58645bec9 100644 --- a/ruby/step-func/cookiecutter.json +++ b/ruby/step-func/cookiecutter.json @@ -1,15 +1,12 @@ { "project_name": "Name of the project", - "runtime": ["ruby2.7", "ruby3.2"], + "runtime": ["ruby3.2"], "architectures": { "value": [ "x86_64", "arm64" ] }, "options": { - "ruby2.7": { - "version": "2.7" - }, "ruby3.2": { "version": "3.2" } diff --git a/tests/integration/build_invoke/test_ruby_2_7.py b/tests/integration/build_invoke/test_ruby_2_7.py deleted file mode 100644 index f1abc2426..000000000 --- a/tests/integration/build_invoke/test_ruby_2_7.py +++ /dev/null @@ -1,24 +0,0 @@ -from unittest import skip -from tests.integration.build_invoke.build_invoke_base import BuildInvokeBase - -""" -For each template, it will test the following sam commands: -1. sam init -2. sam build --use-container (if self.use_container is False, --use-container will be omitted) -3. (if there are event jsons), for each event json, check `sam local invoke` response is a valid json -""" - -class BuildInvoke_ruby2_7_cookiecutter_aws_sam_hello_ruby(BuildInvokeBase.HelloWorldExclamationBuildInvokeBase): - runtime = "ruby2.7" - directory = "ruby/hello" - - -class BuildInvoke_ruby2_7_cookiecutter_aws_sam_step_functions_sample_app(BuildInvokeBase.BuildInvokeBase): - runtime = "ruby2.7" - directory = "ruby/step-func" - -class BuildInvoke_image_ruby2_7_cookiecutter_aws_sam_hello_ruby_lambda_image( - BuildInvokeBase.HelloWorldExclamationBuildInvokeBase -): - runtime = "ruby2.7" - directory = "ruby/hello-img" diff --git a/tests/integration/unit_test/test_unit_test_ruby2_7.py b/tests/integration/unit_test/test_unit_test_ruby2_7.py deleted file mode 100644 index 99e9d4748..000000000 --- a/tests/integration/unit_test/test_unit_test_ruby2_7.py +++ /dev/null @@ -1,17 +0,0 @@ -from tests.integration.unit_test.unit_test_base import UnitTestBase - - -class UnitTest_ruby2_7_cookiecutter_aws_sam_hello_ruby(UnitTestBase.RubyUnitTestBase): - runtime = "ruby2.7" - directory = "ruby/hello" - code_directories = ["tests/unit/test_handler.rb"] - - -class UnitTest_ruby2_7_cookiecutter_aws_sam_step_functions_sample_app(UnitTestBase.RubyUnitTestBase): - runtime = "ruby2.7" - directory = "ruby/step-func" - code_directories = [ - "tests/unit/test_stock_buyer.rb", - "tests/unit/test_stock_checker.rb", - "tests/unit/test_stock_seller.rb", - ]