@cloudbase/cli 2.10.0-beta.0 → 2.11.0-beta.0

package/lib/commands/run/version/delete.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeleteVersion = void 0;
 const common_1 = require("../../common");
@@ -31,7 +22,9 @@ const common_2 = require("./common");
 const i18n_1 = require("../../../i18n");
 let DeleteVersion = class DeleteVersion extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.versionCommonOptions)('delete')), { options: [
+        return {
+            ...(0, common_2.versionCommonOptions)('delete'),
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -44,36 +37,36 @@ let DeleteVersion = class DeleteVersion extends common_1.Command {
                     flags: '-v, --versionName <versionName>',
                     desc: (0, i18n_1.t)('版本名称 Name')
                 }
-            ], desc: (0, i18n_1.t)('删除云开发环境下云托管服务的版本') });
+            ],
+            desc: (0, i18n_1.t)('删除云开发环境下云托管服务的版本')
+        };
     }
-    execute(envId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
-            if (envCheckType !== 0) {
-                (0, utils_1.logEnvCheck)(envId, envCheckType);
-                return;
-            }
-            let { serviceName = '', versionName = '' } = options;
-            if (versionName.length === 0 || serviceName.length === 0) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入 serviceName 和 versionName'));
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('数据加载中...'));
-            try {
-                const res = yield (0, run_1.deleteVersion)({
-                    envId,
-                    serverName: serviceName,
-                    versionName
-                });
-                if (res === 'succ')
-                    loading.succeed((0, i18n_1.t)('成功删除 {{serviceName}} 服务下的 {{versionName}} 版本', { serviceName, versionName }));
-                else
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('删除失败，请查看版本是否存在, 或者先清空版本灰度流量'));
-            }
-            catch (e) {
+    async execute(envId, options) {
+        let envCheckType = await (0, utils_1.checkTcbrEnv)(options.envId, false);
+        if (envCheckType !== 0) {
+            (0, utils_1.logEnvCheck)(envId, envCheckType);
+            return;
+        }
+        let { serviceName = '', versionName = '' } = options;
+        if (versionName.length === 0 || serviceName.length === 0) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入 serviceName 和 versionName'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('数据加载中...'));
+        try {
+            const res = await (0, run_1.deleteVersion)({
+                envId,
+                serverName: serviceName,
+                versionName
+            });
+            if (res === 'succ')
+                loading.succeed((0, i18n_1.t)('成功删除 {{serviceName}} 服务下的 {{versionName}} 版本', { serviceName, versionName }));
+            else
                 throw new error_1.CloudBaseError((0, i18n_1.t)('删除失败，请查看版本是否存在, 或者先清空版本灰度流量'));
-            }
-        });
+        }
+        catch (e) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('删除失败，请查看版本是否存在, 或者先清空版本灰度流量'));
+        }
     }
 };
 __decorate([

package/lib/commands/run/version/list.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListVersion = void 0;
 const common_1 = require("../../common");
@@ -35,7 +26,9 @@ const StatusMap = {
 };
 let ListVersion = class ListVersion extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.versionCommonOptions)('list')), { options: [
+        return {
+            ...(0, common_2.versionCommonOptions)('list'),
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -52,47 +45,47 @@ let ListVersion = class ListVersion extends common_1.Command {
                     flags: '-o, --offset <offset>',
                     desc: (0, i18n_1.t)('数据偏移量，默认值为 0')
                 }
-            ], desc: (0, i18n_1.t)('展示选择的云托管服务的版本列表') });
+            ],
+            desc: (0, i18n_1.t)('展示选择的云托管服务的版本列表')
+        };
     }
-    execute(envId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
-            if (envCheckType !== 0) {
-                (0, utils_1.logEnvCheck)(envId, envCheckType);
-                return;
-            }
-            let { limit = 20, offset = 0, serviceName = '' } = options;
-            limit = Number(limit);
-            offset = Number(offset);
-            if (!Number.isInteger(limit) || !Number.isInteger(offset)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为整数'));
-            }
-            if (limit < 0 || offset < 0) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为大于 0 的整数'));
-            }
-            if (serviceName.length === 0) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请输入查询的服务名'));
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start((0, i18n_1.t)('数据加载中...'));
-            const data = yield (0, run_1.listVersion)({
-                envId,
-                limit: Number(limit),
-                offset: Number(offset),
-                serverName: serviceName
-            });
-            loading.stop();
-            const head = [(0, i18n_1.t)('版本名称'), (0, i18n_1.t)('状态'), (0, i18n_1.t)('流量'), (0, i18n_1.t)('备注'), (0, i18n_1.t)('创建时间'), (0, i18n_1.t)('更新时间')];
-            const tableData = data.map((item) => [
-                item.VersionName,
-                StatusMap[item.Status],
-                item.FlowRatio,
-                item.ServiceRemark ? item.ServiceRemark : '-',
-                item.CreatedTime,
-                item.UpdatedTime,
-            ]);
-            (0, utils_1.printHorizontalTable)(head, tableData);
+    async execute(envId, options) {
+        let envCheckType = await (0, utils_1.checkTcbrEnv)(options.envId, false);
+        if (envCheckType !== 0) {
+            (0, utils_1.logEnvCheck)(envId, envCheckType);
+            return;
+        }
+        let { limit = 20, offset = 0, serviceName = '' } = options;
+        limit = Number(limit);
+        offset = Number(offset);
+        if (!Number.isInteger(limit) || !Number.isInteger(offset)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为整数'));
+        }
+        if (limit < 0 || offset < 0) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('limit 和 offset 必须为大于 0 的整数'));
+        }
+        if (serviceName.length === 0) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请输入查询的服务名'));
+        }
+        const loading = (0, utils_1.loadingFactory)();
+        loading.start((0, i18n_1.t)('数据加载中...'));
+        const data = await (0, run_1.listVersion)({
+            envId,
+            limit: Number(limit),
+            offset: Number(offset),
+            serverName: serviceName
         });
