opentiny · h-ivy · May 6, 2023 · May 6, 2023 · May 6, 2023
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -15,7 +15,9 @@ module.exports = {
     project: 'tsconfig.json',
   },
   rules: {
-    // eslint规则
+    // 不必要的转义字符，设置为警告。
+    // 在正则表达式中，特殊字符加个转义字符可以增强可读性。比如 /[\*]/ 一眼看过去知道是只是匹配"*"这个字符的. 而/[*]/可能会让人误解为一个通配符。
+    'no-useless-escape': 1,
     'no-case-declarations': 'off',
     'no-fallthrough': 'off',
     'no-underscore-dangle': 'off',

diff --git a/packages/plugins/hwc/src/core/config/constants.ts b/packages/plugins/hwc/src/core/config/constants.ts
@@ -51,7 +51,6 @@ export const REG_FG_DEP_NAME = /^[a-zA-Z][\w|\-|.]{0,95}$/;
 // 大小写字母数字正则表达式
 export const REG_LETTER_NUMBER = /[a-zA-Z0-9]/;
 
-
 export const CONSTANTS = {
   TINY_PRO_DEFAULT_BIN,
   TINY_PRO_DEFAULT_HOME_FOLDER,
@@ -60,4 +59,3 @@ export const CONSTANTS = {
   TINY_PRO_DEFAULT_LOCAL_INFO_FILE,
   TINY_PRO_DEFAULT_HWC_EXPORTS,
 };
-
diff --git a/packages/plugins/hwc/src/core/hcloud-client/index.ts b/packages/plugins/hwc/src/core/hcloud-client/index.ts
@@ -161,12 +161,14 @@ class HCloudClient {
   // 期望返回的是一个Json时
   execJson(command: string) {
     return new Promise<any>((resolve) => {
-      this.exec(command).then((res) => {
-        res ? resolve(JSON.parse(res)) : resolve(res);
-      }).catch((res) => {
-        log.error(res);
-        process.exit(1);
-      });
+      this.exec(command)
+        .then((res) => {
+          res ? resolve(JSON.parse(res)) : resolve(res);
+        })
+        .catch((res) => {
+          log.error(res);
+          process.exit(1);
+        });
     });
   }
 

diff --git a/packages/plugins/hwc/src/core/utils/error-utils.ts b/packages/plugins/hwc/src/core/utils/error-utils.ts
@@ -3,10 +3,12 @@ type CommonError = {
 };
 
 export function isCommonError(error: unknown): error is CommonError {
-  return typeof error === 'object' &&
+  return (
+    typeof error === 'object' &&
     error !== null &&
     'message' in error &&
-    typeof (error as Record<string, unknown>).message === 'string';
+    typeof (error as Record<string, unknown>).message === 'string'
+  );
 }
 
 export class ErrorUtils {

diff --git a/packages/plugins/hwc/src/lib/configure/commands/index.ts b/packages/plugins/hwc/src/lib/configure/commands/index.ts
@@ -152,6 +152,8 @@ export const configure = async () => {
 
     log.success(configureMsg.cfgTermResultSuccessMsg);
   } catch (err) {
-    log.error(`${configureMsg.cfgTermResultErrMsg}：${ErrorUtils.getErrorMessage(err)}`);
+    log.error(
+      `${configureMsg.cfgTermResultErrMsg}：${ErrorUtils.getErrorMessage(err)}`
+    );
   }
 };
diff --git a/packages/plugins/hwc/src/lib/configure/services/configure.ts b/packages/plugins/hwc/src/lib/configure/services/configure.ts
@@ -24,7 +24,9 @@ export const writeAkSkFile = (
       JSON.stringify({ accessKeyId, secretAccessKey })
     );
   } catch (err) {
-    log.error(`${configureMsg.cfgTermWriteAkSkError}:${ErrorUtils.getErrorMessage(err)}`);
+    log.error(
+      `${configureMsg.cfgTermWriteAkSkError}:${ErrorUtils.getErrorMessage(err)}`
+    );
   }
 };
 
@@ -51,7 +53,9 @@ export const writeLocalHwcInfo = (akSkFilePath: string) => {
       })
     );
   } catch (err) {
-    log.error(`${configureMsg.cfgTermWriteHwcError}:${ErrorUtils.getErrorMessage(err)}`);
+    log.error(
+      `${configureMsg.cfgTermWriteHwcError}:${ErrorUtils.getErrorMessage(err)}`
+    );
   }
 };
 
