serverless-log-forwarding - npm Package Compare versions

Comparing version 1.1.3 to 1.1.4

index.js

@@ -56,2 +56,3 @@ 'use strict';
     const serviceName = service.service;
+    const awsProvider = this.serverless.getProvider('aws');
     const arn = service.custom.logForwarding.destinationARN;
@@ -78,4 +79,5 @@ const stage = options.stage && options.stage.length > 0
       /* merge new SubscriptionFilter with current resources object */
+      const functionLogGroupId = awsProvider.naming.getLogGroupLogicalId(functions[i]);
       const subscriptionFilter = LogForwardingPlugin.makeSubscriptionFilter(serviceName,
-        stage, arn, functions[i], filterPattern);
+        stage, arn, functions[i], filterPattern, functionLogGroupId);
       _.extend(resourceObj, subscriptionFilter);
@@ -94,5 +96,7 @@ }
    * @param  {String} filterPattern filter pattern for the Subscription
+   * @param  {String} functionLogGroupId name of the function Log Group to add as a dependency
    * @return {Object}               SubscriptionFilter
    */
-  static makeSubscriptionFilter(serviceName, stage, arn, functionName, filterPattern) {
+  static makeSubscriptionFilter(serviceName, stage, arn, functionName, filterPattern,
+    functionLogGroupId) {
     const logGroupName = `/aws/lambda/${serviceName}-${stage}-${functionName}`;
@@ -109,2 +113,3 @@ const filter = {};
         'LogForwardingLambdaPermission',
+        functionLogGroupId,
       ],
@@ -111,0 +116,0 @@ };

package.json

 {
   "name": "serverless-log-forwarding",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "a serverless plugin to forward logs to given lambda function",
@@ -20,3 +20,4 @@ "main": "index.js",
     "istanbul": "^0.4.5",
-    "mocha": "^2.2.5"
+    "mocha": "^2.2.5",
+    "serverless": "^1.20.2"
   },
