fix: optimize code

Author: yugasun

src/index.js

@@ -12,6 +12,7 @@ const Vpc = require('./modules/vpc');
 const Cam = require('./modules/cam');
 const Metrics = require('./modules/metrics');
 const Layer = require('./modules/layer');
+const Cfs = require('./modules/cfs');
 
 module.exports = {
   Apigw,
@@ -28,4 +29,5 @@ module.exports = {
   Cam,
   Metrics,
   Layer,
+  Cfs,
 };

src/modules/cfs/index.js

@@ -6,7 +6,7 @@ class CFS {
     this.region = region || 'ap-guangzhou';
     this.credentials = credentials;
     this.capi = new Capi({
-      Region: region,
+      Region: this.region,
       SecretId: credentials.SecretId,
       SecretKey: credentials.SecretKey,
       Token: credentials.Token,

src/modules/layer/apis/index.js

@@ -21,7 +21,7 @@ const utils = {
       });
       return res;
     } catch (e) {
-      return {};
+      return null;
     }
   },
 

src/modules/layer/index.js

@@ -7,7 +7,7 @@ class Layer {
     this.region = region || 'ap-guangzhou';
     this.credentials = credentials;
     this.capi = new Capi({
-      Region: region,
+      Region: this.region,
       SecretId: credentials.SecretId,
       SecretKey: credentials.SecretKey,
       Token: credentials.Token,
@@ -67,7 +67,7 @@ class Layer {
       console.log(e);
     }
 
-    return {};
+    return true;
   }
 }
 

src/modules/postgresql/index.js

@@ -13,7 +13,7 @@ class Postgresql {
     this.region = region || 'ap-guangzhou';
     this.credentials = credentials;
     this.capi = new Capi({
-      Region: region,
+      Region: this.region,
       AppId: this.credentials.AppId,
       SecretId: this.credentials.SecretId,
       SecretKey: this.credentials.SecretKey,
@@ -74,11 +74,11 @@ class Postgresql {
         postgresInputs.SubnetId = vpcConfig.subnetId;
       }
       dbDetail = await createDbInstance(this.capi, postgresInputs);
-      outputs.dBInstanceId = dbDetail.DBInstanceId;
       if (extranetAccess) {
         dbDetail = await toggleDbInstanceAccess(this.capi, dBInstanceName, extranetAccess);
       }
     }
+    outputs.dBInstanceId = dbDetail.DBInstanceId;
 
     const {
       DBInstanceNetInfo,

src/modules/scf/index.js

@@ -394,22 +394,21 @@ class Scf {
     let funcInfo = await this.getFunction(namespace, inputs.name);
     if (!funcInfo) {
       await this.createFunction(inputs);
-      funcInfo = await this.getFunction(namespace, inputs.name);
     } else {
       await this.updateFunctionCode(inputs, funcInfo);
 
       // should check function status is active, then continue
       await this.isOperationalStatus(namespace, inputs.name);
 
       await this.updatefunctionConfigure(inputs, funcInfo);
-
-      // after updating function, get latest function info
-      funcInfo = await this.getFunction(namespace, inputs.name);
     }
 
     // should check function status is active, then continue
     await this.isOperationalStatus(namespace, inputs.name);
 
+    // after create/update function, get latest function info
+    funcInfo = await this.getFunction(namespace, inputs.name);
+
     const outputs = funcInfo;
     if (inputs.publish) {
       const { FunctionVersion } = await this.publishVersion({
@@ -506,6 +505,10 @@ class Scf {
 
     await this.deleteFunction(namespace, functionName);
 
+    try {
+      await this.isOperationalStatus(namespace, functionName);
+    } catch (e) {}
+
     if (inputs.Triggers) {
       for (let i = 0; i < inputs.Triggers.length; i++) {
         if (inputs.Triggers[i].serviceId) {
@@ -521,6 +524,8 @@ class Scf {
     }
 
     console.log(`Remove function ${functionName} and it's triggers success`);
+
+    return true;
   }
 
   async invoke(inputs = {}) {

src/modules/tag/apis.js

@@ -1,6 +1,6 @@
 const { ApiFactory } = require('../../utils/api');
 
-const ACTIONS = ['ModifyResourceTags'];
+const ACTIONS = ['ModifyResourceTags', 'DescribeResourceTags'];
 
 const APIS = ApiFactory({
   // debug: true,

src/modules/tag/index.js

@@ -1,6 +1,5 @@
 const { Capi } = require('@tencent-sdk/capi');
 const Apis = require('./apis');
-const { camelCaseProperty } = require('../../utils/index');
 
 class Tag {
   constructor(credentials = {}, region = 'ap-guangzhou') {
@@ -16,18 +15,19 @@ class Tag {
   }
 
   async request({ Action, ...data }) {
-    const result = await Apis[Action](this.capi, camelCaseProperty(data));
+    const result = await Apis[Action](this.capi, data);
     return result;
   }
 
-  async addArray(body, tags, key) {
-    let index = 0;
-    for (const item in tags) {
-      body[`${key}.${index}.TagKey`] = item;
-      body[`${key}.${index}.TagValue`] = tags[item];
-      index++;
-    }
-    return body;
+  async getScfResourceTags(inputs) {
+    const data = {
+      Action: 'DescribeResourceTags',
+      ResourcePrefix: 'namespace',
+      ResourceId: `${inputs.namespace || 'default'}/function/${inputs.functionName}`,
+    };
+
+    const { Rows } = await this.request(data);
+    return Rows;
   }
 
   async deploy(inputs = {}) {
@@ -45,9 +45,8 @@ class Tag {
       }));
     }
     if (Object.keys(deleteTags).length > 0) {
-      tagsInputs.DeleteTags = Object.entries(deleteTags).map(([key, val]) => ({
+      tagsInputs.DeleteTags = Object.keys(deleteTags).map((key) => ({
         TagKey: key,
-        TagValue: val,
       }));
     }
 

src/modules/vpc/index.js

@@ -7,7 +7,7 @@ class Vpc {
     this.region = region || 'ap-guangzhou';
     this.credentials = credentials;
     this.capi = new Capi({
-      Region: region,
+      Region: this.region,
       AppId: credentials.AppId,
       SecretId: credentials.SecretId,
       SecretKey: credentials.SecretKey,