refactor!: Drop support for deprecated runtimes (aws#1967)

* refactor!: Drop support for deprecated runtimes The following runtimes have been deprecated by AWS Lambda and are being removed from build, init, and invoke|start-api|start-lambda commands: - dotnetcore1.0 - dotnetcore2.0 - nodejs4.3 - nodejs6.10 - nodejs8.10 * Remove nodejs runtime which is not even a valid runtime * Format with black Co-authored-by: Jacob Fuss <[email protected]> Co-authored-by: Sriram Madapusi Vasudevan <[email protected]>
thoward-godaddy · May 7, 2020 · 972fa19 · 972fa19
1 parent da9f5bd
commit 972fa19
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 158 deletions.
diff --git a/...utter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/HelloWorld.csproj b/...utter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/HelloWorld.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    {%- if cookiecutter.runtime == 'dotnetcore2.0' %}
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    {%- elif cookiecutter.runtime == 'dotnetcore2.1' %}
+    {%- if cookiecutter.runtime == 'dotnetcore2.1' %}
     <TargetFramework>netcoreapp2.1</TargetFramework>
     {%- else %}
     <TargetFramework>netcoreapp3.1</TargetFramework>

diff --git a/...-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/aws-lambda-tools-defaults.json b/...-hello-dotnet/{{cookiecutter.project_name}}/src/HelloWorld/aws-lambda-tools-defaults.json
@@ -11,9 +11,7 @@
   "profile":"",
   "region" : "",
   "configuration": "Release",
-  {%- if cookiecutter.runtime == 'dotnetcore2.0' %}
-  "framework": "netcoreapp2.0",
-  {%- elif cookiecutter.runtime == 'dotnetcore2.1' %}
+  {%- if cookiecutter.runtime == 'dotnetcore2.1' %}
   "framework": "netcoreapp2.1",
   {%- else %}
   "framework" : "netcoreapp3.1",

diff --git a/...t/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/template.yaml b/...t/templates/cookiecutter-aws-sam-hello-dotnet/{{cookiecutter.project_name}}/template.yaml
@@ -14,9 +14,7 @@ Resources:
     Properties:
       CodeUri: ./src/HelloWorld/
       Handler: HelloWorld::HelloWorld.Function::FunctionHandler
-      {%- if cookiecutter.runtime == 'dotnetcore2.0' %}
-      Runtime: {{ cookiecutter.runtime }}
-      {%- elif cookiecutter.runtime == 'dotnetcore2.1' %}
+      {%- if cookiecutter.runtime == 'dotnetcore2.1' %}
       Runtime: {{ cookiecutter.runtime }}
       {%- else %}
       Runtime: dotnetcore3.1

diff --git a/samcli/local/common/runtime_template.py b/samcli/local/common/runtime_template.py
@@ -38,7 +38,7 @@
     ],
     "dotnet": [
         {
-            "runtimes": ["dotnetcore3.1", "dotnetcore2.1", "dotnetcore2.0", "dotnetcore1.0"],
+            "runtimes": ["dotnetcore3.1", "dotnetcore2.1"],
             "dependency_manager": "cli-package",
             "init_location": os.path.join(_templates, "cookiecutter-aws-sam-hello-dotnet"),
             "build": True,
@@ -79,8 +79,6 @@
     "nodejs10.x": ["npm"],
     "dotnetcore3.1": ["cli-package"],
     "dotnetcore2.1": ["cli-package"],
-    "dotnetcore2.0": ["cli-package"],
-    "dotnetcore1.0": ["cli-package"],
     "go1.x": ["mod"],
     "java8": ["maven", "gradle"],
     "java11": ["maven", "gradle"],
@@ -118,8 +116,6 @@
     "java8",
     # older dotnetcore runtimes
     "dotnetcore2.1",
-    "dotnetcore2.0",
-    "dotnetcore1.0",
 ]
 
 # Schemas Code lang is a MINIMUM supported version - this is why later Lambda runtimes can be mapped to earlier Schemas Code Languages

diff --git a/samcli/local/docker/lambda_debug_settings.py b/samcli/local/docker/lambda_debug_settings.py
@@ -64,12 +64,6 @@ def get_debug_settings(debug_port, debug_args_list, runtime, options):
                     + " ".join(debug_args_list)
                 },
             ),
-            Runtime.dotnetcore20.value: DebugSettings(
-                ["/var/lang/bin/dotnet"]
-                + debug_args_list
-                + ["/var/runtime/MockBootstraps.dll", "--debugger-spin-wait"],
-                debug_env_vars={},
-            ),
             Runtime.dotnetcore21.value: DebugSettings(
                 ["/var/lang/bin/dotnet"]
                 + debug_args_list
@@ -82,63 +76,6 @@ def get_debug_settings(debug_port, debug_args_list, runtime, options):
                 + ["-debug=true", "-delvePort=" + str(debug_port), "-delvePath=" + options.get("delvePath")],
                 debug_env_vars={},
             ),