@@ -23,0 +24,0 @@ "scripts": {

README.md

@@ -7,2 +7,3 @@ # serverless-log-forwarding
 [![npm version](https://badge.fury.io/js/serverless-log-forwarding.svg)](https://badge.fury.io/js/serverless-log-forwarding)
+[![npm downloads](https://img.shields.io/npm/dt/serverless-log-forwarding.svg?style=flat)](https://www.npmjs.com/package/serverless-log-forwarding)
 
@@ -9,0 +10,0 @@ Serverless plugin for forwarding CloudWatch logs to another Lambda function.

test/index-test.js

@@ -21,100 +21,95 @@ const chai = require('chai');
 };
+
+const Serverless = require('serverless');
+const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
+
+const createServerless = (options, service) => {
+  const serverless = new Serverless(options);
+  serverless.cli = {
+    log() {
+    },
+  };
+  new AwsProvider(serverless, options); // eslint-disable-line no-new
+  serverless.service.update(service);
+  serverless.service.setFunctionNames(options);
+  return serverless;
+};
+
 const constructPluginResources = (logForwarding) => {
-  const serverless = {
-    service: {
-      provider: {
-        region: 'us-moon-1',
-        stage: 'test-stage',
-      },
-      custom: {
-        logForwarding,
-      },
-      resources: {
-        Resources: {
-          TestExistingFilter: {
-            Type: 'AWS:Test:Filter',
-          },
+  const options = {};
+  const serverless = createServerless(options, {
+    provider: {
+      region: 'us-moon-1',
+      stage: 'test-stage',
+    },
+    custom: {
+      logForwarding,
+    },
+    resources: {
+      Resources: {
+        TestExistingFilter: {
+          Type: 'AWS:Test:Filter',
         },
       },
-      functions: {
-        testFunctionOne: {
-          name: 'functionOne',
-          filterPattern: 'Pattern',
-        },
-        testFunctionTwo: {
-          name: 'functionTwo',
-        },
-      },
-      service: 'test-service',
     },
-    cli: {
-      log() {
+    functions: {
+      testFunctionOne: {
+        filterPattern: 'Pattern',
       },
+      testFunctionTwo: {
+      },
     },
-  };
-  return new LogForwardingPlugin(serverless, {});
+    service: 'test-service',
+  });
+  return new LogForwardingPlugin(serverless, options);
 };
 const constructPluginNoResources = (logForwarding) => {
-  const serverless = {
-    service: {
-      provider: {
-        region: 'us-moon-1',
-        stage: 'test-stage',
+  const options = {};
+  const serverless = createServerless(options, {
+    provider: {
+      region: 'us-moon-1',
+      stage: 'test-stage',
+    },
+    custom: {
+      logForwarding,
+    },
+    functions: {
+      testFunctionOne: {
       },
-      custom: {
-        logForwarding,
+      testFunctionTwo: {
       },
-      resources: undefined,
-      functions: {
-        testFunctionOne: {
-          name: 'functionOne',
-        },
-        testFunctionTwo: {
-          name: 'functionTwo',
-        },
-      },
-      service: 'test-service',
     },
-    cli: {
-      log() {
-      },
-    },
-  };
-  return new LogForwardingPlugin(serverless, {});
+    service: 'test-service',
+  });
+  serverless.service.resources = undefined;
+  return new LogForwardingPlugin(serverless, options);
 };
 
 const constructPluginResourcesWithParam = (logForwarding) => {
-  const serverless = {
-    service: {
-      provider: {
-        region: 'us-moon-1',
-        stage: 'test-stage',
-      },
-      custom: {
-        logForwarding,
-      },
-      resources: {
-        Resources: {
-          TestExistingFilter: {
-            Type: 'AWS:Test:Filter',
-          },
+  const options = { stage: 'dev' };
+  const serverless = createServerless(options, {
+    provider: {
+      region: 'us-moon-1',
+      stage: 'test-stage',
+    },
+    custom: {
+      logForwarding,
+    },
+    resources: {
+      Resources: {
+        TestExistingFilter: {
+          Type: 'AWS:Test:Filter',
         },
       },
-      functions: {
-        testFunctionOne: {
-          name: 'functionOne',
-          filterPattern: 'Pattern',
-        },
-        testFunctionTwo: {
-          name: 'functionTwo',
-        },
-      },
-      service: 'test-service',
     },
-    cli: {
-      log() {
+    functions: {
+      testFunctionOne: {
+        filterPattern: 'Pattern',
       },
+      testFunctionTwo: {
+      },
     },
-  };
-  return new LogForwardingPlugin(serverless, { stage: 'dev' });
+    service: 'test-service',
+  });
+  return new LogForwardingPlugin(serverless, options);
 };
@@ -147,2 +142,3 @@
             'LogForwardingLambdaPermission',
+            'TestFunctionOneLogGroup',
           ],
@@ -159,2 +155,3 @@ },
             'LogForwardingLambdaPermission',
+            'TestFunctionTwoLogGroup',
           ],
@@ -191,2 +188,3 @@ },
             'LogForwardingLambdaPermission',
+            'TestFunctionOneLogGroup',
           ],
@@ -203,2 +201,3 @@ },
             'LogForwardingLambdaPermission',
+            'TestFunctionTwoLogGroup',
           ],
@@ -232,2 +231,3 @@ },
             'LogForwardingLambdaPermission',
+            'TestFunctionOneLogGroup',
           ],
@@ -244,2 +244,3 @@ },
             'LogForwardingLambdaPermission',
+            'TestFunctionTwoLogGroup',
           ],
@@ -276,2 +277,3 @@ },
             'LogForwardingLambdaPermission',
+            'TestFunctionOneLogGroup',
           ],
@@ -288,2 +290,3 @@ },
             'LogForwardingLambdaPermission',
+            'TestFunctionTwoLogGroup',
           ],
@@ -290,0 +293,0 @@ },

No alert changes

Improved metrics

Total package byte prevSize

89688

1.05%

Lines of code

2530

0.2%

Number of lines in readme file

72

1.41%

Worsened metrics

Dev dependency count

9

12.5%

No dependency changes