fix: make cos error convert more robust, fix trigger base (#186)

* fix: make cos error convert more robust

* fix: add back the token in trigger base

Author: wwwzbwcom

__tests__/cos.test.ts

@@ -70,6 +70,16 @@ describe('Cos', () => {
   };
   const cos = new Cos(credentials, process.env.REGION);
 
+  test('should deploy Cos fail', async () => {
+    try {
+      const res = await cos.deploy({ ...inputs, bucket: '1234567890' });
+      expect(res).toBe(undefined);
+    } catch (err) {
+      console.log(err);
+      expect(err.code).toBe('Error');
+    }
+  });
+
   test('should deploy Cos success', async () => {
     const res = await cos.deploy(inputs);
     await sleep(1000);

src/modules/cos/index.ts

@@ -35,21 +35,26 @@ import fs from 'fs';
 import { traverseDirSync } from '../../utils';
 import { ApiTypeError, ApiError } from '../../utils/error';
 
-/** 将 Cos error 转为统一的形式 */
-function convertCosError(err: {
-  error: {
-    Code: string;
-    Message: string;
-    Stack: string;
-    RequestId: string;
+interface CosError {
+  error?: {
+    Code?: string;
+    Message?: string;
+    Stack?: string;
+    RequestId?: string;
   };
-  stack: string;
-}) {
+  code?: string;
+  message?: string;
+  stack?: string;
+  requestId?: string;
+}
+
+/** 将 Cos error 转为统一的形式 */
+function convertCosError(err: CosError) {
   const e = {
-    code: err.error.Code,
-    message: err.error.Message,
-    stack: err.stack ?? err.error.Stack,
-    reqId: err.error.RequestId,
+    code: err?.error?.Code ?? err.code!,
+    message: err?.error?.Message ?? err.message!,
+    stack: err?.stack ?? err?.error?.Stack!,
+    reqId: err?.error?.RequestId ?? err.requestId!,
   };
   return e;
 }

src/modules/triggers/base.ts

@@ -27,6 +27,7 @@ export default abstract class BaseTrigger<P = TriggerInputsParams> {
         ServiceType: serviceType,
         SecretId: credentials.SecretId!,
         SecretKey: credentials.SecretKey!,
+        Token: credentials.Token,
       });
     }
   }