Node 14 support (#2410)

Add node 14 Lambda support

Author: hunterwerlla

.changes/next-release/feature-5848e497-68f5-429c-96cd-1072f1d691eb.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Nodejs14.x Lambda support"
+}

core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt

@@ -13,6 +13,7 @@ enum class LambdaRuntime(
 ) {
     NODEJS10_X(Runtime.NODEJS10_X),
     NODEJS12_X(Runtime.NODEJS12_X),
+    NODEJS14_X(Runtime.NODEJS14_X, minSamDebugging = "1.17.0", minSamInit = "1.17.0"),
     JAVA8(Runtime.JAVA8),
     JAVA8_AL2(Runtime.JAVA8_AL2, minSamDebugging = "1.2.0"),
     JAVA11(Runtime.JAVA11),

gradle.properties

@@ -11,7 +11,7 @@ publishChannel=
 # Common dependencies
 ideProfileName=2020.1
 kotlinVersion=1.4.21
-awsSdkVersion=2.15.60
+awsSdkVersion=2.15.75
 coroutinesVersion=1.3.3
 ideaPluginVersion=0.6.3
 ktlintVersion=0.39.0

jetbrains-ultimate/it/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsLocalLambdaRunConfigurationIntegrationTest.kt

@@ -38,7 +38,8 @@ class NodeJsLocalLambdaRunConfigurationIntegrationTest(private val runtime: Runt
         @Parameterized.Parameters(name = "{0}")
         fun parameters(): Collection<Array<Runtime>> = listOf(
             arrayOf(Runtime.NODEJS10_X),
-            arrayOf(Runtime.NODEJS12_X)
+            arrayOf(Runtime.NODEJS12_X),
+            arrayOf(Runtime.NODEJS14_X)
         )
     }
 

jetbrains-ultimate/resources/META-INF/ext-nodejs.xml

@@ -13,6 +13,7 @@
         <sam.runtimeDebugSupport id="NODEJS" implementationClass="software.aws.toolkits.jetbrains.services.lambda.nodejs.NodeJsRuntimeDebugSupport"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.nodejs.NodeJs10ImageDebug"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.nodejs.NodeJs12ImageDebug"/>
+        <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.nodejs.NodeJs14ImageDebug"/>
         <sam.projectWizard id="NODEJS" implementationClass="software.aws.toolkits.jetbrains.services.lambda.nodejs.NodeJsSamProjectWizard"/>
     </extensions>
 

jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsImageDebugSupport.kt

@@ -34,3 +34,8 @@ class NodeJs12ImageDebug : NodeJsImageDebugSupport() {
     override val id: String = LambdaRuntime.NODEJS12_X.toString()
     override fun displayName() = LambdaRuntime.NODEJS12_X.toString().capitalize()
 }
+
+class NodeJs14ImageDebug : NodeJsImageDebugSupport() {
+    override val id: String = LambdaRuntime.NODEJS14_X.toString()
+    override fun displayName() = LambdaRuntime.NODEJS14_X.toString().capitalize()
+}

jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsRuntimeGroup.kt

@@ -25,7 +25,8 @@ class NodeJsRuntimeGroup : SdkBasedRuntimeGroup() {
 
     override val supportedRuntimes = listOf(
         LambdaRuntime.NODEJS10_X,
-        LambdaRuntime.NODEJS12_X
+        LambdaRuntime.NODEJS12_X,
+        LambdaRuntime.NODEJS14_X
     )
 
     override fun determineRuntime(module: Module): LambdaRuntime? = determineRuntime(module.project)
@@ -35,6 +36,7 @@ class NodeJsRuntimeGroup : SdkBasedRuntimeGroup() {
             when {
                 it.major <= 10 -> LambdaRuntime.NODEJS10_X
                 it.major <= 12 -> LambdaRuntime.NODEJS12_X
+                it.major <= 14 -> LambdaRuntime.NODEJS14_X
                 else -> null
             }
         }

jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsSamProjectWizard.kt

@@ -59,9 +59,9 @@ class SamHelloWorldNodeJs : SamAppTemplateBased() {
 
     override fun description() = message("sam.init.template.hello_world.description")
 
-    override fun supportedZipRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.NODEJS10_X, LambdaRuntime.NODEJS12_X)
+    override fun supportedZipRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.NODEJS10_X, LambdaRuntime.NODEJS12_X, LambdaRuntime.NODEJS14_X)
 
-    override fun supportedImageRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.NODEJS10_X, LambdaRuntime.NODEJS12_X)
+    override fun supportedImageRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.NODEJS10_X, LambdaRuntime.NODEJS12_X, LambdaRuntime.NODEJS14_X)
 
     override val appTemplateName: String = "hello-world"
 

jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsHandlerCompletionProviderTest.kt

@@ -26,4 +26,10 @@ class NodeJsHandlerCompletionProviderTest {
         val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.NODEJS12_X)
         assertFalse(provider.isCompletionSupported)
     }
+
+    @Test
+    fun completionIsNotSupportedNodeJs14X() {
+        val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.NODEJS14_X)
+        assertFalse(provider.isCompletionSupported)
+    }
 }

jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsRuntimeGroupTest.kt

@@ -55,15 +55,22 @@ class NodeJsRuntimeGroupTest {
     }
 
     @Test
-    fun testRuntime12_13() {
+    fun testRuntime12() {
         projectRule.project.setNodeJsInterpreterVersion(SemVer("v12.13.1", 12, 13, 1))
         val runtime = sut.determineRuntime(projectRule.project)
         assertThat(runtime).isEqualTo(LambdaRuntime.NODEJS12_X)
     }
 
     @Test
-    fun testRuntime13_0() {
-        projectRule.project.setNodeJsInterpreterVersion(SemVer("v13.0.0", 13, 0, 0))
+    fun testRuntime14() {
+        projectRule.project.setNodeJsInterpreterVersion(SemVer("v14.0.0", 14, 0, 0))
+        val runtime = sut.determineRuntime(projectRule.project)
+        assertThat(runtime).isEqualTo(LambdaRuntime.NODEJS14_X)
+    }
+
+    @Test
+    fun testRuntime15_0() {
+        projectRule.project.setNodeJsInterpreterVersion(SemVer("v15.0.0", 15, 0, 0))
         val runtime = sut.determineRuntime(projectRule.project)
         assertThat(runtime).isNull()
     }

testdata/samProjects/image/nodejs10.x/hello-world/app.js

@@ -2,7 +2,6 @@ let response;
 
 exports.lambdaHandler = async (event, context) => {
     try {
-        // const ret = await axios(url);
         response = {
             'statusCode': 200,
             'body': JSON.stringify({

testdata/samProjects/image/nodejs12.x/hello-world/package.json

@@ -5,11 +5,5 @@
     "main": "app.js",
     "repository": "https://github.com/awslabs/aws-sam-cli/tree/develop/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs",
     "author": "SAM CLI",
-    "license": "MIT",
-    "dependencies": {
-        "axios": "^0.18.0"
-    },
-    "scripts": {
-        "test": "mocha tests/unit/"
-    }
+    "license": "MIT"
 }

testdata/samProjects/image/nodejs14.x/hello-world/Dockerfile

@@ -0,0 +1,7 @@
+FROM public.ecr.aws/lambda/nodejs:14
+
+COPY app.js package.json ./
+
+RUN npm install
+
+CMD ["app.lambdaHandler"]

testdata/samProjects/image/nodejs14.x/hello-world/app.js

@@ -0,0 +1,17 @@
+let response;
+
+exports.lambdaHandler = async (event, context) => {
+    try {
+        response = {
+            'statusCode': 200,
+            'body': JSON.stringify({
+                message: JSON.stringify(event).toUpperCase(),
+            })
+        }
+    } catch (err) {
+        console.log(err);
+        return err;
+    }
+
+    return response
+};

testdata/samProjects/image/nodejs14.x/hello-world/package.json

@@ -0,0 +1,9 @@
+{
+    "name": "hello_world",
+    "version": "1.0.0",
+    "description": "hello world sample for NodeJS",
+    "main": "app.js",
+    "repository": "https://github.com/awslabs/aws-sam-cli/tree/develop/samcli/local/init/templates/cookiecutter-aws-sam-hello-nodejs",
+    "author": "SAM CLI",
+    "license": "MIT"
+}

testdata/samProjects/image/nodejs14.x/template.yaml

@@ -0,0 +1,13 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+Resources:
+  SomeFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      PackageType: Image
+      Timeout: 900
+    Metadata:
+      DockerTag: v1
+      DockerContext: ./hello-world
+      Dockerfile: Dockerfile