fix(scf): add namespace test

Author: yugasun

__tests__/scf.test.ts

@@ -82,6 +82,7 @@ describe('Scf', () => {
       bucket: process.env.BUCKET,
       object: 'express_code.zip',
     },
+    namespace: 'test',
     role: 'SCF_QcsRole',
     handler: 'sl_handler.handler',
     runtime: 'Nodejs12.16',
@@ -161,7 +162,7 @@ describe('Scf', () => {
       Qualifier: '$LATEST',
       Description: 'Created by Serverless Framework',
       Timeout: inputs.timeout,
-      InitTimeout: 0,
+      InitTimeout: expect.any(Number),
       MemorySize: inputs.memorySize,
       Runtime: inputs.runtime,
       VpcConfig: { VpcId: vpcConfig.vpcId, SubnetId: vpcConfig.subnetId },
@@ -182,7 +183,7 @@ describe('Scf', () => {
       CodeSize: 0,
       FunctionVersion: '$LATEST',
       FunctionName: inputs.name,
-      Namespace: 'default',
+      Namespace: 'test',
       InstallDependency: 'FALSE',
       Status: 'Active',
       // Status: expect.any(String),
@@ -325,8 +326,180 @@ describe('Scf', () => {
       // },
     ]);
   });
+  test('should update SCF success', async () => {
+    await sleep(3000);
+    outputs = await scf.deploy(inputs);
+    expect(outputs).toEqual({
+      Qualifier: '$LATEST',
+      Description: 'Created by Serverless Framework',
+      Timeout: inputs.timeout,
+      InitTimeout: expect.any(Number),
+      MemorySize: inputs.memorySize,
+      Runtime: inputs.runtime,
+      VpcConfig: { VpcId: vpcConfig.vpcId, SubnetId: vpcConfig.subnetId },
+      Environment: {
+        Variables: [
+          {
+            Key: 'TEST',
+            Value: 'value',
+          },
+        ],
+      },
+      Handler: inputs.handler,
+      AsyncRunEnable: 'FALSE',
+      LogType: expect.any(String),
+      TraceEnable: 'FALSE',
+      UseGpu: 'FALSE',
+      Role: inputs.role,
+      CodeSize: 0,
+      FunctionVersion: '$LATEST',
+      FunctionName: inputs.name,
+      Namespace: 'test',
+      InstallDependency: 'FALSE',
+      Status: 'Active',
+      // Status: expect.any(String),
+      AvailableStatus: 'Available',
+      StatusDesc: expect.any(String),
+      FunctionId: expect.stringContaining('lam-'),
+      L5Enable: 'FALSE',
+      EipConfig: { EipFixed: 'TRUE', Eips: expect.any(Array) },
+      ModTime: expect.any(String),
+      AddTime: expect.any(String),
+      Layers: [
+        {
+          LayerName: layerInputs.name,
+          LayerVersion: expect.any(Number),
+          CompatibleRuntimes: layerInputs.runtimes,
+          Description: layerInputs.description,
+          LicenseInfo: '',
+          AddTime: expect.any(String),
+          Status: 'Active',
+          Src: 'Default',
+        },
+      ],
+      DeadLetterConfig: { Type: '', Name: '', FilterType: '' },
+      OnsEnable: 'FALSE',
+      PublicNetConfig: {
+        PublicNetStatus: 'ENABLE',
+        EipConfig: { EipStatus: 'ENABLE', EipAddress: expect.any(Array) },
+      },
+      Triggers: expect.any(Array),
+      ClsLogsetId: expect.any(String),
+      ClsTopicId: expect.any(String),
+      CodeInfo: '',
+      CodeResult: 'success',
+      CodeError: '',
+      ErrNo: 0,
+      Tags: [
+        {
+          Key: 'test',
+          Value: 'test',
+        },
+      ],
+      AccessInfo: { Host: '', Vip: '' },
+      Type: 'Event',
+      CfsConfig: {
+        CfsInsList: [
+          {
+            UserId: '10000',
+            UserGroupId: '10000',
+            CfsId: inputs.cfs[0].cfsId,
+            MountInsId: inputs.cfs[0].cfsId,
+            LocalMountDir: inputs.cfs[0].localMountDir,
+            RemoteMountDir: inputs.cfs[0].remoteMountDir,
+            IpAddress: expect.any(String),
+            MountVpcId: inputs.vpcConfig.vpcId,
+            MountSubnetId: inputs.vpcConfig.subnetId,
+          },
+        ],
+      },
+      StatusReasons: [],
+      RequestId: expect.any(String),
+      LastVersion: '2',
+      Traffic: inputs.traffic,
+      ConfigTrafficVersion: '2',
+    });
+
+    // expect triggers result
+    expect(outputs.Triggers).toEqual([
+      {
+        NeedCreate: expect.any(Boolean),
+        created: true,
+        serviceId: expect.stringContaining('service-'),
+        serviceName: 'serverless_test',
+        subDomain: expect.stringContaining('.apigw.tencentcs.com'),
+        protocols: 'http',
+        environment: 'release',
+        apiList: [
+          {
+            path: '/',
+            internalDomain: expect.any(String),
+            method: 'GET',
+            apiName: 'index',
+            apiId: expect.stringContaining('api-'),
+            created: true,
+            authType: 'NONE',
+            businessType: 'NORMAL',
+            isBase64Encoded: false,
+          },
+        ],
+      },
+      {
+        NeedCreate: expect.any(Boolean),
+        AddTime: expect.any(String),
+        AvailableStatus: expect.any(String),
+        CustomArgument: triggers.timer.timer.parameters.argument,
+        Enable: 1,
+        ModTime: expect.any(String),
+        TriggerDesc: `{"cron":"${triggers.timer.timer.parameters.cronExpression}"}`,
+        TriggerName: triggers.timer.timer.name,
+        Type: 'timer',
+        BindStatus: expect.any(String),
+        ResourceId: expect.any(String),
+        TriggerAttribute: expect.any(String),
+        Qualifier: expect.any(String),
+      },
+      {
+        NeedCreate: expect.any(Boolean),
+        AddTime: expect.any(String),
+        AvailableStatus: expect.any(String),
+        CustomArgument: expect.any(String),
+        Enable: 1,
+        ModTime: expect.any(String),
+        TriggerDesc: `{"bucketUrl":"${triggers.cos.cos.parameters.bucket}","event":"${triggers.cos.cos.parameters.events}","filter":{"Prefix":"${triggers.cos.cos.parameters.filter.prefix}","Suffix":"${triggers.cos.cos.parameters.filter.suffix}"}}`,
+        TriggerName: expect.stringContaining('cos'),
+        Type: 'cos',
+        BindStatus: expect.any(String),
+        ResourceId: expect.any(String),
+        TriggerAttribute: expect.any(String),
+        Qualifier: expect.any(String),
+      },
+      {
+        NeedCreate: expect.any(Boolean),
+        enable: triggers.cls.cls.parameters.enable,
+        namespace: inputs.namespace || 'default',
+        functionName: inputs.name,
+        maxSize: triggers.cls.cls.parameters.maxSize,
+        maxWait: triggers.cls.cls.parameters.maxWait,
+        qualifier: triggers.cls.cls.parameters.qualifier,
+        topicId: triggers.cls.cls.parameters.topicId,
+        Qualifier: expect.any(String),
+      },
+      // {
+      //   enable: triggers.mps.mps.parameters.enable,
+      //   namespace: inputs.namespace || 'default',
+      //   functionName: inputs.name,
+      //   qualifier: triggers.mps.mps.parameters.qualifier,
+      //   type: triggers.mps.mps.parameters.type,
+      //   resourceId: expect.stringContaining(
+      //     `TriggerType/${triggers.mps.mps.parameters.type}Event`,
+      //   ),
+      // },
+    ]);
+  });
   test('should invoke Scf success', async () => {
     const res = await scf.invoke({
+      namespace: inputs.namespace,
       functionName: inputs.name,
     });
     expect(res).toEqual({

src/modules/apigw/entities/custom-domain.ts

@@ -172,7 +172,6 @@ export default class CustomDomainEntity {
     subDomain: string;
     inputs: ApigwBindCustomDomainInputs;
   }): Promise<ApigwBindCustomDomainOutputs[]> {
-    console.log(`Binding custom domain for service ${serviceId}`);
     const { customDomains = [] } = inputs;
     const { oldState = {} } = inputs;
 

src/modules/scf/index.ts

@@ -664,6 +664,7 @@ export default class Scf {
       inputs.traffic != null && inputs.lastVersion && inputs.lastVersion !== '$LATEST';
     if (needSetTraffic) {
       await this.updateAliasTraffic({
+        namespace,
         functionName: funcInfo.FunctionName,
         region: this.region,
         traffic: inputs.traffic!,