Merge pull request #112 from KeonHee/trigger-with-feed-annotation

Add a feed annotation to a trigger when creating a trigger

Author: jthomas

deploy/lib/deployTriggers.js

@@ -8,6 +8,12 @@ module.exports = {
       if (this.options.verbose) {
         this.serverless.cli.log(`Deploying Trigger: ${trigger.triggerName}`);
       }
+
+      const feed = this.getFeed(trigger)
+      if (feed) {
+        Object.assign(trigger, { annotations: [{ key: 'feed', value: feed }] });
+      }
+
       return ow.triggers.create(trigger)
        .then(() => {
           if (this.options.verbose) {
@@ -38,5 +44,9 @@ module.exports = {
     const trigger = { feed: undefined };
     return Object.keys(triggers)
       .map(t => Object.assign({}, triggers[t], trigger));
-  }
+  },
+
+  getFeed(trigger) {
+    return trigger.feed;
+  },
 };

deploy/tests/deployTriggers.js

@@ -16,17 +16,24 @@ describe('deployTriggers', () => {
     triggers: {
       myTrigger: {
         triggerName: 'myTrigger',
-        namepspace: 'myNamespace',
+        namespace: 'myNamespace',
         action: 'myAction',
         trigger: 'myTrigger',
       },
+      feedTrigger: {
+        triggerName: 'myTrigger',
+        namespace: 'myNamespace',
+        action: 'myAction',
+        trigger: 'myTrigger',
+        feed: '/whisk.system/alarms/alarm',
+      },
     },
   };
 
   beforeEach(() => {
     sandbox = sinon.sandbox.create();
-    const CLI = function () { this.log = function () {};};
-    serverless = {classes: {Error, CLI}, service: {provider: {}, resources: {}, getAllFunctions: () => []}, getProvider: sandbox.spy()};
+    const CLI = function () { this.log = function () {}; };
+    serverless = { classes: { Error, CLI }, service: { provider: {}, resources: {}, getAllFunctions: () => [] }, getProvider: sandbox.spy() };
     const options = {
       stage: 'dev',
       region: 'us-east-1',
@@ -38,7 +45,7 @@ describe('deployTriggers', () => {
       apihost: 'openwhisk.org',
       auth: 'user:pass',
     };
-    openwhiskDeploy.provider = { client: () => {} }
+    openwhiskDeploy.provider = { client: () => {} };
   });
 
   afterEach(() => {
@@ -73,23 +80,33 @@ describe('deployTriggers', () => {
     });
 
     it('should log function deploy information with verbose flag', () => {
-      openwhiskDeploy.options.verbose = true
-      const log = sandbox.stub(openwhiskDeploy.serverless.cli, 'log')
-      const clog = sandbox.stub(openwhiskDeploy.serverless.cli, 'consoleLog')
+      openwhiskDeploy.options.verbose = true;
+      const log = sandbox.stub(openwhiskDeploy.serverless.cli, 'log');
+      const clog = sandbox.stub(openwhiskDeploy.serverless.cli, 'consoleLog');
       sandbox.stub(openwhiskDeploy.provider, 'client', () => {
-        const create = params => {
-          return Promise.resolve();
-        };
+        const create = params => Promise.resolve();
 
         return Promise.resolve({ triggers: { create } });
       });
 
       return openwhiskDeploy.deployTrigger(mockTriggerObject.triggers.myTrigger).then(() => {
-      expect(log.calledTwice).to.be.equal(true);
-      expect(log.args[0][0]).to.be.equal('Deploying Trigger: myTrigger')
-      expect(log.args[1][0]).to.be.equal('Deployed Trigger: myTrigger')
-      })
-    })
+        expect(log.calledTwice).to.be.equal(true);
+        expect(log.args[0][0]).to.be.equal('Deploying Trigger: myTrigger');
+        expect(log.args[1][0]).to.be.equal('Deployed Trigger: myTrigger');
+      });
+    });
 
+    it('should deploy trigger with feed annotation to openwhisk', () => {
+      sandbox.stub(openwhiskDeploy.provider, 'client', () => {
+        const create = params => {
+          expect(params).to.be.deep.equal(mockTriggerObject.triggers.feedTrigger);
+          return Promise.resolve();
+        };
+
+        return Promise.resolve({ triggers: { create } });
+      });
+      return expect(openwhiskDeploy.deployTrigger(mockTriggerObject.triggers.feedTrigger))
+        .to.eventually.be.fulfilled;
+    });
   });
 });