moved shouldSkipPlugin to constructor (#60)

newrelic · Aug 21, 2020 · 6729eb0 · 6729eb0
1 parent 6a5e9f6
commit 6729eb0
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 51 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-newrelic-lambda-layers",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "Serverless plugin for NewRelic APM AWS Lambda layers.",
   "main": "dist/index.js",
   "files": [

diff --git a/src/index.ts b/src/index.ts
@@ -26,14 +26,16 @@ export default class NewRelicLambdaLayerPlugin {
     this.serverless = serverless;
     this.options = options;
     this.awsProvider = this.serverless.getProvider("aws") as any;
-    this.hooks = {
-      "after:deploy:deploy": this.addLogSubscriptions.bind(this),
-      "after:deploy:function:packageFunction": this.cleanup.bind(this),
-      "after:package:createDeploymentArtifacts": this.cleanup.bind(this),
-      "before:deploy:function:packageFunction": this.run.bind(this),
-      "before:package:createDeploymentArtifacts": this.run.bind(this),
-      "before:remove:remove": this.removeLogSubscriptions.bind(this)
-    };
+    this.hooks = this.shouldSkipPlugin()
+      ? {}
+      : {
+          "after:deploy:deploy": this.addLogSubscriptions.bind(this),
+          "after:deploy:function:packageFunction": this.cleanup.bind(this),
+          "after:package:createDeploymentArtifacts": this.cleanup.bind(this),
+          "before:deploy:function:packageFunction": this.run.bind(this),
+          "before:package:createDeploymentArtifacts": this.run.bind(this),
+          "before:remove:remove": this.removeLogSubscriptions.bind(this)
+        };
   }
 
   get config() {
@@ -69,13 +71,6 @@ export default class NewRelicLambdaLayerPlugin {
   }
 
   public async run() {
-    if (this.shouldSkipPlugin()) {
-      this.serverless.cli.log(
-        `Skipping plugin serverless-newrelic-lambda-layers for stage ${this.stage}`
-      );
-      return;
-    }
-
     const version = this.serverless.getVersion();
     if (semver.lt(version, "1.34.0")) {
       this.serverless.cli.log(
@@ -119,18 +114,10 @@ export default class NewRelicLambdaLayerPlugin {
   }
 
   public cleanup() {
-    if (this.shouldSkipPlugin()) {
-      return;
-    }
-
     this.removeNodeHelper();
   }
 
   public async addLogSubscriptions() {
-    if (this.shouldSkipPlugin()) {
-      return;
-    }
-
     if (this.autoSubscriptionDisabled) {
       this.serverless.cli.log(
         "Skipping adding log subscription. Explicitly disabled"
@@ -175,10 +162,6 @@ export default class NewRelicLambdaLayerPlugin {
   }
 
   public async removeLogSubscriptions() {
-    if (this.shouldSkipPlugin()) {
-      return;
-    }
-
     if (this.autoSubscriptionDisabled) {
       this.serverless.cli.log(
         "Skipping removing log subscription. Explicitly disabled"
@@ -311,6 +294,11 @@ export default class NewRelicLambdaLayerPlugin {
     ) {
       return false;
     }
+
+    this.serverless.cli.log(
+      `Skipping plugin serverless-newrelic-lambda-layers for stage ${this.stage}`
+    );
+
     return true;
   }
 

diff --git a/tests/fixtures/debug-log-level.output.service.json b/tests/fixtures/debug-log-level.output.service.json
@@ -29,7 +29,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-wrapper-helper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -51,7 +51,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:19"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:20"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -73,7 +73,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/debug.output.service.json b/tests/fixtures/debug.output.service.json
@@ -28,7 +28,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-wrapper-helper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:18"
       ],
       "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:NewRelicNodeJS10X:19"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:20"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -72,7 +72,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

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

diff --git a/tests/fixtures/log-disabled.output.service.json b/tests/fixtures/log-disabled.output.service.json
@@ -28,7 +28,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-wrapper-helper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -47,7 +47,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:19"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:20"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -66,7 +66,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/log-level.output.service.json b/tests/fixtures/log-level.output.service.json
@@ -28,7 +28,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-wrapper-helper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:18"
       ],
       "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:NewRelicNodeJS10X:19"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:20"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -72,7 +72,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/provider-environment-log-level.output.service.json b/tests/fixtures/provider-environment-log-level.output.service.json
@@ -31,7 +31,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-wrapper-helper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:18"
       ],
       "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:NewRelicNodeJS10X:19"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:20"
       ],
       "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:NewRelicNodeJS12X:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/provider-environment.output.service.json b/tests/fixtures/provider-environment.output.service.json
@@ -30,7 +30,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-wrapper-helper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -52,7 +52,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:19"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:20"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -74,7 +74,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/fixtures/stage-included.output.service.json b/tests/fixtures/stage-included.output.service.json
@@ -27,7 +27,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-wrapper-helper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS810:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -46,7 +46,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:19"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS10X:20"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],
@@ -65,7 +65,7 @@
       "events": [{ "schedule": "rate(5 minutes)" }],
       "handler": "newrelic-lambda-wrapper.handler",
       "layers": [
-        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:17"
+        "arn:aws:lambda:us-east-1:451483290750:layer:NewRelicNodeJS12X:18"
       ],
       "package": {
         "exclude": ["./**", "!newrelic-wrapper-helper.js"],

diff --git a/tests/index.test.ts b/tests/index.test.ts
@@ -65,7 +65,10 @@ describe("NewRelicLambdaLayerPlugin", () => {
         serverless.setProvider("aws", new AwsProvider(serverless, options));
         const plugin = new NewRelicLambdaLayerPlugin(serverless, options);
 
-        await plugin.run();
+        try {
+          await plugin.hooks['before:deploy:function:packageFunction']();
+        } catch (err) {}
+
 
         expect(
           omit(