@@ -73,6 +77,10 @@ export const addGitIgnore = () => {
       fs.writeFileSync(gitignorePath, content);
     }
   } catch (err) {
-    log.error(`${configureMsg.cfgTermAddGitIgnoreError}:${ErrorUtils.getErrorMessage(err)}`);
+    log.error(
+      `${configureMsg.cfgTermAddGitIgnoreError}:${ErrorUtils.getErrorMessage(
+        err
+      )}`
+    );
   }
 };
diff --git a/packages/plugins/hwc/src/lib/hwc-apig/commands/add.ts b/packages/plugins/hwc/src/lib/hwc-apig/commands/add.ts
@@ -64,6 +64,8 @@ export const addApig = async (instanceId?: string) => {
 
     setHwcExports('hwcConfig.apigList', apigList);
   } catch (err) {
-    log.error(`${apigMsg.apigTermGetApigListErrMsg}：${ErrorUtils.getErrorMessage(err)}`);
+    log.error(
+      `${apigMsg.apigTermGetApigListErrMsg}：${ErrorUtils.getErrorMessage(err)}`
+    );
   }
 };
diff --git a/packages/plugins/hwc/src/lib/hwc-apig/commands/group-add.ts b/packages/plugins/hwc/src/lib/hwc-apig/commands/group-add.ts
@@ -56,6 +56,10 @@ export const addApigGroups = async (instanceId?: string) => {
     setHwcExports('hwcConfig.apigGroupsList', groupsList);
     log.success(`${commandName}成功`);
   } catch (err) {
-    log.error(`${apigMsg.groupTermGetGroupListErrMsg}：${ErrorUtils.getErrorMessage(err)}`);
+    log.error(
+      `${apigMsg.groupTermGetGroupListErrMsg}：${ErrorUtils.getErrorMessage(
+        err
+      )}`
+    );
   }
 };
diff --git a/packages/plugins/hwc/src/lib/hwc-apig/commands/publish.ts b/packages/plugins/hwc/src/lib/hwc-apig/commands/publish.ts
@@ -63,11 +63,11 @@ export const publishApig = async (instanceId?: string) => {
         log.success(apigMsg.apigTermPublishSuccessMsg(apiName));
       }
     } else {
-      log.info(
-        chalk.magenta(commonMsg.commandAddNullMsg('API列表', 'apig'))
-      );
+      log.info(chalk.magenta(commonMsg.commandAddNullMsg('API列表', 'apig')));
     }
   } catch (err) {
-    log.error(`${apigMsg.apigTermPublishErrMsg}：${ErrorUtils.getErrorMessage(err)}`);
+    log.error(
+      `${apigMsg.apigTermPublishErrMsg}：${ErrorUtils.getErrorMessage(err)}`
+    );
   }
 };
