Fixed alarm annotations of trigger can not be saved

Author: KeonHee

deploy/lib/deployTriggers.js

@@ -9,26 +9,21 @@ module.exports = {
         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(() => {
+        .then(() => {
           if (this.options.verbose) {
             this.serverless.cli.log(`Deployed Trigger: ${trigger.triggerName}`);
           }
         }).catch(err => {
-        throw new this.serverless.classes.Error(
-          `Failed to deploy trigger (${trigger.triggerName}) due to error: ${err.message}`
-        );
-      })
+          throw new this.serverless.classes.Error(
+            `Failed to deploy trigger (${trigger.triggerName}) due to error: ${err.message}`
+          );
+        });
     });
   },
 
   deployTriggers() {
-    const triggers = this.getTriggers();
+    const triggers = this.getTriggers(this.serverless.service.triggers);
 
     if(triggers.length) {
       this.serverless.cli.log('Deploying Triggers...');
@@ -39,14 +34,22 @@ module.exports = {
     );
   },
 
-  getTriggers() {
-    const triggers = this.serverless.service.triggers;
-    const trigger = { feed: undefined };
+  getTriggers(triggers) {
+    const feedMask = { feed: undefined };
     return Object.keys(triggers)
-      .map(t => Object.assign({}, triggers[t], trigger));
-  },
-
-  getFeed(trigger) {
-    return trigger.feed;
+      .map(t => {
+        const trigger = triggers[t];
+        if (trigger.feed) {
+          Object.assign(trigger, {
+            trigger: {
+              annotations: [{
+                key: 'feed',
+                value: `/${trigger.feed.namespace}/${trigger.feed.feedName}`,
+              }],
+            },
+          });
+        }
+        return Object.assign(trigger, feedMask);
+      });
   },
 };

deploy/tests/deployTriggers.js

@@ -17,17 +17,59 @@ describe('deployTriggers', () => {
       myTrigger: {
         triggerName: 'myTrigger',
         namespace: 'myNamespace',
-        action: 'myAction',
-        trigger: 'myTrigger',
       },
       feedTrigger: {
+        triggerName: 'feedTrigger',
+        namespace: 'feedNamespace',
+        trigger: {
+          annotations: [
+            {
+              key: 'feed',
+              value: '/whisk.system/alarms/alarm'
+            }
+          ]
+        },
+      },
+    },
+    serviceTriggers: {
+      myTrigger: {
         triggerName: 'myTrigger',
         namespace: 'myNamespace',
-        action: 'myAction',
-        trigger: 'myTrigger',
-        feed: '/whisk.system/alarms/alarm',
+      },
+      feedTrigger: {
+        triggerName: 'feedTrigger',
+        namespace: 'feedNamespace',
+        feed: {
+          trigger : '/feedNamespace/feedTrigger',
+          feedName: 'alarms/alarm',
+          namespace: 'whisk.system',
+          params: {
+            cron: '* * * * *',
+            trigger_payload: {}
+          }
+        }
       },
     },
+    owTriggers: [
+      {
+        triggerName: 'myTrigger',
+        namespace: 'myNamespace',
+        feed: undefined
+      },
+      {
+        triggerName: 'feedTrigger',
+        namespace: 'feedNamespace',
+        trigger: {
+          annotations: [
+            {
+              key: 'feed',
+              value: '/whisk.system/alarms/alarm'
+            }
+          ],
+        },
+        feed: undefined
+      },
+    ],
   };
 
   beforeEach(() => {
@@ -108,5 +150,10 @@ describe('deployTriggers', () => {
       return expect(openwhiskDeploy.deployTrigger(mockTriggerObject.triggers.feedTrigger))
         .to.eventually.be.fulfilled;
     });
+
+    it('should change the trigger format to match the ow.', () => {
+      expect(openwhiskDeploy.getTriggers(mockTriggerObject.serviceTriggers))
+        .to.be.deep.equal(mockTriggerObject.owTriggers)
+    });
   });
 });