Merge pull request #364 from newrelic/NR-141651/add-node-20

feat: Added support for Node 20
newrelic · Nov 30, 2023 · b0de90a · b0de90a
2 parents 4f7a26f + 07264f3
commit b0de90a
Show file tree

Hide file tree

Showing 28 changed files with 218 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -365,6 +365,7 @@ This plugin currently supports the following AWS runtimes:
 - nodejs14.x
 - nodejs16.x
 - nodejs18.x
+- nodejs20.x
 - python3.7
 - python3.8
 - python3.9

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-newrelic-lambda-layers",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "Serverless plugin for NewRelic APM AWS Lambda layers.",
   "main": "dist/index.js",
   "files": [
@@ -55,7 +55,7 @@
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
     "path": "^0.12.7",
-    "semver": "^7.3.5",
+    "semver": "^7.5.4",
     "serverless": "^3.19.0"
   },
   "keywords": [

diff --git a/src/index.ts b/src/index.ts
@@ -30,6 +30,7 @@ const wrappableRuntimeList = [
   "nodejs14.x",
   "nodejs16.x",
   "nodejs18.x",
+  "nodejs20.x",
   "python3.7",
   "python3.8",
   "python3.9",
@@ -750,7 +751,11 @@ or make sure that you already have Serverless 3.x installed in your project.
   }
 
   private getHandlerWrapper(runtime: string, handler: string) {
-    if (["nodejs14.x", "nodejs16.x", "nodejs18.x"].indexOf(runtime) !== -1) {
+    if (
+      ["nodejs14.x", "nodejs16.x", "nodejs18.x", "nodejs20.x"].indexOf(
+        runtime
+      ) !== -1
+    ) {
       return "newrelic-lambda-wrapper.handler";
     }
 

diff --git a/tests/fixtures/arm64.output.service.json b/tests/fixtures/arm64.output.service.json
@@ -24,7 +24,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16XARM64:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16XARM64:76"
       ],
       "package": {
         "exclude": [
@@ -52,7 +52,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18XARM64:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18XARM64:51"
       ],
       "package": {
         "exclude": [

diff --git a/tests/fixtures/debug-log-level.output.service.json b/tests/fixtures/debug-log-level.output.service.json
@@ -32,7 +32,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:76"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -54,7 +54,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/debug.output.service.json b/tests/fixtures/debug.output.service.json
@@ -53,7 +53,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:76"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -75,7 +75,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/distributed-tracing-enabled.output.service.json b/tests/fixtures/distributed-tracing-enabled.output.service.json
@@ -26,7 +26,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:76"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -50,7 +50,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/eu.output.service.json b/tests/fixtures/eu.output.service.json
@@ -29,7 +29,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:76"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -55,7 +55,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/function-has-layers.output.service.json b/tests/fixtures/function-has-layers.output.service.json
@@ -2,7 +2,7 @@
   "service": "newrelic-lambda-layers-nodejs-example",
   "provider": {
     "layers": [
-      "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+      "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
     ],
     "name": "aws",
     "stage": "prod",
@@ -46,7 +46,7 @@
       "runtime": "nodejs18.x",
       "layers": [
         "arn:aws:lambda:us-east-1:123456789012:layer:SomeOtherLayer:1",
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ]
     },
     "layer-nodejs18x2": {

diff --git a/tests/fixtures/include.output.service.json b/tests/fixtures/include.output.service.json
@@ -43,7 +43,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers":  [
-           "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+           "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
        ],
       "package": { "exclude": [
         "./**",

diff --git a/tests/fixtures/includes-all-provider-layer.output.service.json b/tests/fixtures/includes-all-provider-layer.output.service.json
@@ -2,7 +2,7 @@
   "service": "newrelic-lambda-layers-nodejs-example",
   "provider": {
     "layers": [
-      "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+      "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
     ],
     "name": "aws",
     "stage": "prod",

diff --git a/tests/fixtures/lambda-extension-disabled.output.service.json b/tests/fixtures/lambda-extension-disabled.output.service.json
@@ -25,7 +25,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:76"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -49,7 +49,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/lambda-extension-enabled.output.service.json b/tests/fixtures/lambda-extension-enabled.output.service.json
@@ -24,7 +24,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:76"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -47,7 +47,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/license-key-secret-disabled.output.service.json b/tests/fixtures/license-key-secret-disabled.output.service.json
@@ -25,7 +25,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:76"
       ],
       "package": {
         "exclude": [
@@ -53,7 +53,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ],
       "package": {
         "exclude": [

diff --git a/tests/fixtures/log-disabled.output.service.json b/tests/fixtures/log-disabled.output.service.json
@@ -31,7 +31,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:76"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -50,7 +50,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/log-ingestion-via-extension.output.service.json b/tests/fixtures/log-ingestion-via-extension.output.service.json
@@ -28,7 +28,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:76"
       ],
       "package": {
         "exclude": [
@@ -57,7 +57,7 @@
       ],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ],
       "package": {
         "exclude": [

diff --git a/tests/fixtures/log-level.output.service.json b/tests/fixtures/log-level.output.service.json
@@ -31,7 +31,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:72"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS16X:76"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -53,7 +53,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/manual-wrapping.output.service.json b/tests/fixtures/manual-wrapping.output.service.json
@@ -40,7 +40,7 @@
   ],
   "provider": {
     "layers": [
-      "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:47"
+      "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS18X:51"
     ],
     "name": "aws",
     "region": "us-east-1",

diff --git a/tests/fixtures/node-versions.input.service.json b/tests/fixtures/node-versions.input.service.json
@@ -0,0 +1,80 @@
+{
+  "service": "newrelic-lambda-layers-nodejs-example",
+  "provider": {
+    "name": "aws",
+    "stage": "prod",
+    "region": "us-east-1",
+    "stackTags": {
+      "environment": "us-testing",
+      "owning_team": "LAMBDA",
+      "product": "aws-lambda"
+    },
+    "tags": {
+      "environment": "us-testing",
+      "owning_team": "LAMBDA",
+      "product": "aws-lambda"
+    }
+  },
+  "plugins": [
+    "serverless-newrelic-lambda-layers"
+  ],
+  "custom": {
+    "newRelic": {
+      "accountId": "${env:NEW_RELIC_ACCOUNT_ID}",
+      "apiKey": "${env:NEW_RELIC_PERSONAL_API_KEY}"
+    }
+  },
+  "functions": {
+    "layer-nodejs16x": {
+      "events": [
+        {
+          "schedule": "rate(5 minutes)"
+        }
+      ],
+      "handler": "handler.handler",
+      "package": {
+        "exclude": [
+          "./**"
+        ],
+        "include": [
+          "handler.js"
+        ]
+      },
+      "runtime": "nodejs16.x"
+    },
+    "layer-nodejs18x": {
+      "events": [
+        {
+          "schedule": "rate(5 minutes)"
+        }
+      ],
+      "handler": "handler.handler",
+      "package": {
+        "exclude": [
+          "./**"
+        ],
+        "include": [
+          "handler.js"
+        ]
+      },
+      "runtime": "nodejs18.x"
+    },
+    "layer-nodejs20x": {
+      "events": [
+        {
+          "schedule": "rate(5 minutes)"
+        }
+      ],
+      "handler": "handler.handler",
+      "package": {
+        "exclude": [
+          "./**"
+        ],
+        "include": [
+          "handler.js"
+        ]
+      },
+      "runtime": "nodejs20.x"
+    }
+  }
+}