diff --git a/packages/plugins/hwc/src/lib/hwc-apig/services/group-validate.ts b/packages/plugins/hwc/src/lib/hwc-apig/services/group-validate.ts
@@ -32,7 +32,8 @@ export class ApigGroupValidators extends ValidatorService {
     const groups = await getApigGroups(instanceId, regionId);
 
     for (const group of groups) {
-      for (const item of group?.url_domains) {
+      const url_domains = group?.url_domains || [];
+      for (const item of url_domains) {
         if (item.domain === domain) {
           return commonMsg.commonTermIsExist(
             apigMsg.groupTermDomainName,

diff --git a/packages/plugins/hwc/src/lib/hwc-eip/commands/add.ts b/packages/plugins/hwc/src/lib/hwc-eip/commands/add.ts
@@ -9,7 +9,7 @@ import {
   ErrorUtils,
 } from '../../../core';
 import { queryEipList } from '../services/eip-services';
-import { commonMsg } from "../../../assets/i18n";
+import { commonMsg } from '../../../assets/i18n';
 
 export const commandName = '同步弹性公网IP';
 
@@ -56,9 +56,7 @@ export const addEip = async () => {
         colWidths: [6, 20, 20, 20, 15],
       });
     } else {
-      log.info(
-        chalk.magenta(commonMsg.commandAddNullMsg('弹性公网IP', 'eip'))
-      );
+      log.info(chalk.magenta(commonMsg.commandAddNullMsg('弹性公网IP', 'eip')));
     }
     setHwcExports('hwcConfig.eipList', { publicips });
     log.success(`${commandName}成功`);

diff --git a/packages/plugins/hwc/src/lib/hwc-fg/commands/add.ts b/packages/plugins/hwc/src/lib/hwc-fg/commands/add.ts
@@ -9,7 +9,7 @@ import {
 } from '../../../core';
 import { commonMsg } from '../../../assets/i18n';
 import { queryFunctions } from '../services/fg-services';
-import { cliConfig as tinyStageCliConfig, logs } from "@opentiny/cli-devkit";
+import { cliConfig as tinyStageCliConfig, logs } from '@opentiny/cli-devkit';
 
 export const commandName = '同步线上函数工作流';
 

diff --git a/packages/plugins/hwc/src/lib/hwc-fg/commands/create.ts b/packages/plugins/hwc/src/lib/hwc-fg/commands/create.ts
@@ -1,6 +1,10 @@
 import { logs, cliConfig as tinyStageCliConfig } from '@opentiny/cli-devkit';
 import chalk from 'chalk';
-import { getCreateDBConfigQuestions, getCreateQuestions, getCreateRuntimeQuestions } from '../questions';
+import {
+  getCreateDBConfigQuestions,
+  getCreateQuestions,
+  getCreateRuntimeQuestions,
+} from '../questions';
 import { createFg, queryFunctions } from '../services/fg-services';
 import { createDBCfg } from './db-cfg-create';
 import {

diff --git a/packages/plugins/hwc/src/lib/hwc-fg/commands/db-cfg-create.ts b/packages/plugins/hwc/src/lib/hwc-fg/commands/db-cfg-create.ts
@@ -1,7 +1,19 @@
-import { cliConfig as tinyStageCliConfig, fs, logs } from '@opentiny/cli-devkit';
+import {
+  cliConfig as tinyStageCliConfig,
+  fs,
+  logs,
+} from '@opentiny/cli-devkit';
 import chalk from 'chalk';
-import { getDBCfgCreateQuestions, getDBListQuestions, getPasswordAndDirQuestions } from '../questions';
-import { databaseCreate, queryDatabaseLists, queryInstances,} from '../../hwc-mysql/services';
+import {
+  getDBCfgCreateQuestions,
+  getDBListQuestions,
+  getPasswordAndDirQuestions,
+} from '../questions';
+import {
+  databaseCreate,
+  queryDatabaseLists,
+  queryInstances,
+} from '../../hwc-mysql/services';
 import { databaseQuestions } from '../../hwc-mysql/questions';
 import {
   CONSTANTS,
@@ -76,7 +88,12 @@ export const createDBCfg = async () => {
   }
 };
 
-async function startCreateDBProcess(msg: string, instanceId: string, cliConfig, ans) {
+async function startCreateDBProcess(
+  msg: string,
+  instanceId: string,
+  cliConfig,
+  ans
+) {
   console.log(chalk.yellow(fmtDashTitle(msg)));
   const databaseQuest = await databaseQuestions();
   const databaseInfo = await inquirer.prompt(databaseQuest, {

diff --git a/packages/plugins/hwc/src/lib/hwc-fg/questions.ts b/packages/plugins/hwc/src/lib/hwc-fg/questions.ts
@@ -8,7 +8,12 @@ import {
   InstanceInfo,
 } from '../hwc.types';
 import { queryFunctions } from './services/fg-services';
-import { getTinyProConfigure, REG_FG_NAME, REG_FG_DEP_NAME, REG_LETTER_NUMBER } from '../../core';
+import {
+  getTinyProConfigure,
+  REG_FG_NAME,
+  REG_FG_DEP_NAME,
+  REG_LETTER_NUMBER,
+} from '../../core';
 
 export async function getCreateQuestions(fgRuntime) {
   const cliConfig = getTinyProConfigure();
@@ -175,7 +180,8 @@ export function getCreateDepQuestions(
         if (existDeps.find((dep) => dep.name === name)) {
           return '依赖包名称已存在，请重新输入';
         }
-        return REG_FG_DEP_NAME.test(name) && REG_LETTER_NUMBER.test(name.slice(-1))
+        return REG_FG_DEP_NAME.test(name) &&
+          REG_LETTER_NUMBER.test(name.slice(-1))
           ? true
           : '依赖包名称格式错误';
       },
@@ -232,7 +238,8 @@ export function getUpdateDepQuestions(
         ) {
           return '依赖包名称已存在，请重新输入';
         }
-        return REG_FG_DEP_NAME.test(name) && REG_LETTER_NUMBER.test(name.slice(-1))
+        return REG_FG_DEP_NAME.test(name) &&
+          REG_LETTER_NUMBER.test(name.slice(-1))
           ? true
           : '依赖包名称格式错误';
       },

diff --git a/packages/plugins/hwc/src/lib/hwc-obs/commands/add.ts b/packages/plugins/hwc/src/lib/hwc-obs/commands/add.ts
@@ -77,6 +77,8 @@ export const addObs = async () => {
     setHwcExports('hwcConfig.obs', { bucketsList });
     log.success(`${commandName}成功`);
   } catch (err) {
-    log.error(`${obsMsg.obsTermGetListErrMsg}：${ErrorUtils.getErrorMessage(err)}`);
+    log.error(
+      `${obsMsg.obsTermGetListErrMsg}：${ErrorUtils.getErrorMessage(err)}`
+    );
   }
 };
diff --git a/packages/plugins/hwc/src/lib/hwc-obs/commands/create.ts b/packages/plugins/hwc/src/lib/hwc-obs/commands/create.ts
@@ -56,6 +56,8 @@ export const createObs = async () => {
       setHwcExports('hwcConfig.obs', { bucketsList });
     }
   } catch (err) {
-    log.error(`${obsMsg.obsTermCreateErrMsg}：${ErrorUtils.getErrorMessage(err)}`);
+    log.error(
+      `${obsMsg.obsTermCreateErrMsg}：${ErrorUtils.getErrorMessage(err)}`
+    );
   }
 };
diff --git a/packages/plugins/hwc/src/lib/hwc-obs/obs-client.ts b/packages/plugins/hwc/src/lib/hwc-obs/obs-client.ts
@@ -10,7 +10,6 @@ export const createObsClient = (cliConfig: ITinyProConfig) => {
     secret_access_key: cliConfig.secretAccessKey,
     server,
   };
-  let obsClient;
   let options = { ...clientOptions };
 
   if (proxy) {
@@ -20,7 +19,7 @@ export const createObsClient = (cliConfig: ITinyProConfig) => {
     };
     options = { ...clientOptions, ...proxyOptions };
   }
-  obsClient = new ObsClient(options);
+  const obsClient = new ObsClient(options);
 
   return obsClient;
 };
diff --git a/packages/plugins/hwc/src/lib/hwc-obs/services/obs-service.ts b/packages/plugins/hwc/src/lib/hwc-obs/services/obs-service.ts
@@ -19,7 +19,9 @@ export const isBucketExist = (obsClient: any, bucketName: string) => {
       return true;
     })
     .catch((err: any) => {
-      log.error(`${obsMsg.obsTermheadBucketErrMsg}： ${ErrorUtils.getErrorMessage(err)}`);
+      log.error(
+        `${obsMsg.obsTermheadBucketErrMsg}： ${ErrorUtils.getErrorMessage(err)}`
+      );
 
       throw err;
     });
@@ -45,7 +47,9 @@ export const createBucket = (
     })
     .catch((err: any) => {
       // 此处只记录Err，不抛出异常，以免外部重复打印错误
-      log.error(`${obsMsg.obsTermCreateErrMsg}：${ErrorUtils.getErrorMessage(err)}`);
+      log.error(
+        `${obsMsg.obsTermCreateErrMsg}：${ErrorUtils.getErrorMessage(err)}`
+      );
     });
 };
 
@@ -75,7 +79,9 @@ export const getBucketsList = (obsClient: any) => {
     })
     .catch((err: any) => {
       // 此处只记录Err，不抛出异常，以免外部重复打印错误
-      log.error(`${obsMsg.obsTermGetListErrMsg}：${ErrorUtils.getErrorMessage(err)}`);
+      log.error(
+        `${obsMsg.obsTermGetListErrMsg}：${ErrorUtils.getErrorMessage(err)}`
+      );
     });
 };
 
