fix(faas): get alias bug

yugasun · yugasun · commit 87692267a160 · 2021-07-22T15:59:53.000+08:00
diff --git a/packages/capi/src/factory.ts b/packages/capi/src/factory.ts
@@ -132,7 +132,7 @@ export function ApiFactory<ACTIONS_T extends readonly string[]>({
           return customHandler(action, res);
         }
         const { Response } = res;
-        if (Response && Response.Error && Response.Error.Code) {
+        if (Response?.Error?.Code) {
           if (errorHandler) {
             return errorHandler(action, Response);
           }
diff --git a/packages/faas/__tests__/index.test.ts b/packages/faas/__tests__/index.test.ts
@@ -20,168 +20,206 @@ describe('FaaS', () => {
     region,
   });
 
-  test('getRegion', async () => {
-    const region = faas.getRegion();
+  describe('base methods', () => {
+    test('getRegion', async () => {
+      const region = faas.getRegion();
 
-    expect(region).toBe(region);
-  });
-
-  test('setRegion', async () => {
-    faas.setRegion('ap-shanghai');
-
-    expect(faas.getRegion()).toBe('ap-shanghai');
+      expect(region).toBe(region);
+    });
 
-    // 还原为 ap-guangzhou
-    faas.setRegion(region);
-  });
+    test('setRegion', async () => {
+      faas.setRegion('ap-shanghai');
 
-  test('getNamespaces', async () => {
-    const res = await faas.getNamespaces();
-    expect(Array.isArray(res)).toBe(true);
-  });
+      expect(faas.getRegion()).toBe('ap-shanghai');
 
-  test('getVersions', async () => {
-    const res = await faas.getVersions({
-      ...faasConfig,
+      // 还原为 ap-guangzhou
+      faas.setRegion(region);
     });
 
-    expect(Array.isArray(res)).toBe(true);
-  });
-
-  test('invoke', async () => {
-    const res = (await faas.invoke({
-      ...faasConfig,
-    })) as InvokeResult;
-
-    expect(res).toEqual({
-      billDuration: expect.any(Number),
-      duration: expect.any(Number),
-      errMsg: expect.any(String),
-      memUsage: expect.any(Number),
-      functionRequestId: expect.any(String),
-      invokeResult: expect.any(Number),
-      log: expect.any(String),
-      retMsg: expect.any(String),
+    test('getNamespaces', async () => {
+      const res = await faas.getNamespaces();
+      expect(Array.isArray(res)).toBe(true);
     });
 
-    reqId = res.functionRequestId;
-  });
-  test('invoke with wrong region', async () => {
-    try {
-      faas.setRegion('ap-test');
-      await faas.invoke({
+    test('getVersions', async () => {
+      const res = await faas.getVersions({
         ...faasConfig,
       });
-    } catch (e) {
-      expect(e.code).toBe('1001');
-    }
-    faas.setRegion(region);
+
+      expect(Array.isArray(res)).toBe(true);
+    });
   });
-  test('invoke with wrong namespace', async () => {
-    try {
-      await faas.invoke({
+
+  describe('invoke', () => {
+    test('invoke', async () => {
+      const res = (await faas.invoke({
         ...faasConfig,
-        namespace: 'not_exist_namespace',
+      })) as InvokeResult;
+
+      expect(res).toEqual({
+        billDuration: expect.any(Number),
+        duration: expect.any(Number),
+        errMsg: expect.any(String),
+        memUsage: expect.any(Number),
+        functionRequestId: expect.any(String),
+        invokeResult: expect.any(Number),
+        log: expect.any(String),
+        retMsg: expect.any(String),
       });
-    } catch (e) {
-      expect(e.code).toBe('1005');
-    }
-  });
-  test('invoke with wrong qualifier', async () => {
-    try {
-      await faas.invoke({
+
+      reqId = res.functionRequestId;
+    });
+
+    test('invoke with qualifier $DEFAULT', async () => {
+      const res = (await faas.invoke({
         ...faasConfig,
-        qualifier: 'not_exist_qualifier',
+        qualifier: '$DEFAULT',
+      })) as InvokeResult;
+
+      expect(res).toEqual({
+        billDuration: expect.any(Number),
+        duration: expect.any(Number),
+        errMsg: expect.any(String),
+        memUsage: expect.any(Number),
+        functionRequestId: expect.any(String),
+        invokeResult: expect.any(Number),
+        log: expect.any(String),
+        retMsg: expect.any(String),
       });
-    } catch (e) {
-      expect(e.code).toBe('1006');
-    }
-  });
+    });
 
-  test('getClsConfig', async () => {
-    const res = await faas.getClsConfig({
-      ...faasConfig,
+    test('invoke with wrong qualifier', async () => {
+      try {
+        await faas.invoke({
+          ...faasConfig,
+          qualifier: 'wrong_qualifier',
+        });
+      } catch (e) {
+        expect(e.code).toBe('1006');
+      }
     });
 
-    expect(res).toEqual(clsConfig);
+    test('invoke with wrong region', async () => {
+      try {
+        faas.setRegion('ap-test');
+        await faas.invoke({
+          ...faasConfig,
+        });
+      } catch (e) {
+        expect(e.code).toBe('1001');
+      }
+      faas.setRegion(region);
+    });
+    test('invoke with wrong namespace', async () => {
+      try {
+        await faas.invoke({
+          ...faasConfig,
+          namespace: 'not_exist_namespace',
+        });
+      } catch (e) {
+        expect(e.code).toBe('1005');
+      }
+    });
+    test('invoke with wrong qualifier', async () => {
+      try {
+        await faas.invoke({
+          ...faasConfig,
+          qualifier: 'not_exist_qualifier',
+        });
+      } catch (e) {
+        expect(e.code).toBe('1006');
+      }
+    });
   });
 
-  test('getLogList', async () => {
-    const res = await faas.getLogList({
-      ...faasConfig,
+  describe('log', () => {
+    test('getClsConfig', async () => {
+      const res = await faas.getClsConfig({
+        ...faasConfig,
+      });
+
+      expect(res).toEqual(clsConfig);
     });
 
-    if (res[0]) {
-      reqId = res[0]!.requestId;
-    }
-    expect(res).toBeInstanceOf(Array);
-  });
+    test('getLogList', async () => {
+      const res = await faas.getLogList({
+        ...faasConfig,
+      });
 
-  test('getLogDetail', async () => {
-    const res = await faas.getLogDetail({
-      ...faasConfig,
-      ...clsConfig,
-      reqId,
+      if (res[0]) {
+        reqId = res[0]!.requestId;
+      }
+      expect(res).toBeInstanceOf(Array);
     });
-    expect(res).toBeInstanceOf(Array);
-  });
-  test('getLogByReqId', async () => {
-    const res = await faas.getLogByReqId({
-      ...faasConfig,
-      reqId,
+
+    test('getLogDetail', async () => {
+      const res = await faas.getLogDetail({
+        ...faasConfig,
+        ...clsConfig,
+        reqId,
+      });
+      expect(res).toBeInstanceOf(Array);
     });
+    test('getLogByReqId', async () => {
+      const res = await faas.getLogByReqId({
+        ...faasConfig,
+        reqId,
+      });
 
-    expect(res).toEqual({
-      requestId: reqId,
-      retryNum: 0,
-      startTime: expect.any(String),
-      memoryUsage: expect.any(String),
-      duration: expect.any(String),
-      message: expect.any(String),
-      isCompleted: expect.any(Boolean),
+      expect(res).toEqual({
+        requestId: reqId,
+        retryNum: 0,
+        startTime: expect.any(String),
+        memoryUsage: expect.any(String),
+        duration: expect.any(String),
+        message: expect.any(String),
+        isCompleted: expect.any(Boolean),
+      });
     });
   });
 
-  test('getMetric', async () => {
-    const res = await faas.getMetric({
-      ...faasConfig,
-      metric: 'Invocation',
-      isRaw: false,
+  describe('metric', () => {
+    test('getMetric', async () => {
+      const res = await faas.getMetric({
+        ...faasConfig,
+        metric: 'Invocation',
+        isRaw: false,
+      });
+      expect(res).toBeInstanceOf(Array);
+      if (res.length > 0) {
+        expect(res).toEqual(
+          expect.arrayContaining([
+            {
+              time: expect.any(String),
+              value: expect.any(Number),
+              timestamp: expect.any(Number),
+            },
+          ]),
+        );
+      }
     });
-    expect(res).toBeInstanceOf(Array);
-    if (res.length > 0) {
-      expect(res).toEqual(
-        expect.arrayContaining([
+
+    test('[isRaw = true] getMetric', async () => {
+      const res = await faas.getMetric({
+        ...faasConfig,
+        metric: 'Invocation',
+        isRaw: true,
+      });
+
+      expect(res).toEqual({
+        StartTime: expect.any(String),
+        EndTime: expect.any(String),
+        MetricName: expect.any(String),
+        Period: expect.any(Number),
+        DataPoints: expect.arrayContaining([
           {
-            time: expect.any(String),
-            value: expect.any(Number),
-            timestamp: expect.any(Number),
+            Dimensions: expect.any(Array),
+            Timestamps: expect.any(Array),
+            Values: expect.any(Array),
           },
         ]),
-      );
-    }
-  });
-
-  test('[isRaw = true] getMetric', async () => {
-    const res = await faas.getMetric({
-      ...faasConfig,
-      metric: 'Invocation',
-      isRaw: true,
-    });
-
-    expect(res).toEqual({
-      StartTime: expect.any(String),
-      EndTime: expect.any(String),
-      MetricName: expect.any(String),
-      Period: expect.any(Number),
-      DataPoints: expect.arrayContaining([
-        {
-          Dimensions: expect.any(Array),
-          Timestamps: expect.any(Array),
-          Values: expect.any(Array),
-        },
-      ]),
-      RequestId: expect.stringMatching(/.{36}/g),
+        RequestId: expect.stringMatching(/.{36}/g),
+      });
     });
   });
 });
diff --git a/packages/faas/src/apis.ts b/packages/faas/src/apis.ts
@@ -18,6 +18,7 @@ const ACTIONS = [
   'ListTriggers',
   'ListNamespaces',
   'ListVersionByFunction',
+  'ListAliases',
 ] as const;
 
 export type ActionType = typeof ACTIONS[number];
@@ -37,6 +38,9 @@ function initializeApis({
     serviceType: ServiceType.faas,
     version: '2018-04-16',
     actions: ACTIONS,
+    errorHandler: (e) => {
+      console.log(e);
+    },
   });
 }
 
diff --git a/packages/faas/src/constants.ts b/packages/faas/src/constants.ts
@@ -32,7 +32,7 @@ const ERRORS = {
   QUALIFIER_NOT_EXIST_ERROR: {
     type: 'API_FAAS_qualifier',
     code: `1006`,
-    message: '[FAAS] 未找到指定的 qualifier',
+    message: '[FAAS] 未找到指定的 qualifier (版本或者别名)',
   },
 };
 
diff --git a/packages/faas/src/index.ts b/packages/faas/src/index.ts
diff --git a/packages/faas/src/typings/index.ts b/packages/faas/src/typings/index.ts

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ export function ApiFactory<ACTIONS_T extends readonly string[]>({`
`132`	`132`	`return customHandler(action, res);`
`133`	`133`	`}`
`134`	`134`	`const { Response } = res;`
`135`		`- if (Response && Response.Error && Response.Error.Code) {`
	`135`	`+ if (Response?.Error?.Code) {`
`136`	`136`	`if (errorHandler) {`
`137`	`137`	`return errorHandler(action, Response);`
`138`	`138`	`}`