Add NodeJS 16 Lambda Runtime Support (#3195)

manodnyab · web-flow · commit 9a70b865f0ee · 2022-06-28T13:00:45.000-07:00
* revert changes

* Node 16 runtime added

* min versions changed

* tests fixed
diff --git a/.changes/next-release/feature-2c1cb3a3-30d7-4219-b2fc-839c90628c4c.json b/.changes/next-release/feature-2c1cb3a3-30d7-4219-b2fc-839c90628c4c.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Nodejs16.x Lambda runtime support"
+}
diff --git a/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt b/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt
@@ -21,6 +21,7 @@ enum class LambdaRuntime(
     ),
     NODEJS12_X(Runtime.NODEJS12_X, architectures = ARM_COMPATIBLE),
     NODEJS14_X(Runtime.NODEJS14_X, minSamDebugging = "1.17.0", minSamInit = "1.17.0", architectures = ARM_COMPATIBLE),
+    NODEJS16_X(Runtime.NODEJS16_X, minSamDebugging = "1.49.0", minSamInit = "1.49.0", architectures = ARM_COMPATIBLE),
     JAVA8(Runtime.JAVA8),
     JAVA8_AL2(Runtime.JAVA8_AL2, minSamDebugging = "1.2.0", architectures = ARM_COMPATIBLE),
     JAVA11(Runtime.JAVA11, architectures = ARM_COMPATIBLE),
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 apacheCommons = "2.8.0"
 assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.com/issue/KT-17765
-awsSdk = "2.17.138"
+awsSdk = "2.17.219"
 commonmark = "0.17.1"
 detekt = "1.20.0"
 intellijGradle = "1.7.0-20220613.010908-17"
diff --git a/jetbrains-ultimate/it/software/aws/toolkits/jetbrains/services/lambda/nodejs/SupportedNodeJsRuntimes.kt b/jetbrains-ultimate/it/software/aws/toolkits/jetbrains/services/lambda/nodejs/SupportedNodeJsRuntimes.kt
@@ -7,5 +7,6 @@ import software.amazon.awssdk.services.lambda.model.Runtime
 
 val SUPPORTED_NODE_RUNTIMES = listOf(
     arrayOf(Runtime.NODEJS12_X),
-    arrayOf(Runtime.NODEJS14_X)
+    arrayOf(Runtime.NODEJS14_X),
+    arrayOf(Runtime.NODEJS16_X)
 )
diff --git a/jetbrains-ultimate/resources/META-INF/ext-nodejs.xml b/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.NodeJs12ImageDebug"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.nodejs.NodeJs14ImageDebug"/>
+        <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.nodejs.NodeJs16ImageDebug"/>
         <sam.projectWizard id="NODEJS" implementationClass="software.aws.toolkits.jetbrains.services.lambda.nodejs.NodeJsSamProjectWizard"/>
     </extensions>
 
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsDebugSupport.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsDebugSupport.kt
@@ -63,6 +63,11 @@ class NodeJs14ImageDebug : NodeJsImageDebugSupport() {
     override fun displayName() = LambdaRuntime.NODEJS14_X.toString().capitalize()
 }
 
+class NodeJs16ImageDebug : NodeJsImageDebugSupport() {
+    override val id: String = LambdaRuntime.NODEJS16_X.toString()
+    override fun displayName() = LambdaRuntime.NODEJS16_X.toString().capitalize()
+}
+
 object NodeJsDebugUtils {
     private const val NODE_MODULES = "node_modules"
 
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsRuntimeGroup.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsRuntimeGroup.kt
@@ -25,7 +25,8 @@ class NodeJsRuntimeGroup : SdkBasedRuntimeGroup() {
 
     override val supportedRuntimes = listOf(
         LambdaRuntime.NODEJS12_X,
-        LambdaRuntime.NODEJS14_X
+        LambdaRuntime.NODEJS14_X,
+        LambdaRuntime.NODEJS16_X
     )
 
     override fun determineRuntime(module: Module): LambdaRuntime? = determineRuntime(module.project)
@@ -35,6 +36,7 @@ class NodeJsRuntimeGroup : SdkBasedRuntimeGroup() {
             when {
                 it.major <= 12 -> LambdaRuntime.NODEJS12_X
                 it.major <= 14 -> LambdaRuntime.NODEJS14_X
+                it.major <= 16 -> LambdaRuntime.NODEJS16_X
                 else -> null
             }
         }
diff --git a/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsSamProjectWizard.kt b/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsSamProjectWizard.kt
@@ -60,9 +60,9 @@ class SamHelloWorldNodeJs : SamAppTemplateBased() {
 
     override fun description() = message("sam.init.template.hello_world.description")
 
-    override fun supportedZipRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.NODEJS12_X, LambdaRuntime.NODEJS14_X)
+    override fun supportedZipRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.NODEJS12_X, LambdaRuntime.NODEJS14_X, LambdaRuntime.NODEJS16_X)
 
-    override fun supportedImageRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.NODEJS12_X, LambdaRuntime.NODEJS14_X)
+    override fun supportedImageRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.NODEJS12_X, LambdaRuntime.NODEJS14_X, LambdaRuntime.NODEJS16_X)
 
     override val appTemplateName: String = "hello-world"
 
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsHandlerCompletionProviderTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsHandlerCompletionProviderTest.kt
@@ -26,4 +26,10 @@ class NodeJsHandlerCompletionProviderTest {
         val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.NODEJS14_X)
         assertFalse(provider.isCompletionSupported)
     }