+        loading.stop();
+        const head = [(0, i18n_1.t)('版本名称'), (0, i18n_1.t)('状态'), (0, i18n_1.t)('流量'), (0, i18n_1.t)('备注'), (0, i18n_1.t)('创建时间'), (0, i18n_1.t)('更新时间')];
+        const tableData = data.map((item) => [
+            item.VersionName,
+            StatusMap[item.Status],
+            item.FlowRatio,
+            item.ServiceRemark ? item.ServiceRemark : '-',
+            item.CreatedTime,
+            item.UpdatedTime,
+        ]);
+        (0, utils_1.printHorizontalTable)(head, tableData);
     }
 };
 __decorate([

package/lib/commands/run/version/modify.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModifyVersion = void 0;
 const common_1 = require("../../common");
@@ -29,7 +20,7 @@ const utils_1 = require("../../../utils");
 const decorators_1 = require("../../../decorators");
 const common_2 = require("./common");
 const i18n_1 = require("../../../i18n");
-const modifyByFlow = (envId, serviceName, mode) => __awaiter(void 0, void 0, void 0, function* () {
+const modifyByFlow = async (envId, serviceName, mode) => {
     const versionFlowItems = [];
     const loading = (0, utils_1.loadingFactory)();
     mode.split('|')[1]
@@ -44,7 +35,7 @@ const modifyByFlow = (envId, serviceName, mode) => __awaiter(void 0, void 0, voi
     if (sum !== 100 && sum !== 0)
         throw new error_1.CloudBaseError((0, i18n_1.t)('流量配置的总和需要为 0 或 100'));
     loading.start((0, i18n_1.t)('数据加载中...'));
-    const res = yield (0, run_1.modifyVersion)({
+    const res = await (0, run_1.modifyVersion)({
         envId,
         serverName: serviceName,
         trafficType: 'FLOW',
@@ -53,8 +44,8 @@ const modifyByFlow = (envId, serviceName, mode) => __awaiter(void 0, void 0, voi
     if (res !== 'succ')
         throw new error_1.CloudBaseError((0, i18n_1.t)('分配失败'));
     loading.succeed((0, i18n_1.t)('分配成功'));
-});
-const modifyByURL = (envId, serviceName, mode) => __awaiter(void 0, void 0, void 0, function* () {
+};
+const modifyByURL = async (envId, serviceName, mode) => {
     const versionFlowItems = [];
     const loading = (0, utils_1.loadingFactory)();
     mode.split('|')[1]
@@ -82,7 +73,7 @@ const modifyByURL = (envId, serviceName, mode) => __awaiter(void 0, void 0, void
         versionFlowItems.find((item) => item.VersionName === mode.split('|')[2]).IsDefaultPriority = true;
     }
     loading.start((0, i18n_1.t)('数据加载中...'));
-    const res = yield (0, run_1.modifyVersion)({
+    const res = await (0, run_1.modifyVersion)({
         envId,
         serverName: serviceName,
         trafficType: 'URL_PARAMS',
@@ -91,10 +82,12 @@ const modifyByURL = (envId, serviceName, mode) => __awaiter(void 0, void 0, void
     if (res !== 'succ')
         throw new error_1.CloudBaseError((0, i18n_1.t)('分配失败'));
     loading.succeed((0, i18n_1.t)('分配成功'));
-});
+};
 let ModifyVersion = class ModifyVersion extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.versionCommonOptions)('modify')), { options: [
+        return {
+            ...(0, common_2.versionCommonOptions)('modify'),
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -107,25 +100,25 @@ let ModifyVersion = class ModifyVersion extends common_1.Command {
                     flags: '-t, --traffic <traffic>',
                     desc: (0, i18n_1.t)('配置 type，按百分比分配即为FLOW|versionName1=a&...&versionName1=b，按URL分配则是URL|key1,value1,version1&...&key1,value1,version1|defaultVersion')
                 }
-            ], desc: (0, i18n_1.t)('展示选择的云托管服务的版本列表') });
+            ],
+            desc: (0, i18n_1.t)('展示选择的云托管服务的版本列表')
+        };
     }
-    execute(envId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, false);
-            if (envCheckType !== 0) {
-                (0, utils_1.logEnvCheck)(envId, envCheckType);
-                return;
-            }
-            let { serviceName = '', traffic: _traffic = 'FLOW' } = options;
-            if (serviceName.length === 0)
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请填入有效云托管服务名'));
-            if (_traffic.split('|')[0] === 'URL') {
-                modifyByURL(envId, serviceName, _traffic);
-            }
-            else {
-                modifyByFlow(envId, serviceName, _traffic);
-            }
-        });
+    async execute(envId, options) {
+        let envCheckType = await (0, utils_1.checkTcbrEnv)(options.envId, false);
+        if (envCheckType !== 0) {
+            (0, utils_1.logEnvCheck)(envId, envCheckType);
+            return;
+        }
+        let { serviceName = '', traffic: _traffic = 'FLOW' } = options;
+        if (serviceName.length === 0)
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请填入有效云托管服务名'));
+        if (_traffic.split('|')[0] === 'URL') {
+            modifyByURL(envId, serviceName, _traffic);
+        }
+        else {
+            modifyByFlow(envId, serviceName, _traffic);
+        }
     }
 };
 __decorate([