Merge pull request #11 from flemay/bugfix/add-function-log-group-as-d…

…ependency Bugfix/add function log group as dependency
amplify-education · Sep 27, 2017 · 382b098 · 382b098
2 parents c33f75a + 4edbefa
commit 382b098
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 83 deletions.
diff --git a/index.js b/index.js
@@ -53,6 +53,7 @@ class LogForwardingPlugin {
     const filterPattern = service.custom.logForwarding.filterPattern || '';
     // Get options and parameters to make resources object
     const serviceName = service.service;
+    const awsProvider = this.serverless.getProvider('aws');
     const arn = service.custom.logForwarding.destinationARN;
     const stage = options.stage && options.stage.length > 0
       ? options.stage
@@ -74,8 +75,9 @@ class LogForwardingPlugin {
     };
     for (let i = 0; i < functions.length; i += 1) {
       /* 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);
     }
     return resourceObj;
@@ -89,9 +91,11 @@ class LogForwardingPlugin {
    * @param  {String} arn          arn of the lambda to forward to
    * @param  {String} functionName name of function to make SubscriptionFilter for
    * @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}`;
     const filter = {};
     filter[`SubscriptionFilter${functionName}`] = {
@@ -103,6 +107,7 @@ class LogForwardingPlugin {
       },
       DependsOn: [
         'LogForwardingLambdaPermission',
+        functionLogGroupId,
       ],
     };
     return filter;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless-log-forwarding",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "a serverless plugin to forward logs to given lambda function",
   "main": "index.js",
   "directories": {
@@ -17,7 +17,8 @@
     "eslint-plugin-jsx-a11y": "^3.0.2",
     "eslint-plugin-react": "^6.10.3",
     "istanbul": "^0.4.5",
-    "mocha": "^2.2.5"
+    "mocha": "^2.2.5",
+    "serverless": "^1.20.2"
   },
   "scripts": {
     "test": "node ./node_modules/istanbul/lib/cli.js cover _mocha -- -R spec && node ./node_modules/istanbul/lib/cli.js check-coverage --line 70 coverage/coverage.json",

diff --git a/test/index-test.js b/test/index-test.js
@@ -18,104 +18,99 @@ const correctConfigWithStageFilter = {
   filterPattern: 'Test Pattern',
   stages: ['production'],
 };
+
+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',
-          },
-        },
-      },
-      functions: {
-        testFunctionOne: {
-          name: 'functionOne',
-          filterPattern: 'Pattern',
-        },
-        testFunctionTwo: {
-          name: 'functionTwo',
+  const options = {};
+  const serverless = createServerless(options, {
+    provider: {
+      region: 'us-moon-1',
+      stage: 'test-stage',
+    },
+    custom: {
+      logForwarding,
+    },
+    resources: {
+      Resources: {
+        TestExistingFilter: {
+          Type: 'AWS:Test:Filter',
         },
       },
-      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',
-      },
-      custom: {
-        logForwarding,
-      },
-      resources: undefined,
-      functions: {
-        testFunctionOne: {
-          name: 'functionOne',
-        },
-        testFunctionTwo: {
-          name: 'functionTwo',
-        },
-      },
-      service: 'test-service',
+  const options = {};
+  const serverless = createServerless(options, {
+    provider: {
+      region: 'us-moon-1',
+      stage: 'test-stage',
     },
-    cli: {
-      log() {
+    custom: {
+      logForwarding,
+    },
+    functions: {
+      testFunctionOne: {
+      },
+      testFunctionTwo: {
       },
     },
-  };
-  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',
-          },
-        },
-      },
-      functions: {
-        testFunctionOne: {
-          name: 'functionOne',
-          filterPattern: 'Pattern',
-        },
-        testFunctionTwo: {
-          name: 'functionTwo',
+  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',
         },
       },
-      service: 'test-service',
     },
-    cli: {
-      log() {
+    functions: {
+      testFunctionOne: {
+        filterPattern: 'Pattern',
+      },
+      testFunctionTwo: {
       },
     },
-  };
-  return new LogForwardingPlugin(serverless, { stage: 'dev' });
+    service: 'test-service',
+  });
+  return new LogForwardingPlugin(serverless, options);
 };
 
 describe('Given a serverless config', () => {
@@ -143,6 +138,7 @@ describe('Given a serverless config', () => {
           },
           DependsOn: [
             'LogForwardingLambdaPermission',
+            'TestFunctionOneLogGroup',
           ],
         },
         SubscriptionFiltertestFunctionTwo: {
@@ -154,6 +150,7 @@ describe('Given a serverless config', () => {
           },
           DependsOn: [
             'LogForwardingLambdaPermission',
+            'TestFunctionTwoLogGroup',
           ],
         },
       },
@@ -185,6 +182,7 @@ describe('Given a serverless config', () => {
           },
           DependsOn: [
             'LogForwardingLambdaPermission',
+            'TestFunctionOneLogGroup',
           ],
         },
         SubscriptionFiltertestFunctionTwo: {
@@ -196,6 +194,7 @@ describe('Given a serverless config', () => {
           },
           DependsOn: [
             'LogForwardingLambdaPermission',
+            'TestFunctionTwoLogGroup',
           ],
         },
       },
@@ -224,6 +223,7 @@ describe('Given a serverless config', () => {
           },
           DependsOn: [
             'LogForwardingLambdaPermission',
+            'TestFunctionOneLogGroup',
           ],
         },
         SubscriptionFiltertestFunctionTwo: {
@@ -235,6 +235,7 @@ describe('Given a serverless config', () => {
           },
           DependsOn: [
             'LogForwardingLambdaPermission',
+            'TestFunctionTwoLogGroup',
           ],
         },
       },
@@ -266,6 +267,7 @@ describe('Given a serverless config', () => {
           },
           DependsOn: [
             'LogForwardingLambdaPermission',
+            'TestFunctionOneLogGroup',
           ],
         },
         SubscriptionFiltertestFunctionTwo: {
@@ -277,6 +279,7 @@ describe('Given a serverless config', () => {
           },
           DependsOn: [
             'LogForwardingLambdaPermission',
+            'TestFunctionTwoLogGroup',
           ],
         },
       },