+
+    @Test
+    fun completionIsNotSupportedNodeJs16X() {
+        val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.NODEJS16_X)
+        assertFalse(provider.isCompletionSupported)
+    }
 }
diff --git a/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsRuntimeGroupTest.kt b/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsRuntimeGroupTest.kt
@@ -49,8 +49,15 @@ class NodeJsRuntimeGroupTest {
 
     @Test
     fun testRuntime150() {
-        projectRule.project.setNodeJsInterpreterVersion(SemVer("v15.0.0", 15, 0, 0))
+        projectRule.project.setNodeJsInterpreterVersion(SemVer("v15.16.0", 15, 16, 0))
         val runtime = sut.determineRuntime(projectRule.project)
-        assertThat(runtime).isNull()
+        assertThat(runtime).isEqualTo(LambdaRuntime.NODEJS16_X)
+    }
+
+    @Test
+    fun testRuntime16() {
+        projectRule.project.setNodeJsInterpreterVersion(SemVer("v16.0.0", 16, 0, 0))
+        val runtime = sut.determineRuntime(projectRule.project)
+        assertThat(runtime).isEqualTo(LambdaRuntime.NODEJS16_X)
     }
 }
diff --git a/testdata/samProjects/image/nodejs16.x/hello-world/Dockerfile b/testdata/samProjects/image/nodejs16.x/hello-world/Dockerfile
@@ -0,0 +1,7 @@
+FROM public.ecr.aws/lambda/nodejs:16
+
+COPY app.js package.json ./
+
+RUN npm install
+
+CMD ["app.lambdaHandler"]
diff --git a/testdata/samProjects/image/nodejs16.x/hello-world/app.js b/testdata/samProjects/image/nodejs16.x/hello-world/app.js
@@ -0,0 +1,20 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+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
+};
diff --git a/testdata/samProjects/image/nodejs16.x/hello-world/package.json b/testdata/samProjects/image/nodejs16.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"
+}
diff --git a/testdata/samProjects/image/nodejs16.x/template.yaml b/testdata/samProjects/image/nodejs16.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

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "feature",
 +  "description" : "Nodejs16.x Lambda runtime support"
 +}
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ import software.amazon.awssdk.services.lambda.model.Runtime`
`7`	`7`
`8`	`8`	`val SUPPORTED_NODE_RUNTIMES = listOf(`
`9`	`9`	`arrayOf(Runtime.NODEJS12_X),`
`10`		`- arrayOf(Runtime.NODEJS14_X)`
	`10`	`+ arrayOf(Runtime.NODEJS14_X),`
	`11`	`+ arrayOf(Runtime.NODEJS16_X)`
`11`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ class NodeJsRuntimeGroup : SdkBasedRuntimeGroup() {`
`25`	`25`
`26`	`26`	`override val supportedRuntimes = listOf(`
`27`	`27`	`LambdaRuntime.NODEJS12_X,`
`28`		`- LambdaRuntime.NODEJS14_X`
	`28`	`+ LambdaRuntime.NODEJS14_X,`
	`29`	`+ LambdaRuntime.NODEJS16_X`
`29`	`30`	`)`
`30`	`31`
`31`	`32`	`override fun determineRuntime(module: Module): LambdaRuntime? = determineRuntime(module.project)`
`@@ -35,6 +36,7 @@ class NodeJsRuntimeGroup : SdkBasedRuntimeGroup() {`
`35`	`36`	`when {`
`36`	`37`	`it.major <= 12 -> LambdaRuntime.NODEJS12_X`
`37`	`38`	`it.major <= 14 -> LambdaRuntime.NODEJS14_X`
	`39`	`+ it.major <= 16 -> LambdaRuntime.NODEJS16_X`
`38`	`40`	`else -> null`
`39`	`41`	`}`
`40`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,10 @@ class NodeJsHandlerCompletionProviderTest {`
`26`	`26`	`val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.NODEJS14_X)`
`27`	`27`	`assertFalse(provider.isCompletionSupported)`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ @Test`
	`31`	`+ fun completionIsNotSupportedNodeJs16X() {`
	`32`	`+ val provider = HandlerCompletionProvider(projectRule.project, LambdaRuntime.NODEJS16_X)`
	`33`	`+ assertFalse(provider.isCompletionSupported)`
	`34`	`+ }`
`29`	`35`	`}`