fix(apigw): optimize remove apigw (#205)

* fix(apigw): optimize remove apigw

* test(metrics): change time range

Author: yugasun

__tests__/apigw.test.ts

@@ -618,8 +618,8 @@ describe('apigw', () => {
     await apigw.remove(outputsWithId);
     const detail = await apigw.service.getById(outputsWithId.serviceId);
     expect(detail).toBeDefined();
-    expect(detail.serviceName).toBe('serverless_unit_test');
-    expect(detail.serviceDesc).toBe('Created By Serverless');
+    expect(detail.ServiceName).toBe('serverless_unit_test');
+    expect(detail.ServiceDesc).toBe('Created By Serverless');
     const apiList = await apigw.api.getList(outputsWithId.serviceId);
     expect(apiList.length).toBe(0);
   });

__tests__/metrics.test.ts

@@ -1,5 +1,6 @@
 import moment from 'moment';
 import { Metrics } from '../src';
+import { getYestoday } from '../src/utils';
 
 describe('Metrics', () => {
   const credentials = {
@@ -10,8 +11,9 @@ describe('Metrics', () => {
     funcName: 'serverless-unit-test',
   });
 
-  const rangeStart = '2020-09-09 10:00:00';
-  const rangeEnd = '2020-09-09 11:00:00';
+  const yestoday = getYestoday();
+  const rangeStart = `${yestoday} 10:00:00`;
+  const rangeEnd = `${yestoday} 11:00:00`;
 
   test('should get metrics data', async () => {
     const res = await metrics.getDatas(rangeStart, rangeEnd, 0xfffffffffff);

src/modules/apigw/entities/service.ts

@@ -38,22 +38,16 @@ export default class ServiceEntity {
   }
 
   async getById(serviceId: string) {
-    const detail: Detail = await this.request({
-      Action: 'DescribeService',
-      ServiceId: serviceId,
-    });
-
-    const outputs = {
-      serviceId: detail.ServiceId,
-      serviceName: detail.ServiceName,
-      subDomain:
-        detail!.OuterSubDomain && detail!.InnerSubDomain
-          ? [detail!.OuterSubDomain, detail!.InnerSubDomain]
-          : detail!.OuterSubDomain || detail!.InnerSubDomain,
-      serviceDesc: detail.ServiceDesc,
-    };
+    try {
+      const detail: Detail = await this.request({
+        Action: 'DescribeService',
+        ServiceId: serviceId,
+      });
 
-    return outputs;
+      return detail;
+    } catch (e) {
+      return null;
+    }
   }
 
   /** 创建 API 网关服务 */
@@ -110,7 +104,7 @@ export default class ServiceEntity {
       serviceDesc = 'Created By Serverless Framework',
     } = serviceConf;
 
-    let detail: Detail;
+    let detail: Detail | null;
 
     let outputs: ApigwCreateOrUpdateServiceOutputs = {
       serviceId: serviceId,
@@ -123,10 +117,7 @@ export default class ServiceEntity {
     let exist = false;
 
     if (serviceId) {
-      detail = await this.request({
-        Action: 'DescribeService',
-        ServiceId: serviceId,
-      });
+      detail = await this.getById(serviceId);
       if (detail) {
         detail.InnerSubDomain = detail.InternalSubDomain;
         exist = true;

src/modules/apigw/index.ts

@@ -133,10 +133,7 @@ export default class Apigw {
     } = inputs;
 
     // check service exist
-    const detail = await this.request({
-      Action: 'DescribeService',
-      ServiceId: serviceId,
-    });
+    const detail = await this.service.getById(serviceId);
     if (!detail) {
       console.log(`Service ${serviceId} not exist`);
       return;
@@ -207,30 +204,36 @@ export default class Apigw {
     const endpoints = inputs.endpoints || [];
     const stateApiList = oldState.apiList || [];
 
-    const serviceDetail = await this.service.getById(serviceId);
-
-    const apiList: ApiEndpoint[] = await this.api.bulkDeploy({
-      apiList: endpoints,
-      stateList: stateApiList,
-      serviceId,
-      environment,
-    });
+    const detail = await this.service.getById(serviceId);
+    if (detail) {
+      const apiList: ApiEndpoint[] = await this.api.bulkDeploy({
+        apiList: endpoints,
+        stateList: stateApiList,
+        serviceId,
+        environment,
+      });
 
-    await this.service.release({ serviceId, environment });
+      await this.service.release({ serviceId, environment });
 
-    console.log(`Deploy service ${serviceId} success`);
+      console.log(`Deploy service ${serviceId} success`);
 
-    const outputs: ApigwDeployOutputs = {
-      created: false,
-      serviceId,
-      serviceName: serviceDetail.serviceName,
-      subDomain: serviceDetail.subDomain,
-      protocols: inputs.protocols,
-      environment: environment,
-      apiList,
-    };
+      const subDomain =
+        detail!.OuterSubDomain && detail!.InnerSubDomain
+          ? [detail!.OuterSubDomain, detail!.InnerSubDomain]
+          : detail!.OuterSubDomain || detail!.InnerSubDomain;
 
-    return outputs;
+      const outputs: ApigwDeployOutputs = {
+        created: false,
+        serviceId,
+        serviceName: detail.ServiceName,
+        subDomain: subDomain,
+        protocols: inputs.protocols,
+        environment: environment,
+        apiList,
+      };
+
+      return outputs;
+    }
   }
 }
 

src/modules/metrics/formatter/formatCustomMetrics.ts

@@ -82,7 +82,7 @@ export function formatCustomMetrics(resList: MetricsResponseList) {
     };
   });
 
-  if (requestDatas) {
+  if (requestDatas && requestDatas.length > 0) {
     for (const latencyDetail of latencyDetailList) {
       if (!latency.y) {
         latency.y = [];

src/modules/metrics/index.ts

@@ -157,6 +157,8 @@ export default class Metrics {
       throw new ApiTypeError(`PARAMETER_METRICS`, 'The rangeStart provided is after the rangeEnd');
     }
 
+    console.log(`Getting metrics data from ${startTimeStr} to ${endTimeStr}`);
+
     // custom metrics maximum 8 day
     if (startTime.diff(endTime, 'days') >= 8) {
       throw new ApiTypeError(

src/utils/index.ts

@@ -230,3 +230,20 @@ export function traverseDirSync(
   }
   return ls;
 }
+
+export function getToday(date?: Date) {
+  if (!date) {
+    date = new Date();
+  }
+  const year = date.getFullYear();
+  const month = date.getMonth() + 1;
+  const day = date.getDate();
+
+  return `${year}-${month < 10 ? '0' : ''}${month}-${day}`;
+}
+
+export function getYestoday() {
+  const timestamp = Date.now() - 24 * 60 * 60 * 1000;
+  const yestoday = getToday(new Date(timestamp));
+  return yestoday;
+}