@cloudbase/cli 2.10.0-beta.0 → 2.10.1-alpha.0

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

@@ -1,142 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(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");
-const error_1 = require("../../../error");
-const run_1 = require("../../../run");
-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 versionFlowItems = [];
-    const loading = (0, utils_1.loadingFactory)();
-    mode.split('|')[1]
-        .split('&')
-        .forEach((item) => {
-        versionFlowItems.push({
-            VersionName: item.split('=')[0],
-            FlowRatio: Number(item.split('=')[1])
-        });
-    });
-    let sum = versionFlowItems.reduce((sum, item) => sum + item.FlowRatio, 0);
-    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)({
-        envId,
-        serverName: serviceName,
-        trafficType: 'FLOW',
-        versionFlowItems
-    });
-    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 versionFlowItems = [];
-    const loading = (0, utils_1.loadingFactory)();
-    mode.split('|')[1]
-        .split('&')
-        .forEach((item, index) => {
-        versionFlowItems.push({
-            VersionName: item.split(',')[2],
-            FlowRatio: 0,
-            Priority: index + 1,
-            IsDefaultPriority: false,
-            UrlParam: {
-                Key: item.split(',')[0],
-                Value: item.split(',')[1]
-            }
-        });
-    });
-    if (!versionFlowItems.some((item) => item.VersionName === mode.split('|')[2])) {
-        versionFlowItems.push({
-            VersionName: mode.split('|')[2],
-            FlowRatio: 0,
-            IsDefaultPriority: true
-        });
-    }
-    else {
-        versionFlowItems.find((item) => item.VersionName === mode.split('|')[2]).IsDefaultPriority = true;
-    }
-    loading.start((0, i18n_1.t)('数据加载中...'));
-    const res = yield (0, run_1.modifyVersion)({
-        envId,
-        serverName: serviceName,
-        trafficType: 'URL_PARAMS',
-        versionFlowItems
-    });
-    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: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: (0, i18n_1.t)('环境 Id')
-                },
-                {
-                    flags: '-s, --serviceName <serviceName>',
-                    desc: (0, i18n_1.t)('托管服务 name')
-                },
-                {
-                    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)('展示选择的云托管服务的版本列表') });
-    }
-    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);
-            }
-        });
-    }
-};
-__decorate([
-    (0, decorators_1.InjectParams)(),
-    __param(0, (0, decorators_1.EnvId)()),
-    __param(1, (0, decorators_1.ArgsOptions)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", Promise)
-], ModifyVersion.prototype, "execute", null);
-ModifyVersion = __decorate([
-    (0, common_1.ICommand)()
-], ModifyVersion);
-exports.ModifyVersion = ModifyVersion;

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

@@ -1,353 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(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");
-const toolbox_1 = require("@cloudbase/toolbox");
-const common_1 = require("../../common");
-const error_1 = require("../../../error");
-const run_1 = require("../../../run");
-const utils_1 = require("../../../utils");
-const decorators_1 = require("../../../decorators");
-const common_2 = require("./common");
-const i18n_1 = require("../../../i18n");
-const uploadTypeMap = {
-    [(0, i18n_1.t)('本地代码')]: 'package',
-    [(0, i18n_1.t)('代码库拉取')]: 'repository',
-    [(0, i18n_1.t)('镜像拉取')]: 'image'
-};
-const memMap = {
-    0.25: [2, 8],
-    0.5: [2, 8],
-    1: [1, 8],
-    2: [2, 8],
-    4: [2, 8],
-    8: [2, 4],
-    16: [2, 4]
-};
-const describeVersion = (base) => {
-    console.log((0, i18n_1.t)('目前的配置如下'));
-    console.log((0, i18n_1.t)('镜像名 {{name}}', { name: base.ImageUrl.split(':')[1] }));
-    console.log((0, i18n_1.t)('上传方式 {{type}}', {
-        type: base.UploadType === 'image'
-            ? (0, i18n_1.t)('镜像拉取')
-            : base.UploadType === 'package'
-                ? (0, i18n_1.t)('本地代码上传')
-                : (0, i18n_1.t)('代码仓库拉取')
-    }));
-    console.log((0, i18n_1.t)('监听端口 {{port}}', { port: base.VersionPort }));
-    console.log((0, i18n_1.t)('扩缩容条件 {{type}}使用率 > {{threshold}}', { type: base.PolicyType, threshold: base.PolicyThreshold }));
-    console.log((0, i18n_1.t)('规格 cpu {{cpu}}核 mem {{mem}}G', { cpu: base.Cpu, mem: base.Mem }));
-    console.log((0, i18n_1.t)('InitialDelaySeconds {{seconds}}', { seconds: base.InitialDelaySeconds }));
-    console.log((0, i18n_1.t)('日志采集路径 {{path}}', { path: base.InitialDelaySeconds }));
-    console.log((0, i18n_1.t)('环境变量 {{vars}}', { vars: base.EnvParams }));
-};
-let UpdateVersion = class UpdateVersion extends common_1.Command {
-    get options() {
-        return Object.assign(Object.assign({}, (0, common_2.versionCommonOptions)('update')), { options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: (0, i18n_1.t)('环境 Id')
-                },
-                {
-                    flags: '-s, --serviceName <serviceName>',
-                    desc: (0, i18n_1.t)('托管服务 name')
-                },
-                {
-                    flags: '-v, --versionName <versionName>',
-                    desc: (0, i18n_1.t)('版本名称 Name')
-                },
-                {
-                    flags: '-p, --path <path>',
-                    desc: (0, i18n_1.t)('本地代码路径，选择本地代码上传时使用')
-                },
-                {
-                    flags: '--repo <repo>',
-                    desc: (0, i18n_1.t)('仓库信息，形如 channel|fullName|branch，channel为github、gitlab或gitee，选择代码库拉取时使用')
-                },
-                {
-                    flags: '-i, --image <image>',
-                    desc: (0, i18n_1.t)('镜像url，选择镜像拉取时使用')
-                },
-                {
-                    flags: '--port <port>',
-                    desc: (0, i18n_1.t)('监听端口，默认为80')
-                },
-                {
-                    flags: '-f, --flow <flow>',
-                    desc: (0, i18n_1.t)('流量策略（%），0或100，默认为0')
-                },
-                {
-                    flags: '-m, --remark <remark>',
-                    desc: (0, i18n_1.t)('备注信息，默认为空')
-                },
-                {
-                    flags: '-c, --cpu <cpu>',
-                    desc: (0, i18n_1.t)('cpu规格（核数），默认为0.5')
-                },
-                {
-                    flags: '--mem <mem>',
-                    desc: (0, i18n_1.t)('内存规格（G），默认为1')
-                },
-                {
-                    flags: '--copy <copy>',
-                    desc: (0, i18n_1.t)('副本个数，格式为最小个数~最大个数，默认为0~50')
-                },
-                {
-                    flags: '--policy <policy>',
-                    desc: (0, i18n_1.t)('扩缩容条件，格式为条件类型|条件比例（%），cpu条件为cpu，内存为条件mem，默认为cpu|60')
-                },
-                {
-                    flags: '--dockerFile <dockerFile>',
-                    desc: (0, i18n_1.t)('dockerfile名称，非镜像拉取时使用，默认为Dockerfile')
-                },
-                {
-                    flags: '-l, --log <log>',
-                    desc: (0, i18n_1.t)('日志采集路径，默认为stdout')
-                },
-                {
-                    flags: '-d, --delay <delay>',
-                    desc: (0, i18n_1.t)('初始延迟时间（秒），默认为2')
-                },
-                {
-                    flags: '--env <env>',
-                    desc: (0, i18n_1.t)('环境变量，格式为xx=a&yy=b，默认为空')
-                }
-            ], 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)('请输入合法的扩缩容条件'));
-            }
-            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 } = 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;
-            }
-            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;
-            }
-            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);
-                });
-            }
-            loading.succeed((0, i18n_1.t)('构建成功'));
-        });
-    }
-};
-__decorate([
-    (0, decorators_1.InjectParams)(),
-    __param(0, (0, decorators_1.EnvId)()),
-    __param(1, (0, decorators_1.ArgsOptions)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
-    __metadata("design:returntype", Promise)
-], UpdateVersion.prototype, "execute", null);
-UpdateVersion = __decorate([
-    (0, common_1.ICommand)()
-], UpdateVersion);
-exports.UpdateVersion = UpdateVersion;