From 33218a792faee6c9308ccb38150a8e6e378e14e4 Mon Sep 17 00:00:00 2001 From: mrickard Date: Thu, 18 Jan 2024 16:13:41 -0500 Subject: [PATCH 1/2] chore!: Dropped support for Node 14 Signed-off-by: mrickard --- README.md | 1 - package.json | 2 +- src/index.ts | 3 +-- tests/fixtures/debug.input.service.json | 6 ------ tests/fixtures/debug.output.service.json | 22 ---------------------- 5 files changed, 2 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index c5a09036..8d0bf030 100644 --- a/README.md +++ b/README.md @@ -362,7 +362,6 @@ custom: This plugin currently supports the following AWS runtimes: -- nodejs14.x - nodejs16.x - nodejs18.x - nodejs20.x diff --git a/package.json b/package.json index 7e8850f8..4a729304 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "serverless-newrelic-lambda-layers", - "version": "4.3.0", + "version": "5.0.0", "description": "Serverless plugin for NewRelic APM AWS Lambda layers.", "main": "dist/index.js", "files": [ diff --git a/src/index.ts b/src/index.ts index ffb0aa08..47a3e33d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -27,7 +27,6 @@ const logShim = { }; const wrappableRuntimeList = [ - "nodejs14.x", "nodejs16.x", "nodejs18.x", "nodejs20.x", @@ -752,7 +751,7 @@ 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", "nodejs20.x"].indexOf( + ["nodejs16.x", "nodejs18.x", "nodejs20.x"].indexOf( runtime ) !== -1 ) { diff --git a/tests/fixtures/debug.input.service.json b/tests/fixtures/debug.input.service.json index 45dacf51..92ef4a62 100644 --- a/tests/fixtures/debug.input.service.json +++ b/tests/fixtures/debug.input.service.json @@ -27,12 +27,6 @@ }, "disabledDeprecations": [], "functions": { - "layer-nodejs14x": { - "events": [{ "schedule": "rate(5 minutes)" }], - "handler": "handler.handler", - "package": { "exclude": ["./**"], "include": ["handler.js"] }, - "runtime": "nodejs14.x" - }, "layer-nodejs16x": { "events": [{ "schedule": "rate(5 minutes)" }], "handler": "handler.handler", diff --git a/tests/fixtures/debug.output.service.json b/tests/fixtures/debug.output.service.json index fa4e9791..c8aa74d0 100644 --- a/tests/fixtures/debug.output.service.json +++ b/tests/fixtures/debug.output.service.json @@ -27,28 +27,6 @@ }, "disabledDeprecations": [], "functions": { - "layer-nodejs14x": { - "events": [{ "schedule": "rate(5 minutes)" }], - "handler": "newrelic-lambda-wrapper.handler", - "layers": [ - "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS14X:118" - ], - "package": { - "exclude": ["./**", "!newrelic-wrapper-helper.js"], - "include": ["handler.js"] - }, - "runtime": "nodejs14.x", - "environment": { - "NEW_RELIC_ACCOUNT_ID": "${env:NEW_RELIC_ACCOUNT_ID}", - "NEW_RELIC_APP_NAME": "layer-nodejs14x", - "NEW_RELIC_LAMBDA_HANDLER": "handler.handler", - "NEW_RELIC_LOG": "stdout", - "NEW_RELIC_LOG_ENABLED": "true", - "NEW_RELIC_LOG_LEVEL": "debug", - "NEW_RELIC_NO_CONFIG_FILE": "true", - "NEW_RELIC_TRUSTED_ACCOUNT_KEY": "${env:NEW_RELIC_ACCOUNT_ID}" - } - }, "layer-nodejs16x": { "events": [{ "schedule": "rate(5 minutes)" }], "handler": "newrelic-lambda-wrapper.handler", From 5f8f4f9ce82f326c5df1f0380ce7a82e96d1b215 Mon Sep 17 00:00:00 2001 From: mrickard Date: Thu, 18 Jan 2024 16:18:09 -0500 Subject: [PATCH 2/2] chore: Delinted Signed-off-by: mrickard --- src/index.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/index.ts b/src/index.ts index 47a3e33d..54f00349 100644 --- a/src/index.ts +++ b/src/index.ts @@ -750,11 +750,7 @@ or make sure that you already have Serverless 3.x installed in your project. } private getHandlerWrapper(runtime: string, handler: string) { - if ( - ["nodejs16.x", "nodejs18.x", "nodejs20.x"].indexOf( - runtime - ) !== -1 - ) { + if (["nodejs16.x", "nodejs18.x", "nodejs20.x"].indexOf(runtime) !== -1) { return "newrelic-lambda-wrapper.handler"; }