fix(scf): get trigger list method

Author: yugasun

.github/workflows/release.yml

@@ -44,6 +44,6 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           GIT_AUTHOR_NAME: slsplus
-          GIT_AUTHOR_EMAIL: yuga.sun.bj@gmail.com
+          GIT_AUTHOR_EMAIL: slsplus.sz@gmail.com
           GIT_COMMITTER_NAME: slsplus
-          GIT_COMMITTER_EMAIL: yuga.sun.bj@gmail.com
+          GIT_COMMITTER_EMAIL: slsplus.sz@gmail.com

__tests__/scf.test.js

@@ -15,7 +15,7 @@ describe('Scf', () => {
   };
 
   const inputs = {
-    name: 'serverless-test',
+    name: `serverless-test-${Date.now()}`,
     code: {
       bucket: process.env.BUCKET,
       object: 'express_code.zip',
@@ -226,7 +226,7 @@ describe('Scf', () => {
       CodeResult: 'success',
       CodeError: '',
       ErrNo: 0,
-      Tags: [],
+      Tags: expect.any(Array),
       AccessInfo: { Host: '', Vip: '' },
       Type: 'Event',
       CfsConfig: {

src/modules/scf/apis.js

@@ -15,6 +15,7 @@ const ACTIONS = [
   'DeleteAlias',
   'GetAlias',
   'Invoke',
+  'ListTriggers',
 ];
 
 const APIS = ApiFactory({

src/modules/scf/index.js

@@ -8,7 +8,7 @@ const Cam = require('../cam/index');
 const { formatFunctionInputs } = require('./utils');
 const CONFIGS = require('./config');
 const Apis = require('./apis');
-const Triggers = require('./triggers');
+const TRIGGERS = require('./triggers');
 
 class Scf {
   constructor(credentials = {}, region) {
@@ -167,45 +167,57 @@ class Scf {
     return true;
   }
 
+  async getTriggerList(functionName, namespace = 'default') {
+    const { Triggers = [], TotalCount } = await this.request({
+      Action: 'ListTriggers',
+      FunctionName: functionName,
+      Namespace: namespace,
+      Limit: 100,
+    });
+    if (TotalCount > 100) {
+      const res = await this.getTriggerList(functionName, namespace);
+      return Triggers.concat(res);
+    }
+
+    return Triggers;
+  }
+
   // deploy SCF triggers
   async deployTrigger(funcInfo, inputs) {
     console.log(`Deploying ${inputs.name}'s triggers in ${this.region}.`);
 
     // should check function status is active, then continue
     await this.isOperationalStatus(inputs.namespace, inputs.name);
 
+    // get all triggers
+    const triggerList = await this.getTriggerList(funcInfo.FunctionName, funcInfo.Namespace);
+
     // remove all old triggers
-    const oldTriggers = funcInfo.Triggers || [];
-    for (let tIdx = 0, len = oldTriggers.length; tIdx < len; tIdx++) {
-      const curTrigger = oldTriggers[tIdx];
+    for (let i = 0, len = triggerList.length; i < len; i++) {
+      const curTrigger = triggerList[i];
       const { Type } = curTrigger;
-      const triggerClass = Triggers[Type];
-
-      if (Type === 'apigw') {
-        // TODO: now apigw can not sync in SCF trigger list
-        // await this.apigwClient.remove(curTrigger);
-      } else {
-        console.log(`Removing ${curTrigger.Type} triggers: ${curTrigger.TriggerName}.`);
-        await triggerClass.delete(this, funcInfo, curTrigger);
+      const triggerClass = TRIGGERS[Type];
+      if (triggerClass) {
+        if (Type === 'apigw') {
+          // TODO: now apigw can not sync in SCF trigger list
+          // await this.apigwClient.remove(curTrigger);
+        } else {
+          await triggerClass.delete(this, funcInfo, curTrigger);
+        }
       }
     }
 
     // create all new triggers
     const triggerResult = [];
     for (let i = 0; i < inputs.events.length; i++) {
       const event = inputs.events[i];
-      const eventType = Object.keys(event)[0];
-      const triggerClass = Triggers[eventType];
+      const Type = Object.keys(event)[0];
+      const triggerClass = TRIGGERS[Type];
       if (!triggerClass) {
-        throw TypeError('PARAMETER_SCF', `Unknow trigger type ${eventType}`);
+        throw TypeError('PARAMETER_SCF', `Unknow trigger type ${Type}`);
       }
       try {
-        const triggerOutput = await triggerClass.create(
-          this,
-          this.region,
-          funcInfo,
-          event[eventType],
-        );
+        const triggerOutput = await triggerClass.create(this, this.region, funcInfo, event[Type]);
 
         triggerResult.push(triggerOutput);
       } catch (e) {
@@ -245,7 +257,7 @@ class Scf {
    * @param {object} inputs publish version parameter
    */
   async publishVersion(inputs) {
-    console.log(`Publish function ${inputs.functionName} version`);
+    console.log(`Publishing function ${inputs.functionName} version`);
     const publishInputs = {
       Action: 'PublishVersion',
       FunctionName: inputs.functionName,

src/modules/scf/triggers.js

@@ -15,6 +15,7 @@ const BaseTrigger = {
         Type: inputs.Type,
         TriggerDesc: inputs.TriggerDesc,
         TriggerName: inputs.TriggerName,
+        Qualifier: inputs.Qualifier,
       });
       return true;
     } catch (e) {