fix(scf): optimize function name error message (#223)

* fix(scf): optimize function name error message

* test: fix case

* test: fix layer parameter compare

Author: yugasun

__tests__/cls.test.ts

@@ -75,7 +75,6 @@ describe('Cls', () => {
       topicId: 'e9e38c86-c7ba-475b-a852-6305880d2212',
       interval: 3600,
     });
-    console.log('logs', res);
     expect(res).toBeInstanceOf(Array);
   });
 });

__tests__/scf.sp.test.ts

@@ -2,7 +2,7 @@ import { ScfDeployInputs } from '../src/modules/scf/interface';
 import { sleep } from '@ygkit/request';
 import { Scf } from '../src';
 
-describe('Scf - singapore', () => {
+describe('Scf - special', () => {
   const credentials = {
     SecretId: process.env.TENCENT_SECRET_ID,
     SecretKey: process.env.TENCENT_SECRET_KEY,

__tests__/scf.test.ts

@@ -190,18 +190,11 @@ describe('Scf', () => {
     expect(outputs.AsyncRunEnable).toBe('FALSE');
     expect(outputs.Status).toBe('Active');
     expect(outputs.EipConfig).toEqual({ EipFixed: 'TRUE', Eips: expect.any(Array) });
-    expect(outputs.Layers).toEqual([
-      {
-        LayerName: layerInputs.name,
-        LayerVersion: expect.any(Number),
-        CompatibleRuntimes: layerInputs.runtimes,
-        Description: layerInputs.description,
-        LicenseInfo: '',
-        AddTime: expect.any(String),
-        Status: 'Active',
-        Src: 'Default',
-      },
-    ]);
+
+    expect(outputs.Layers[0].LayerName).toBe(layerInputs.name);
+    expect(outputs.Layers[0].CompatibleRuntimes).toEqual(layerInputs.runtimes);
+    expect(outputs.Layers[0].Description).toBe(layerInputs.description);
+
     expect(outputs.PublicNetConfig).toEqual({
       PublicNetStatus: 'ENABLE',
       EipConfig: { EipStatus: 'ENABLE', EipAddress: expect.any(Array) },
@@ -348,18 +341,11 @@ describe('Scf', () => {
     expect(outputs.AsyncRunEnable).toBe('FALSE');
     expect(outputs.Status).toBe('Active');
     expect(outputs.EipConfig).toEqual({ EipFixed: 'TRUE', Eips: expect.any(Array) });
-    expect(outputs.Layers).toEqual([
-      {
-        LayerName: layerInputs.name,
-        LayerVersion: expect.any(Number),
-        CompatibleRuntimes: layerInputs.runtimes,
-        Description: layerInputs.description,
-        LicenseInfo: '',
-        AddTime: expect.any(String),
-        Status: 'Active',
-        Src: 'Default',
-      },
-    ]);
+
+    expect(outputs.Layers[0].LayerName).toBe(layerInputs.name);
+    expect(outputs.Layers[0].CompatibleRuntimes).toEqual(layerInputs.runtimes);
+    expect(outputs.Layers[0].Description).toBe(layerInputs.description);
+
     expect(outputs.PublicNetConfig).toEqual({
       PublicNetStatus: 'ENABLE',
       EipConfig: { EipStatus: 'ENABLE', EipAddress: expect.any(Array) },

src/modules/metrics/index.ts

@@ -73,7 +73,6 @@ export default class Metrics {
       throw new ApiError({
         type: 'API_METRICS_getScfMetrics',
         message: e.message,
-        stack: e.stack,
         reqId: e.reqId,
         code: e.code,
       });
@@ -105,7 +104,6 @@ export default class Metrics {
       throw new ApiError({
         type: 'API_METRICS_getApigwMetrics',
         message: e.message,
-        stack: e.stack,
         reqId: e.reqId,
         code: e.code,
       });
@@ -138,7 +136,6 @@ export default class Metrics {
       throw new ApiError({
         type: 'API_METRICS_getCustomMetrics',
         message: e.message,
-        stack: e.stack,
         reqId: e.reqId,
         code: e.code,
       });

src/modules/scf/entities/scf.ts

@@ -55,16 +55,25 @@ export default class ScfEntity extends BaseEntity {
       });
       return Response;
     } catch (e) {
-      if (e.code == 'ResourceNotFound.FunctionName' || e.code == 'ResourceNotFound.Function') {
+      if (e.code === 'ResourceNotFound.FunctionName' || e.code === 'ResourceNotFound.Function') {
         return null;
       }
-      throw new ApiError({
-        type: 'API_SCF_GetFunction',
-        message: e.message,
-        stack: e.stack,
-        reqId: e.reqId,
-        code: e.code,
-      });
+      if (e.code === 'InvalidParameterValue.FunctionName') {
+        throw new ApiError({
+          type: 'API_SCF_GetFunction',
+          message: `SCF 函数名称命名不符合规则。 只能包含字母、数字、下划线、连字符，以字母开头，以数字或字母结尾，2~60个字符`,
+          reqId: e.reqId,
+          code: e.code,
+          displayMsg: `SCF 函数名称命名不符合规则。 只能包含字母、数字、下划线、连字符，以字母开头，以数字或字母结尾，2~60个字符`,
+        });
+      } else {
+        throw new ApiError({
+          type: 'API_SCF_GetFunction',
+          message: e.message,
+          reqId: e.reqId,
+          code: e.code,
+        });
+      }
     }
   }