@cloudbase/cli 2.10.0 → 2.11.0-beta.0

package/lib/commands/run/version/update.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.UpdateVersion = void 0;
 const fs_1 = require("fs");
@@ -64,7 +55,9 @@ const describeVersion = (base) => {
 };
 let UpdateVersion = class UpdateVersion extends common_1.Command {
     get options() {
-        return Object.assign(Object.assign({}, (0, common_2.versionCommonOptions)('update')), { options: [
+        return {
+            ...(0, common_2.versionCommonOptions)('update'),
+            options: [
                 {
                     flags: '-e, --envId <envId>',
                     desc: (0, i18n_1.t)('环境 Id')
@@ -133,210 +126,210 @@ let UpdateVersion = class UpdateVersion extends common_1.Command {
                     flags: '--env <env>',
                     desc: (0, i18n_1.t)('环境变量，格式为xx=a&yy=b，默认为空')
                 }
-            ], 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 = '', path: _path = '', repo: _repo = '', image: _image = '', port: _port = '80', flow: _flow = '0', remark: _remark = '', cpu: _cpu = '0.5', mem: _mem = '1', copy: _copy = '0~50', policy: _policy = 'cpu|60', dockerfile: _dockerfile = 'Dockerfile', log: _log = 'stdout', delay: _delay = '2', env: _env = '' } = options;
-            if (!serviceName || !versionName) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入 serviceName 和 versionName'));
-            }
-            let path;
-            let repositoryType;
-            let branch;
-            let codeDetail;
-            let imageInfo;
-            let containerPort;
-            let flowRatio;
-            let versionRemark;
-            let cpu;
-            let mem;
-            let minNum;
-            let maxNum;
-            let policyType;
-            let policyThreshold;
-            let customLogs = 'stdout';
-            let dockerfilePath = 'Dockerfile';
-            let initialDelaySeconds = 2;
-            let envParams = '{}';
-            const uid = (0, utils_1.random)(4);
-            const loading = (0, utils_1.loadingFactory)();
-            if (_path) {
-                path = _path;
-                if ((0, fs_1.statSync)(path).isDirectory()) {
-                    loading.start((0, i18n_1.t)('正在压缩中'));
-                    yield (0, toolbox_1.zipDir)(path, `./code${uid}.zip`);
-                    loading.succeed((0, i18n_1.t)('压缩完成'));
-                    path = `./code${uid}.zip`;
-                }
-            }
-            else if (_repo) {
-                const repo = _repo.split('|');
-                repositoryType = repo[0];
-                codeDetail.Name.FullName = repo[1];
-                codeDetail.Name.Name = repo[1].split('/')[1];
-                branch = repo[2];
-            }
-            else if (_image) {
-                imageInfo = {
-                    ImageUrl: _image
-                };
-            }
-            else {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请至少选择一个上传方式'));
-            }
-            containerPort = Number(_port);
-            if (isNaN(containerPort)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的端口号'));
-            }
-            flowRatio = Number(_flow);
-            if (![100, 0].includes(flowRatio)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的流量策略'));
-            }
-            versionRemark = _remark;
-            cpu = Number(_cpu);
-            mem = Number(_mem);
-            if (isNaN(cpu) || isNaN(mem)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的cpu和内存规格'));
-            }
-            minNum = Number(_copy.split('~')[0]);
-            maxNum = Number(_copy.split('~')[1]);
-            if (isNaN(maxNum) || isNaN(minNum)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的副本个数'));
-            }
-            policyType = _policy.split('|')[0];
-            policyThreshold = Number(_policy.split('|')[1]);
-            if (!['cpu', 'mem'].includes(policyType) || isNaN(policyThreshold)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的扩缩容条件'));
+    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 = '', path: _path = '', repo: _repo = '', image: _image = '', port: _port = '80', flow: _flow = '0', remark: _remark = '', cpu: _cpu = '0.5', mem: _mem = '1', copy: _copy = '0~50', policy: _policy = 'cpu|60', dockerfile: _dockerfile = 'Dockerfile', log: _log = 'stdout', delay: _delay = '2', env: _env = '' } = options;
+        if (!serviceName || !versionName) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('必须输入 serviceName 和 versionName'));
+        }
+        let path;
+        let repositoryType;
+        let branch;
+        let codeDetail;
+        let imageInfo;
+        let containerPort;
+        let flowRatio;
+        let versionRemark;
+        let cpu;
+        let mem;
+        let minNum;
+        let maxNum;
+        let policyType;
+        let policyThreshold;
+        let customLogs = 'stdout';
+        let dockerfilePath = 'Dockerfile';
+        let initialDelaySeconds = 2;
+        let envParams = '{}';
+        const uid = (0, utils_1.random)(4);
+        const loading = (0, utils_1.loadingFactory)();
+        if (_path) {
+            path = _path;
+            if ((0, fs_1.statSync)(path).isDirectory()) {
+                loading.start((0, i18n_1.t)('正在压缩中'));
+                await (0, toolbox_1.zipDir)(path, `./code${uid}.zip`);
+                loading.succeed((0, i18n_1.t)('压缩完成'));
+                path = `./code${uid}.zip`;
             }
-            dockerfilePath = _dockerfile;
-            customLogs = _log;
-            initialDelaySeconds = Number(_delay);
-            if (isNaN(initialDelaySeconds)) {
-                throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的延迟时间'));
-            }
-            let _envParams = {};
-            _env.split('&').forEach((item) => {
-                _envParams[item.split('=')[0]] = item.split('=')[1];
+        }
+        else if (_repo) {
+            const repo = _repo.split('|');
+            repositoryType = repo[0];
+            codeDetail.Name.FullName = repo[1];
+            codeDetail.Name.Name = repo[1].split('/')[1];
+            branch = repo[2];
+        }
+        else if (_image) {
+            imageInfo = {
+                ImageUrl: _image
+            };
+        }
+        else {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请至少选择一个上传方式'));
+        }
+        containerPort = Number(_port);
+        if (isNaN(containerPort)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的端口号'));
+        }
+        flowRatio = Number(_flow);
+        if (![100, 0].includes(flowRatio)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的流量策略'));
+        }
+        versionRemark = _remark;
+        cpu = Number(_cpu);
+        mem = Number(_mem);
+        if (isNaN(cpu) || isNaN(mem)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的cpu和内存规格'));
+        }
+        minNum = Number(_copy.split('~')[0]);
+        maxNum = Number(_copy.split('~')[1]);
+        if (isNaN(maxNum) || isNaN(minNum)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的副本个数'));
+        }
+        policyType = _policy.split('|')[0];
+        policyThreshold = Number(_policy.split('|')[1]);
+        if (!['cpu', 'mem'].includes(policyType) || isNaN(policyThreshold)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的扩缩容条件'));
+        }
+        dockerfilePath = _dockerfile;
+        customLogs = _log;
+        initialDelaySeconds = Number(_delay);
+        if (isNaN(initialDelaySeconds)) {
+            throw new error_1.CloudBaseError((0, i18n_1.t)('请输入合法的延迟时间'));
+        }
+        let _envParams = {};
+        _env.split('&').forEach((item) => {
+            _envParams[item.split('=')[0]] = item.split('=')[1];
+        });
+        envParams = JSON.stringify(_envParams);
+        loading.start((0, i18n_1.t)('加载中...'));
+        let res = '';
+        let runId = '';
+        if (_path) {
+            loading.start((0, i18n_1.t)('正在上传中'));
+            let { PackageName, PackageVersion, UploadHeaders, UploadUrl } = await (0, run_1.createBuild)({
+                envId,
+                serviceName
             });
-            envParams = JSON.stringify(_envParams);
-            loading.start((0, i18n_1.t)('加载中...'));
-            let res = '';
-            let runId = '';
-            if (_path) {
-                loading.start((0, i18n_1.t)('正在上传中'));
-                let { PackageName, PackageVersion, UploadHeaders, UploadUrl } = yield (0, run_1.createBuild)({
-                    envId,
-                    serviceName
-                });
-                yield (0, run_1.uploadZip)(path, UploadUrl, UploadHeaders[0]);
-                loading.succeed((0, i18n_1.t)('上传成功'));
-                if (path === `./code${uid}.zip`) {
-                    loading.start((0, i18n_1.t)('删除本地压缩包'));
-                    (0, fs_1.unlinkSync)(path);
-                    loading.succeed((0, i18n_1.t)('成功删除本地压缩包'));
-                }
-                let response = yield (0, run_1.updateVersion)({
-                    envId,
-                    serverName: serviceName,
-                    versionName,
-                    containerPort,
-                    uploadType: 'package',
-                    packageName: PackageName,
-                    packageVersion: PackageVersion,
-                    flowRatio,
-                    versionRemark,
-                    enableUnion: true,
-                    cpu,
-                    mem,
-                    minNum,
-                    maxNum,
-                    policyType,
-                    policyThreshold,
-                    customLogs,
-                    dockerfilePath,
-                    envParams,
-                    initialDelaySeconds
-                });
-                res = response.Result;
-                runId = response.RunId;
+            await (0, run_1.uploadZip)(path, UploadUrl, UploadHeaders[0]);
+            loading.succeed((0, i18n_1.t)('上传成功'));
+            if (path === `./code${uid}.zip`) {
+                loading.start((0, i18n_1.t)('删除本地压缩包'));
+                (0, fs_1.unlinkSync)(path);
+                loading.succeed((0, i18n_1.t)('成功删除本地压缩包'));
             }
-            else if (_image) {
-                let response = yield (0, run_1.updateVersion)({
-                    envId,
-                    serverName: serviceName,
-                    versionName,
-                    containerPort,
-                    uploadType: 'image',
-                    imageInfo,
-                    flowRatio,
-                    versionRemark,
-                    enableUnion: true,
-                    cpu,
-                    mem,
-                    minNum,
-                    maxNum,
-                    policyType,
-                    policyThreshold,
-                    customLogs,
-                    envParams,
-                    initialDelaySeconds
-                });
-                res = response.Result;
-                runId = response.RunId;
-            }
-            else {
-                let response = yield (0, run_1.updateVersion)({
-                    envId,
-                    serverName: serviceName,
-                    versionName,
-                    containerPort,
-                    uploadType: 'repository',
-                    repositoryType,
-                    branch,
-                    codeDetail,
-                    flowRatio,
-                    versionRemark,
-                    enableUnion: true,
-                    cpu,
-                    mem,
-                    minNum,
-                    maxNum,
-                    policyType,
-                    policyThreshold,
-                    customLogs,
-                    dockerfilePath,
-                    envParams,
-                    initialDelaySeconds
-                });
-                res = response.Result;
-                runId = response.RunId;
+            let response = await (0, run_1.updateVersion)({
+                envId,
+                serverName: serviceName,
+                versionName,
+                containerPort,
+                uploadType: 'package',
+                packageName: PackageName,
+                packageVersion: PackageVersion,
+                flowRatio,
+                versionRemark,
+                enableUnion: true,
+                cpu,
+                mem,
+                minNum,
+                maxNum,
+                policyType,
+                policyThreshold,
+                customLogs,
+                dockerfilePath,
+                envParams,
+                initialDelaySeconds
+            });
+            res = response.Result;
+            runId = response.RunId;
+        }
+        else if (_image) {
+            let response = await (0, run_1.updateVersion)({
+                envId,
+                serverName: serviceName,
+                versionName,
+                containerPort,
+                uploadType: 'image',
+                imageInfo,
+                flowRatio,
+                versionRemark,
+                enableUnion: true,
+                cpu,
+                mem,
+                minNum,
+                maxNum,
+                policyType,
+                policyThreshold,
+                customLogs,
+                envParams,
+                initialDelaySeconds
+            });
+            res = response.Result;
+            runId = response.RunId;
+        }
+        else {
+            let response = await (0, run_1.updateVersion)({
+                envId,
+                serverName: serviceName,
+                versionName,
+                containerPort,
+                uploadType: 'repository',
+                repositoryType,
+                branch,
+                codeDetail,
+                flowRatio,
+                versionRemark,
+                enableUnion: true,
+                cpu,
+                mem,
+                minNum,
+                maxNum,
+                policyType,
+                policyThreshold,
+                customLogs,
+                dockerfilePath,
+                envParams,
+                initialDelaySeconds
+            });
+            res = response.Result;
+            runId = response.RunId;
+        }
+        if (res !== 'succ')
+            throw new error_1.CloudBaseError((0, i18n_1.t)('提交构建任务失败'));
+        loading.start((0, i18n_1.t)('正在部署中'));
+        while (true) {
+            let { Percent, Status } = await (0, run_1.basicOperate)({ envId, runId });
+            if (Status === 'build_fail') {
+                let logs = await (0, run_1.logCreate)({ envId, runId });
+                (0, fs_1.writeFileSync)(`./log${runId}`, logs.reduce((res, item) => res + item + '\n', ''));
+                throw new error_1.CloudBaseError((0, i18n_1.t)('构建失败，日志写入{{file}}中', { file: `./log${runId}` }));
             }
-            if (res !== 'succ')
-                throw new error_1.CloudBaseError((0, i18n_1.t)('提交构建任务失败'));
-            loading.start((0, i18n_1.t)('正在部署中'));
-            while (true) {
-                let { Percent, Status } = yield (0, run_1.basicOperate)({ envId, runId });
-                if (Status === 'build_fail') {
-                    let logs = yield (0, run_1.logCreate)({ envId, runId });
-                    (0, fs_1.writeFileSync)(`./log${runId}`, logs.reduce((res, item) => res + item + '\n', ''));
-                    throw new error_1.CloudBaseError((0, i18n_1.t)('构建失败，日志写入{{file}}中', { file: `./log${runId}` }));
-                }
-                else if (Status !== 'updating') {
-                    break;
-                }
-                loading.start((0, i18n_1.t)('目前构建进度{{percent}}%', { percent: Percent }));
-                yield new Promise((resolve) => {
-                    setTimeout((_) => resolve('again'), 2000);
-                });
+            else if (Status !== 'updating') {
+                break;
             }
-            loading.succeed((0, i18n_1.t)('构建成功'));
-        });
+            loading.start((0, i18n_1.t)('目前构建进度{{percent}}%', { percent: Percent }));
+            await new Promise((resolve) => {
+                setTimeout((_) => resolve('again'), 2000);
+            });
+        }
+        loading.succeed((0, i18n_1.t)('构建成功'));
     }
 };
 __decorate([