Logs command fails for packaged actions.

Fixes #111

Author: jthomas

logs/index.js

@@ -80,12 +80,19 @@ class OpenWhiskLogs {
       });
   }
 
+  // activation log annotations have a { key: 'path, value: 'namespace/actioname' } member.
+  hasPathAnnotationWithName (annotations, name) {
+    return annotations.filter(an => an.key === 'path')
+      .map(an => an.value.split('/').slice(1).join('/'))
+      .some(value => value === name)
+  }
+
   filterFunctionLogs (logs) {
     const functionObject = this.serverless.service.getFunction(this.options.function);
     const actionName = functionObject.name || `${this.serverless.service.service}_${this.options.function}`
 
     // skip activations for other actions or that we have seen before 
-    const filtered = logs.filter(log => log.name === actionName
+    const filtered = logs.filter(log => this.hasPathAnnotationWithName((log.annotations || []), actionName)
       && !this.previous_activations.has(log.activationId))
 
     // allow regexp filtering of log messages

logs/tests/index.js

@@ -15,8 +15,8 @@ require('chai').use(chaiAsPromised);
 describe('OpenWhiskLogs', () => {
   let sandbox;
 
-  const CLI = function () { this.log = function () {};};
-  const serverless = {config: () => {}, pluginManager: { getPlugins: () => []}, classes: {Error, CLI}, service: {getFunction: () => ({}), provider: {}, resources: {}, getAllFunctions: () => []}, getProvider: sinon.spy()};
+     const CLI = function () { this.log = function () {};};
+  const serverless = {config: () => {}, pluginManager: { getPlugins: () => []}, classes: {Error, CLI}, service: {getFunction: name => (serverless.service.functions[name]), provider: {}, resources: {}, getAllFunctions: () => []}, getProvider: sinon.spy()};
   const options = {
     stage: 'dev',
     region: 'us-east-1',
@@ -64,7 +64,6 @@ describe('OpenWhiskLogs', () => {
     beforeEach(() => {
       openwhiskLogs.serverless.service.functions = {
         first: {
-          namespace: 'sample',
           handler: true,
         },
       };
@@ -110,7 +109,6 @@ describe('OpenWhiskLogs', () => {
     beforeEach(() => {
       openwhiskLogs.serverless.service.functions = {
         first: {
-          namespace: 'sample',
           handler: true,
         },
       };
@@ -153,7 +151,6 @@ describe('OpenWhiskLogs', () => {
     beforeEach(() => {
       openwhiskLogs.serverless.service.functions = {
         first: {
-          namespace: 'sample',
           handler: true,
         },
       };
@@ -165,16 +162,39 @@ describe('OpenWhiskLogs', () => {
     });
 
     it('should filter out different function logs', () => {
-      const logs = [{name: "new-service_first"}, {name: "new-service_first"}, {name: "new-service_second"}, {name: "new-service_third"}, {name: "new-service_first"}]
+      const logs = [
+        { name: "new-service_first", annotations: [ {key: "path", value: '[email protected]_dev/new-service_first'} ] },
+        { name: "new-service_first", annotations: [ {key: "path", value: '[email protected]_dev/new-service_first'} ] },
+        { name: "new-service_second", annotations: [ {key: "path", value: '[email protected]_dev/new-service_second'} ] },
+        { name: "new-service_third", annotations: [ {key: "path", value: "[email protected]_dev/new-second_third"} ] },
+        { name: "new-service_first", annotations: [ {key: "path", value: '[email protected]_dev/new-service_first'} ] }
+    ]
       return openwhiskLogs.filterFunctionLogs(logs).then(logs => {
         expect(logs.length).to.be.equal(3)
         logs.forEach(log => expect(log.name).to.be.equal('new-service_first'))
       })
     });
 
+    it('should filter out different function logs with package function', () => {
+      openwhiskLogs.serverless.service.functions.first.name = 'packagename/funcname'
+      const logs = [
+        { name: "funcname", annotations:[{ key:"path", value:"[email protected]_dev/packagename/funcname"} ]},
+        { name: "funcname", annotations:[{ key:"path", value:"[email protected]_dev/packagename/funcname"} ]},
+        { name: "new-service_second", annotations: [ {key: "path", value: '[email protected]_dev/new-service_second'} ] },
+        { name: "new-service_third", annotations: [ {key: "path", value: "[email protected]_dev/new-second_third"} ] },
+        { name: "funcname", annotations:[{ key:"path", value:"[email protected]_dev/packagename/funcname"} ]}
+      ]
+
+      return openwhiskLogs.filterFunctionLogs(logs).then(logs => {
+        expect(logs.length).to.be.equal(3)
+        logs.forEach(log => expect(log.name).to.be.equal('funcname'))
+      })
+    });
+
+
     it('should filter out logs lines based upon contents', () => {
       openwhiskLogs.options.startTime = moment('2001-01-01')
-      const logs = [{name: "new-service_first", logs: ["2001-01-02 matching line", "2001-01-01 another matching line", "2000-12-31 should not match"]}]
+      const logs = [{name: "new-service_first", annotations: [ {key: "path", value: '[email protected]_dev/new-service_first' }], logs: ["2001-01-02 matching line", "2001-01-01 another matching line", "2000-12-31 should not match"]}]
       return openwhiskLogs.filterFunctionLogs(logs).then(logs => {
         expect(logs.length).to.be.equal(1)
         expect(logs[0].logs).to.be.deep.equal(["2001-01-02 matching line"])
@@ -184,7 +204,11 @@ describe('OpenWhiskLogs', () => {
 
     it('should filter out logs lines based upon contents', () => {
       openwhiskLogs.options.filter = new RegExp('matching', 'i')
-      const logs = [{name: "new-service_first", logs: ["matching line", "another matching line", "should not match"]}, {name: "new-service_first", logs: ["does not match"]}]
+      const logs = [
+        {name: "new-service_first", annotations: [ {key: "path", value: '[email protected]_dev/new-service_first' }], logs: ["matching line", "another matching line", "should not match"]},
+        {name: "new-service_first", annotations: [ {key: "path", value: '[email protected]_dev/new-service_first' }], logs: ["does not match"]}
+      ]
+
       return openwhiskLogs.filterFunctionLogs(logs).then(logs => {
         expect(logs.length).to.be.equal(2)
         expect(logs[0].logs).to.be.deep.equal(["matching line", "another matching line"])
@@ -193,11 +217,14 @@ describe('OpenWhiskLogs', () => {
       })
     });
 
-
-
     it('should filter already seen log messages', () => {
       openwhiskLogs.previous_activations = new Set([1, 2, 3, 4, 5])
-      const logs = [{activationId: 1, name: "new-service_first"}, {activationId: 5, name: "new-service_first"}, {activationId: 6, name: "new-service_first"}]
+      const logs = [
+        {activationId: 1, annotations: [ {key: "path", value: '[email protected]_dev/new-service_first' }], name: "new-service_first"},
+        {activationId: 5, annotations: [ {key: "path", value: '[email protected]_dev/new-service_first' }],  name: "new-service_first"},
+        {activationId: 6, annotations: [ {key: "path", value: '[email protected]_dev/new-service_first' }],  name: "new-service_first"}
+      ]
+
       return openwhiskLogs.filterFunctionLogs(logs).then(logs => {
         expect(logs.length).to.be.equal(1)
         expect(logs[0].name).to.be.equal('new-service_first')
@@ -211,7 +238,6 @@ describe('OpenWhiskLogs', () => {
     beforeEach(() => {
       openwhiskLogs.serverless.service.functions = {
         first: {
-          namespace: 'sample',
           handler: true,
         },
       };