@@ -94,6 +100,8 @@ export const getBucketMetadata = (obsClient: any, bucketName: string) => {
     })
     .catch((err: any) => {
       // 此处只记录Err，不抛出异常，以免外部重复打印错误
-      log.error(`${obsMsg.obsTermGetListErrMsg}：${ErrorUtils.getErrorMessage(err)}`);
+      log.error(
+        `${obsMsg.obsTermGetListErrMsg}：${ErrorUtils.getErrorMessage(err)}`
+      );
     });
 };
diff --git a/packages/plugins/hwc/src/lib/hwc-vpc/commands/add.ts b/packages/plugins/hwc/src/lib/hwc-vpc/commands/add.ts
@@ -53,6 +53,8 @@ export const addVpc = async () => {
     setHwcExports('hwcConfig.vpc', { vpcsList });
     log.success(`${commandName}成功`);
   } catch (err) {
-    log.error(`${vpcMsg.vpcTermGetVpcsListErrMsg}：${ErrorUtils.getErrorMessage(err)}`);
+    log.error(
+      `${vpcMsg.vpcTermGetVpcsListErrMsg}：${ErrorUtils.getErrorMessage(err)}`
+    );
   }
 };
diff --git a/packages/plugins/hwc/src/lib/hwc-vpc/commands/security-groups-create.ts b/packages/plugins/hwc/src/lib/hwc-vpc/commands/security-groups-create.ts
@@ -1,7 +1,12 @@
 import inquirer from 'inquirer';
 import chalk from 'chalk';
 import { cliConfig as tinyStageCliConfig, logs } from '@opentiny/cli-devkit';
-import { CONSTANTS, fmtDashTitle, getTinyProConfigure, ErrorUtils } from '../../../core';
+import {
+  CONSTANTS,
+  fmtDashTitle,
+  getTinyProConfigure,
+  ErrorUtils,
+} from '../../../core';
 import { EipValidator } from '../../hwc-eip/services/validate';
 import { createSecurityGroups } from '../services/security-groups-service';
 
@@ -27,7 +32,7 @@ async function promptSecurityGroups() {
   return inquirer.prompt(questions);
 }
 
-export const  securityGroupsCreate =  async () => {
+export const securityGroupsCreate = async () => {
   const cliConfig = getTinyProConfigure();
 
   console.log(

diff --git a/packages/plugins/link/.eslintrc.js b/packages/plugins/link/.eslintrc.js