fix(apigw): optimize remove apigw trigger flow

Author: yugasun

src/modules/apigw/entities/service.ts

@@ -6,9 +6,11 @@ import {
   ApigwCreateOrUpdateServiceOutputs,
   ApigwSetupUsagePlanInputs,
 } from '../interface';
+import { ApiServiceType } from '../../interface';
 import { pascalCaseProps, deepClone } from '../../../utils';
 import APIS, { ActionType } from '../apis';
 import UsagePlanEntity from './usage-plan';
+import Tag from '../../tag';
 
 interface Detail {
   InnerSubDomain: string;
@@ -27,11 +29,22 @@ interface Detail {
 export default class ServiceEntity {
   capi: Capi;
   usagePlan: UsagePlanEntity;
+  tag: Tag;
 
   constructor(capi: Capi) {
     this.capi = capi;
 
     this.usagePlan = new UsagePlanEntity(capi);
+
+    const { options } = capi;
+    this.tag = new Tag(
+      {
+        SecretId: options.SecretId,
+        SecretKey: options.SecretKey,
+        Token: options.Token,
+      },
+      options.Region,
+    );
   }
 
   async request({ Action, ...data }: { Action: ActionType; [key: string]: any }) {
@@ -303,4 +316,42 @@ export default class ServiceEntity {
       releaseDesc: 'Released by Serverless',
     });
   }
+
+  async remove({ serviceId, environment }: { serviceId: string; environment: string }) {
+    const detail = await this.getById(serviceId);
+    if (!detail) {
+      console.log(`API service ${serviceId} not exist`);
+      return true;
+    }
+
+    try {
+      console.log(`Unreleasing service: ${serviceId}, environment ${environment}`);
+      await this.request({
+        Action: 'UnReleaseService',
+        serviceId,
+        environmentName: environment,
+      });
+      console.log(`Unrelease service ${serviceId}, environment ${environment} success`);
+
+      // 在删除之前，如果关联了标签，需要先删除标签关联
+      if (detail.Tags && detail.Tags.length > 0) {
+        await this.tag.deployResourceTags({
+          tags: [],
+          resourceId: serviceId,
+          serviceType: ApiServiceType.apigw,
+          resourcePrefix: 'service',
+        });
+      }
+
+      // delete service
+      console.log(`Removing service ${serviceId}`);
+      await this.request({
+        Action: 'DeleteService',
+        serviceId,
+      });
+      console.log(`Remove service ${serviceId} success`);
+    } catch (e) {
+      console.log(e.message);
+    }
+  }
 }

src/modules/apigw/index.ts

@@ -193,7 +193,7 @@ export default class Apigw {
       return;
     }
 
-    // remove usage plan
+    // 删除使用计划
     if (usagePlan) {
       await this.usagePlan.remove({
         serviceId,
@@ -202,7 +202,7 @@ export default class Apigw {
       });
     }
 
-    // 2. unbind all custom domains
+    // 解绑自定义域名
     if (customDomains) {
       for (let i = 0; i < customDomains.length; i++) {
         const curDomain = customDomains[i];
@@ -217,33 +217,11 @@ export default class Apigw {
       }
     }
 
-    if (created === true) {
-      // unrelease service
-      console.log(`Unreleasing service: ${serviceId}, environment ${environment}`);
-      await this.removeRequest({
-        Action: 'UnReleaseService',
-        serviceId,
-        environmentName: environment,
-      });
-      console.log(`Unrelease service ${serviceId}, environment ${environment} success`);
-
-      // 在删除之前，如果关联了标签，需要先删除标签关联
-      if (detail.Tags && detail.Tags.length > 0) {
-        await this.tagClient.deployResourceTags({
-          tags: [],
-          resourceId: serviceId,
-          serviceType: ApiServiceType.apigw,
-          resourcePrefix: 'service',
-        });
-      }
-
-      // delete service
-      console.log(`Removing service ${serviceId}`);
-      await this.removeRequest({
-        Action: 'DeleteService',
+    if (created && isAutoRelease) {
+      await this.service.remove({
         serviceId,
+        environment,
       });
-      console.log(`Remove service ${serviceId} success`);
     }
   }
 

src/modules/triggers/interface/index.ts

@@ -162,8 +162,14 @@ export interface NewTriggerInputs {
 export * from './clb';
 
 export interface SimpleApigwDetail {
+  // 是否是通过 CLI 创建的
+  created?: boolean;
+  // 当前触发器关联函数名称
   functionName: string;
+  // 服务 ID
   serviceId: string;
+  // 服务名称
   serviceName: string;
+  // 发布的环境
   environment: string;
 }

src/modules/triggers/manager.ts

@@ -273,6 +273,7 @@ export class TriggerManager {
         // 筛选出 API 网关触发器，可以单独的进行发布
         if (triggerOutput.serviceId) {
           apigwServiceList.push({
+            created: triggerOutput.created,
             functionName: name,
             serviceId: triggerOutput.serviceId,
             serviceName: triggerOutput.serviceName,
@@ -403,6 +404,31 @@ export class TriggerManager {
     });
   }
 
+  /**
+   * 批量删除 API 网关，防止重复删除同一个网关
+   * @param list API 网关列表
+   */
+  async bulkRemoveApigw(list: SimpleApigwDetail[]) {
+    // 筛选非重复的网关服务
+    const uniqueList: SimpleApigwDetail[] = [];
+    const map: { [key: string]: number } = {};
+    list.forEach((item) => {
+      if (!map[item.serviceId]) {
+        map[item.serviceId] = 1;
+        uniqueList.push(item);
+      }
+    });
+
+    const releaseTask: Promise<any>[] = [];
+    for (let i = 0; i < uniqueList.length; i++) {
+      const temp = uniqueList[i];
+      const exist = await this.apigwClient.service.getById(temp.serviceId);
+      if (exist) {
+        releaseTask.push(this.apigwClient.service.release(temp));
+      }
+    }
+    await Promise.all(releaseTask);
+  }
   /**
    * 批量发布 API 网关，防止重复发布同一个网关
    * @param list API 网关列表