fix(apigw): support app remove

Author: yugasun

__tests__/apigw/app.test.ts

@@ -1,3 +1,4 @@
+import { sleep } from '@ygkit/request';
 import { ApigwDeployInputs, ApigwDeployOutputs } from '../../src/modules/apigw/interface';
 import { Apigw } from '../../src';
 import { deepClone } from '../../src/utils';
@@ -7,6 +8,10 @@ describe('apigw app', () => {
     SecretId: process.env.TENCENT_SECRET_ID,
     SecretKey: process.env.TENCENT_SECRET_KEY,
   };
+  const appConfig = {
+    name: 'serverless_app_test',
+    description: 'Created by serverless test',
+  };
   const inputs: ApigwDeployInputs = {
     protocols: ['http', 'https'],
     serviceName: 'serverless_test',
@@ -19,10 +24,7 @@ describe('apigw app', () => {
         method: 'POST',
         apiName: 'appauth',
         authType: 'APP',
-        app: {
-          name: 'serverless_app_test',
-          description: 'Created by serverless test',
-        },
+        app: appConfig,
         function: {
           functionName: 'serverless-unit-test',
         },
@@ -31,7 +33,7 @@ describe('apigw app', () => {
   };
   const apigw = new Apigw(credentials, process.env.REGION);
   let outputs: ApigwDeployOutputs;
-
+  let appId: string = '';
   // 由于自定义域名必须 ICP 备案，所以这里测试域名不会通过，具体测试请使用
   test('create apigw with app auth success', async () => {
     const apigwInputs = deepClone(inputs);
@@ -56,6 +58,7 @@ describe('apigw app', () => {
         },
       },
     ]);
+    appId = outputs.apiList[0].app.id;
   });
 
   test('update apigw without app auth success', async () => {
@@ -95,4 +98,24 @@ describe('apigw app', () => {
 
     expect(detail).toBeNull();
   });
+
+  test('get apigw app', async () => {
+    const { app } = apigw.api;
+    const exist = await app.get(appId);
+    expect(exist).toEqual({
+      id: appId,
+      name: appConfig.name,
+      description: expect.any(String),
+      key: expect.any(String),
+      secret: expect.any(String),
+    });
+  });
+
+  test('delete apigw app', async () => {
+    const { app } = apigw.api;
+    await app.delete(appId);
+    await sleep(2000);
+    const detail = await app.get(appId);
+    expect(detail).toEqual(undefined);
+  });
 });

src/modules/apigw/apis.ts

@@ -36,7 +36,9 @@ const ACTIONS = [
   'UnBindSubDomain',
   'DescribeServicesStatus',
   'DescribeServiceEnvironmentList',
+  'DescribeApiApp',
   'CreateApiApp',
+  'DeleteApiApp',
   'ModifyApiApp',
   'BindApiApp',
   'UnbindApiApp',

src/modules/apigw/entities/application.ts

@@ -1,4 +1,4 @@
-import { ApiAppCreateOptions } from './../interface';
+import { ApiAppCreateOptions, ApiAppItem, ApiAppDetail } from './../interface';
 import { Capi } from '@tencent-sdk/capi';
 import APIS, { ActionType } from '../apis';
 import { pascalCaseProps } from '../../../utils';
@@ -36,6 +36,24 @@ export default class AppEntity {
     return true;
   }
 
+  async get(id: string): Promise<ApiAppDetail | undefined> {
+    const { ApiAppSet = [] }: { ApiAppSet: ApiAppItem[] } = await this.request({
+      Action: 'DescribeApiApp',
+      ApiAppId: id,
+    });
+    if (ApiAppSet[0] && ApiAppSet[0].ApiAppId === id) {
+      const [current] = ApiAppSet;
+      return {
+        id,
+        name: current.ApiAppName,
+        description: current.ApiAppDesc,
+        key: current.ApiAppKey,
+        secret: current.ApiAppSecret,
+      };
+    }
+    return undefined;
+  }
+
   // bind api to application, if not config app id just create it
   async bind({ serviceId, environment, apiId, appConfig }: AppBindOptions) {
     // 1. create app
@@ -108,4 +126,13 @@ export default class AppEntity {
       description,
     };
   }
+  async delete(id: string) {
+    console.log(`Removing apigw application ${id}`);
+    await this.removeRequest({
+      Action: 'DeleteApiApp',
+      ApiAppId: id,
+    });
+
+    return true;
+  }
 }

src/modules/apigw/index.ts

@@ -10,7 +10,6 @@ import {
   ApigwDeployOutputs,
   ApigwRemoveInputs,
   ApigwCreateOrUpdateServiceOutputs,
-  ApigwUpdateServiceInputs,
   ApigwDeployWithServiceIdInputs,
 } from './interface';
 import { getProtocolString, getUrlProtocol } from './utils';

src/modules/apigw/interface.ts

@@ -286,3 +286,21 @@ export interface ApiAppCreateOptions {
   name: string;
   description?: string;
 }
+
+export interface ApiAppItem {
+  ApiAppName: string;
+  ApiAppId: string;
+  ApiAppKey: string;
+  ApiAppSecret: string;
+  CreatedTime: string;
+  ModifiedTime: string;
+  ApiAppDesc: string;
+}
+
+export interface ApiAppDetail {
+  id: string;
+  name: string;
+  key: string;
+  secret: string;
+  description: string;
+}