fix(scf): add trigger key for delete

Author: yugasun

src/modules/scf/index.js

@@ -1,7 +1,7 @@
 const { sleep } = require('@ygkit/request');
 const { Capi } = require('@tencent-sdk/capi');
 const { TypeError, ApiError } = require('../../utils/error');
-const { strip } = require('../../utils');
+const { deepClone, strip } = require('../../utils');
 const TagsUtils = require('../tag/index');
 const ApigwUtils = require('../apigw/index');
 const Cam = require('../cam/index');
@@ -182,6 +182,34 @@ class Scf {
     return Triggers;
   }
 
+  filterTriggers(funcInfo, events, oldList) {
+    const deleteList = deepClone(oldList);
+    const createList = deepClone(events);
+    const updateList = [];
+    events.forEach((event, index) => {
+      const Type = Object.keys(event)[0];
+      const triggerClass = TRIGGERS[Type];
+      if (Type !== 'apigw') {
+        const { triggerKey } = triggerClass.formatInputs(this.region, funcInfo, event[Type]);
+        for (let i = 0; i < oldList.length; i++) {
+          const curOld = oldList[i];
+          const oldTriggerClass = TRIGGERS[curOld.Type];
+          const oldKey = oldTriggerClass.getKey(curOld);
+          if (oldKey === triggerKey) {
+            deleteList[i] = null;
+            createList[index] = null;
+            updateList.push(createList[index]);
+          }
+        }
+      }
+    });
+    return {
+      updateList,
+      deleteList: deleteList.filter((item) => item),
+      createList: createList.filter((item) => item),
+    };
+  }
+
   // deploy SCF triggers
   async deployTrigger(funcInfo, inputs) {
     console.log(`Deploying ${inputs.name}'s triggers in ${this.region}.`);
@@ -192,9 +220,11 @@ class Scf {
     // get all triggers
     const triggerList = await this.getTriggerList(funcInfo.FunctionName, funcInfo.Namespace);
 
+    const { deleteList, createList } = this.filterTriggers(funcInfo, inputs.events, triggerList);
+
     // remove all old triggers
-    for (let i = 0, len = triggerList.length; i < len; i++) {
-      const curTrigger = triggerList[i];
+    for (let i = 0, len = deleteList.length; i < len; i++) {
+      const curTrigger = deleteList[i];
       const { Type } = curTrigger;
       const triggerClass = TRIGGERS[Type];
       if (triggerClass) {
@@ -209,8 +239,8 @@ class Scf {
 
     // create all new triggers
     const triggerResult = [];
-    for (let i = 0; i < inputs.events.length; i++) {
-      const event = inputs.events[i];
+    for (let i = 0; i < createList.length; i++) {
+      const event = createList[i];
       const Type = Object.keys(event)[0];
       const triggerClass = TRIGGERS[Type];
       if (!triggerClass) {

src/modules/scf/triggers.js

@@ -1,6 +1,6 @@
 const BaseTrigger = {
   async create(scf, region, funcInfo, inputs) {
-    const { triggerInputs } = this.formatInputs(funcInfo, inputs);
+    const { triggerInputs } = this.formatInputs(region, funcInfo, inputs);
     console.log(`Creating ${triggerInputs.Type} trigger ${triggerInputs.TriggerName}`);
     const { TriggerInfo } = await scf.request(triggerInputs);
     return TriggerInfo;
@@ -26,8 +26,10 @@ const BaseTrigger = {
 };
 
 const TimerTrigger = {
-  type: 'timer',
-  formatInputs(funcInfo, inputs) {
+  getKey(triggerInputs) {
+    return `${triggerInputs.Type}-${triggerInputs.TriggerName}-${triggerInputs.Qualifier}`;
+  },
+  formatInputs(region, funcInfo, inputs) {
     const { parameters, name } = inputs;
     const triggerInputs = {
       Action: 'CreateTrigger',
@@ -44,7 +46,7 @@ const TimerTrigger = {
     if (parameters.argument) {
       triggerInputs.CustomArgument = parameters.argument;
     }
-    const triggerKey = `${triggerInputs.Type}-${triggerInputs.TriggerName}`;
+    const triggerKey = this.getKey(triggerInputs);
 
     return {
       triggerInputs,
@@ -60,7 +62,15 @@ const TimerTrigger = {
 };
 
 const CosTrigger = {
-  formatInputs(funcInfo, inputs) {
+  getKey(triggerInputs) {
+    const tempDest = JSON.stringify({
+      bucketUrl: triggerInputs.TriggerName,
+      event: JSON.parse(triggerInputs.TriggerDesc).event,
+      filter: JSON.parse(triggerInputs.TriggerDesc).filter,
+    });
+    return `cos-${triggerInputs.TriggerName}-${tempDest}-${triggerInputs.Qualifier}`;
+  },
+  formatInputs(region, funcInfo, inputs) {
     const { parameters } = inputs;
     const triggerInputs = {
       Action: 'CreateTrigger',
@@ -79,12 +89,7 @@ const CosTrigger = {
       },
     });
     triggerInputs.Enable = parameters.enable ? 'OPEN' : 'CLOSE';
-    const tempDest = JSON.stringify({
-      bucketUrl: triggerInputs.TriggerName,
-      event: JSON.parse(triggerInputs.TriggerDesc).event,
-      filter: JSON.parse(triggerInputs.TriggerDesc).filter,
-    });
-    const triggerKey = `cos-${triggerInputs.TriggerName}-${tempDest}`;
+    const triggerKey = this.getKey(triggerInputs);
 
     return {
       triggerInputs,
@@ -100,7 +105,10 @@ const CosTrigger = {
 };
 
 const CkafkaTrigger = {
-  formatInputs(funcInfo, inputs) {
+  getKey(triggerInputs) {
+    return `${triggerInputs.Type}-${triggerInputs.TriggerName}-${triggerInputs.Qualifier}`;
+  },
+  formatInputs(region, funcInfo, inputs) {
     const { parameters } = inputs;
     const triggerInputs = {
       Action: 'CreateTrigger',
@@ -117,7 +125,7 @@ const CkafkaTrigger = {
       retry: parameters.retry,
     });
     triggerInputs.Enable = parameters.enable ? 'OPEN' : 'CLOSE';
-    const triggerKey = `${triggerInputs.Type}-${triggerInputs.TriggerName}`;
+    const triggerKey = this.getKey(triggerInputs);
 
     return {
       triggerInputs,
@@ -133,7 +141,10 @@ const CkafkaTrigger = {
 };
 
 const CmqTrigger = {
-  formatInputs(funcInfo, inputs) {
+  getKey(triggerInputs) {
+    return `${triggerInputs.Type}-${triggerInputs.TriggerName}-${triggerInputs.Qualifier}`;
+  },
+  formatInputs(region, funcInfo, inputs) {
     const { parameters } = inputs;
     const triggerInputs = {
       Action: 'CreateTrigger',
@@ -150,7 +161,7 @@ const CmqTrigger = {
     });
 
     triggerInputs.Enable = parameters.enable ? 'OPEN' : 'CLOSE';
-    const triggerKey = `${triggerInputs.Type}-${triggerInputs.TriggerName}`;
+    const triggerKey = this.getKey(triggerInputs);
 
     return {
       triggerInputs,