fix: scf remove apigw logical (#156)

* fix: scf remove apigw logical

* test: fix scf unit test

* fix: simplify createOrUpdateApi method

Author: yugasun

__tests__/scf.test.js

@@ -190,6 +190,9 @@ describe('Scf', () => {
           TriggerDesc: `{"cron":"${inputs.events[0].timer.parameters.cronExpression}"}`,
           TriggerName: inputs.events[0].timer.name,
           Type: 'timer',
+          BindStatus: '',
+          ResourceId: '',
+          TriggerAttribute: '',
         },
         {
           AddTime: expect.any(String),
@@ -200,6 +203,9 @@ describe('Scf', () => {
           TriggerDesc: `{"bucketUrl":"${inputs.events[1].cos.parameters.bucket}","event":"${inputs.events[1].cos.parameters.events}","filter":{"Prefix":"${inputs.events[1].cos.parameters.filter.prefix}","Suffix":"${inputs.events[1].cos.parameters.filter.suffix}"}}`,
           TriggerName: expect.stringContaining('cos_'),
           Type: 'cos',
+          BindStatus: '',
+          ResourceId: '',
+          TriggerAttribute: '',
         },
         {
           created: true,

src/modules/apigw/index.js

@@ -210,7 +210,7 @@ class Apigw {
     }
   }
 
-  async createOrUpdateApi({ serviceId, endpoint }) {
+  async createOrUpdateApi({ serviceId, endpoint, created }) {
     const output = {
       path: endpoint.path,
       method: endpoint.method,
@@ -298,6 +298,7 @@ class Apigw {
         apiId: endpoint.apiId,
         ...apiInputs,
       });
+      output.created = !!created;
       output.apiId = endpoint.apiId;
       output.internalDomain = apiDetail.InternalDomain;
       console.log(`Service with id ${output.apiId} updated.`);
@@ -307,9 +308,9 @@ class Apigw {
     return output;
   }
 
-  async setupUsagePlanSecret({ secretName, secretIds }) {
+  async setupUsagePlanSecret({ secretName, secretIds, created }) {
     const secretIdsOutput = {
-      created: false,
+      created: !!created,
       secretIds,
     };
 
@@ -321,7 +322,7 @@ class Apigw {
         SecretName: secretName,
         AccessKeyType: 'auto',
       });
-      console.log(`Secret key with ID ${AccessKeyId} and key ${AccessKeySecret} updated.`);
+      console.log(`Secret key with ID ${AccessKeyId} and key ${AccessKeySecret} created`);
       secretIdsOutput.secretIds = [AccessKeyId];
       secretIdsOutput.created = true;
     } else {
@@ -614,14 +615,13 @@ class Apigw {
 
       if (exist) {
         endpoint.apiId = exist.apiId;
+        endpoint.created = exist.created;
       }
       const curApi = await this.createOrUpdateApi({
         serviceId,
         endpoint,
+        created: exist && exist.created,
       });
-      if (exist) {
-        curApi.created = true;
-      }
 
       // set api auth and use plan
       if (endpoint.auth) {
@@ -636,10 +636,16 @@ class Apigw {
         // store in api list
         curApi.usagePlan = usagePlan;
 
-        const { secretIds = [] } = endpoint.auth;
+        let secretCreated = false;
+        let { secretIds = [] } = endpoint.auth;
+        if (exist && exist.usagePlan && exist.usagePlan.secrets) {
+          secretIds = secretIds.concat(exist.usagePlan.secrets.secretIds);
+          secretCreated = exist.usagePlan.secrets.created;
+        }
         const secrets = await this.setupUsagePlanSecret({
           secretName: endpoint.auth.secretName,
           secretIds,
+          created: secretCreated,
         });
 
         const unboundSecretIds = await this.getUnboundSecretIds({
@@ -688,7 +694,7 @@ class Apigw {
     console.log(`Deploy service with id ${serviceId} successfully.`);
 
     const outputs = {
-      created: serviceCreated,
+      created: serviceCreated || oldState.created,
       serviceId,
       serviceName,
       subDomain,
@@ -810,16 +816,16 @@ class Apigw {
       }
     }
 
-    // 3. unrelease service
-    console.log(`Unreleasing service: ${serviceId}, environment: ${environment}`);
-    await this.removeOrUnbindRequest({
-      Action: 'UnReleaseService',
-      serviceId,
-      environmentName: environment,
-    });
-    console.log(`Unrelease service: ${serviceId}, environment: ${environment} success`);
-
     if (created === true) {
+      // unrelease service
+      console.log(`Unreleasing service: ${serviceId}, environment: ${environment}`);
+      await this.removeOrUnbindRequest({
+        Action: 'UnReleaseService',
+        serviceId,
+        environmentName: environment,
+      });
+      console.log(`Unrelease service: ${serviceId}, environment: ${environment} success`);
+
       // delete service
       console.log(`Removing service: ${serviceId}`);
       await this.removeOrUnbindRequest({

src/modules/scf/index.js

@@ -625,18 +625,6 @@ class Scf {
           try {
             // delete apigw trigger
             const curTrigger = inputs.Triggers[i];
-            curTrigger.created = true;
-            const { apiList } = curTrigger;
-            curTrigger.apiList = apiList.map((item) => {
-              item.created = true;
-              if (item.usagePlan) {
-                item.usagePlan.created = true;
-                if (item.usagePlan.secrets) {
-                  item.usagePlan.secrets.created = true;
-                }
-              }
-              return item;
-            });
             await this.apigwClient.remove(curTrigger);
           } catch (e) {
             console.log(e);

src/modules/scf/triggers.js

@@ -201,8 +201,10 @@ const ApigwTrigger = {
   formatInputs(region, funcInfo, inputs) {
     const { parameters, name } = inputs;
     const triggerInputs = {};
+    triggerInputs.oldState = parameters.oldState;
     triggerInputs.region = region;
     triggerInputs.protocols = parameters.protocols;
+    triggerInputs.protocols = parameters.protocols;
     triggerInputs.environment = parameters.environment;
     triggerInputs.serviceId = parameters.serviceId;
     triggerInputs.serviceName = parameters.serviceName || name;
@@ -221,6 +223,7 @@ const ApigwTrigger = {
     if (parameters.netTypes) {
       triggerInputs.netTypes = parameters.netTypes;
     }
+    triggerInputs.created = !!parameters.created;
     return {
       triggerInputs,
     };