-            Runtime.nodejs.value: DebugSettings(
-                ["/usr/bin/node"]
-                + debug_args_list
-                + [
-                    "--debug-brk=" + str(debug_port),
-                    "--nolazy",
-                    "--max-old-space-size=1229",
-                    "--max-new-space-size=153",
-                    "--max-executable-size=153",
-                    "--expose-gc",
-                    "/var/runtime/node_modules/awslambda/bin/awslambda",
-                ],
-                debug_env_vars={},
-            ),
-            Runtime.nodejs43.value: DebugSettings(
-                ["/usr/local/lib64/node-v4.3.x/bin/node"]
-                + debug_args_list
-                + [
-                    "--debug-brk=" + str(debug_port),
-                    "--nolazy",
-                    "--max-old-space-size=2547",
-                    "--max-semi-space-size=150",
-                    "--max-executable-size=160",
-                    "--expose-gc",
-                    "/var/runtime/node_modules/awslambda/index.js",
-                ],
-                debug_env_vars={},
-            ),
-            Runtime.nodejs610.value: DebugSettings(
-                ["/var/lang/bin/node"]
-                + debug_args_list
-                + [
-                    "--debug-brk=" + str(debug_port),
-                    "--nolazy",
-                    "--max-old-space-size=2547",
-                    "--max-semi-space-size=150",
-                    "--max-executable-size=160",
-                    "--expose-gc",
-                    "/var/runtime/node_modules/awslambda/index.js",
-                ],
-                debug_env_vars={},
-            ),
-            Runtime.nodejs810.value: DebugSettings(
-                ["/var/lang/bin/node"]
-                + debug_args_list
-                + [
-                    # Node8 requires the host to be explicitly set in order to bind to localhost
-                    # instead of 127.0.0.1. https://github.com/nodejs/node/issues/11591#issuecomment-283110138
-                    "--inspect-brk=0.0.0.0:" + str(debug_port),
-                    "--nolazy",
-                    "--expose-gc",
-                    "--max-semi-space-size=150",
-                    "--max-old-space-size=2707",
-                    "/var/runtime/node_modules/awslambda/index.js",
-                ],
-                debug_env_vars={},
-            ),
             Runtime.nodejs10x.value: DebugSettings(
                 [
                     "/var/rapid/init",

diff --git a/samcli/local/docker/lambda_image.py b/samcli/local/docker/lambda_image.py
@@ -17,10 +17,6 @@
 
 
 class Runtime(Enum):
-    nodejs = "nodejs"
-    nodejs43 = "nodejs4.3"
-    nodejs610 = "nodejs6.10"
-    nodejs810 = "nodejs8.10"
     nodejs10x = "nodejs10.x"
     nodejs12x = "nodejs12.x"
     python27 = "python2.7"
@@ -32,7 +28,6 @@ class Runtime(Enum):
     java8 = "java8"
     java11 = "java11"
     go1x = "go1.x"
-    dotnetcore20 = "dotnetcore2.0"
     dotnetcore21 = "dotnetcore2.1"
     dotnetcore31 = "dotnetcore3.1"
     provided = "provided"

diff --git a/tests/integration/buildcmd/test_build_cmd.py b/tests/integration/buildcmd/test_build_cmd.py
@@ -142,12 +142,8 @@ class TestBuildCommand_NodeFunctions(BuildIntegBase):
 
     @parameterized.expand(
         [
-            ("nodejs6.10", False),
-            ("nodejs8.10", False),
             ("nodejs10.x", False),
             ("nodejs12.x", False),
-            ("nodejs6.10", "use_container"),
-            ("nodejs8.10", "use_container"),
             ("nodejs10.x", "use_container"),
             ("nodejs12.x", "use_container"),
         ]
@@ -457,10 +453,8 @@ class TestBuildCommand_Dotnet_cli_package(BuildIntegBase):
 
     @parameterized.expand(
         [
-            ("dotnetcore2.0", "Dotnetcore2.0", None),
             ("dotnetcore2.1", "Dotnetcore2.1", None),
             ("dotnetcore3.1", "Dotnetcore3.1", None),
-            ("dotnetcore2.0", "Dotnetcore2.0", "debug"),
             ("dotnetcore2.1", "Dotnetcore2.1", "debug"),
             ("dotnetcore3.1", "Dotnetcore3.1", "debug"),
         ]
@@ -514,9 +508,7 @@ def test_with_dotnetcore(self, runtime, code_uri, mode):
 
         self.verify_docker_container_cleanedup(runtime)
 
-    @parameterized.expand(
-        [("dotnetcore2.0", "Dotnetcore2.0"), ("dotnetcore2.1", "Dotnetcore2.1"), ("dotnetcore3.1", "Dotnetcore3.1")]
-    )
+    @parameterized.expand([("dotnetcore2.1", "Dotnetcore2.1"), ("dotnetcore3.1", "Dotnetcore3.1")])
     @pytest.mark.flaky(reruns=3)
     def test_must_fail_with_container(self, runtime, code_uri):
         use_container = True

diff --git a/tests/integration/testdata/buildcmd/Dotnetcore2.0/HelloWorld.csproj b/tests/integration/testdata/buildcmd/Dotnetcore2.0/HelloWorld.csproj
diff --git a/tests/integration/testdata/buildcmd/Dotnetcore2.0/Program.cs b/tests/integration/testdata/buildcmd/Dotnetcore2.0/Program.cs
diff --git a/tests/integration/testdata/buildcmd/Dotnetcore2.0/aws-lambda-tools-defaults.json b/tests/integration/testdata/buildcmd/Dotnetcore2.0/aws-lambda-tools-defaults.json
diff --git a/tests/unit/local/docker/test_lambda_container.py b/tests/unit/local/docker/test_lambda_container.py
@@ -12,13 +12,8 @@
 
 RUNTIMES_WITH_ENTRYPOINT = [
     Runtime.java8.value,
-    Runtime.dotnetcore20.value,
     Runtime.dotnetcore21.value,
     Runtime.go1x.value,
-    Runtime.nodejs.value,
-    Runtime.nodejs43.value,
-    Runtime.nodejs610.value,
-    Runtime.nodejs810.value,
     Runtime.python36.value,
     Runtime.python27.value,
 ]
@@ -39,7 +34,7 @@
 
 class TestLambdaContainer_init(TestCase):
     def setUp(self):
-        self.runtime = "nodejs4.3"
+        self.runtime = "nodejs12.x"
         self.handler = "handler"
         self.code_dir = "codedir"
         self.env_var = {"var": "value"}