@cloudbase/cli 1.10.0 → 1.11.0

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

@@ -1,345 +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 uploadTypeMap = {
-    本地代码: 'package',
-    代码库拉取: 'repository',
-    镜像拉取: '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('目前的配置如下');
-    console.log(`镜像名 ${base.ImageUrl.split(':')[1]}`);
-    console.log(`上传方式 ${base.UploadType === 'image'
-        ? '镜像拉取'
-        : base.UploadType === 'package'
-            ? '本地代码上传'
-            : '代码仓库拉取'}`);
-    console.log(`监听端口 ${base.VersionPort}`);
-    console.log(`扩缩容条件 ${base.PolicyType}使用率 > ${base.PolicyThreshold}`);
-    console.log(`规格 cpu ${base.Cpu}核 mem ${base.Mem}G`);
-    console.log(`InitialDelaySeconds ${base.InitialDelaySeconds}`);
-    console.log(`日志采集路径 ${base.InitialDelaySeconds}`);
-    console.log(`环境变量 ${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: '环境 Id'
-                },
-                {
-                    flags: '-s, --serviceName <serviceName>',
-                    desc: '托管服务 name'
-                },
-                {
-                    flags: '-v, --versionName <versionName>',
-                    desc: '版本名称 Name'
-                },
-                {
-                    flags: '-p, --path <path>',
-                    desc: '本地代码路径，选择本地代码上传时使用'
-                },
-                {
-                    flags: '--repo <repo>',
-                    desc: '仓库信息，形如 channel|fullName|branch，channel为github、gitlab或gitee，选择代码库拉取时使用'
-                },
-                {
-                    flags: '-i, --image <image>',
-                    desc: '镜像url，选择镜像拉取时使用'
-                },
-                {
-                    flags: '--port <port>',
-                    desc: '监听端口，默认为80'
-                },
-                {
-                    flags: '-f, --flow <flow>',
-                    desc: '流量策略（%），0或100，默认为0'
-                },
-                {
-                    flags: '-m, --remark <remark>',
-                    desc: '备注信息，默认为空'
-                },
-                {
-                    flags: '-c, --cpu <cpu>',
-                    desc: 'cpu规格（核数），默认为0.5'
-                },
-                {
-                    flags: '--mem <mem>',
-                    desc: '内存规格（G），默认为1'
-                },
-                {
-                    flags: '--copy <copy>',
-                    desc: '副本个数，格式为最小个数~最大个数，默认为0~50'
-                },
-                {
-                    flags: '--policy <policy>',
-                    desc: '扩缩容条件，格式为条件类型|条件比例（%），cpu条件为cpu，内存为条件mem，默认为cpu|60'
-                },
-                {
-                    flags: '--dockerFile <dockerFile>',
-                    desc: 'dockerfile名称，非镜像拉取时使用，默认为Dockerfile'
-                },
-                {
-                    flags: '-l, --log <log>',
-                    desc: '日志采集路径，默认为stdout'
-                },
-                {
-                    flags: '-d, --delay <delay>',
-                    desc: '初始延迟时间（秒），默认为2'
-                },
-                {
-                    flags: '--env <env>',
-                    desc: '环境变量，格式为xx=a&yy=b，默认为空'
-                }
-            ], desc: '创建云开发环境下云托管服务的版本' });
-    }
-    execute(envId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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('必须输入 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('正在压缩中');
-                    yield (0, toolbox_1.zipDir)(path, `./code${uid}.zip`);
-                    loading.succeed('压缩完成');
-                    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('请至少选择一个上传方式');
-            }
-            containerPort = Number(_port);
-            if (isNaN(containerPort)) {
-                throw new error_1.CloudBaseError('请输入合法的端口号');
-            }
-            flowRatio = Number(_flow);
-            if (![100, 0].includes(flowRatio)) {
-                throw new error_1.CloudBaseError('请输入合法的流量策略');
-            }
-            versionRemark = _remark;
-            cpu = Number(_cpu);
-            mem = Number(_mem);
-            if (isNaN(cpu) || isNaN(mem)) {
-                throw new error_1.CloudBaseError('请输入合法的cpu和内存规格');
-            }
-            minNum = Number(_copy.split('~')[0]);
-            maxNum = Number(_copy.split('~')[1]);
-            if (isNaN(maxNum) || isNaN(minNum)) {
-                throw new error_1.CloudBaseError('请输入合法的副本个数');
-            }
-            policyType = _policy.split('|')[0];
-            policyThreshold = Number(_policy.split('|')[1]);
-            if (!['cpu', 'mem'].includes(policyType) || isNaN(policyThreshold)) {
-                throw new error_1.CloudBaseError('请输入合法的扩缩容条件');
-            }
-            dockerfilePath = _dockerfile;
-            customLogs = _log;
-            initialDelaySeconds = Number(_delay);
-            if (isNaN(initialDelaySeconds)) {
-                throw new error_1.CloudBaseError('请输入合法的延迟时间');
-            }
-            let _envParams = {};
-            _env.split('&').forEach((item) => {
-                _envParams[item.split('=')[0]] = item.split('=')[1];
-            });
-            envParams = JSON.stringify(_envParams);
-            loading.start('加载中...');
-            let res = '';
-            let runId = '';
-            if (_path) {
-                loading.start('正在上传中');
-                let { PackageName, PackageVersion, UploadHeaders, UploadUrl } = yield (0, run_1.createBuild)({
-                    envId,
-                    serviceName
-                });
-                yield (0, run_1.uploadZip)(path, UploadUrl, UploadHeaders[0]);
-                loading.succeed('上传成功');
-                if (path === `./code${uid}.zip`) {
-                    loading.start('删除本地压缩包');
-                    (0, fs_1.unlinkSync)(path);
-                    loading.succeed('成功删除本地压缩包');
-                }
-                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('提交构建任务失败');
-            loading.start('正在部署中');
-            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(`构建失败，日志写入./log${runId}中`);
-                }
-                else if (Status !== 'updating') {
-                    break;
-                }
-                loading.start(`目前构建进度${Percent}%`);
-                yield new Promise((resolve) => {
-                    setTimeout((_) => resolve('again'), 2000);
-                });
-            }
-            loading.succeed('构建成功');
-        });
-    }
-};
-__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;

package/lib/commands/smart.js

@@ -1,119 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.smartDeploy = void 0;
-const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const chalk_1 = __importDefault(require("chalk"));
-const enquirer_1 = require("enquirer");
-const framework_core_1 = require("@cloudbase/framework-core");
-const toolbox_1 = require("@cloudbase/toolbox");
-const utils_1 = require("../utils");
-const Hosting = __importStar(require("../hosting"));
-const Function = __importStar(require("../function"));
-const auth_1 = require("../auth");
-function smartDeploy() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const loading = (0, utils_1.loadingFactory)();
-        loading.start('环境检测中');
-        yield (0, auth_1.checkLogin)();
-        yield (0, utils_1.checkTcbService)();
-        const files = fs_1.default.readdirSync(process.cwd());
-        loading.stop();
-        const home = os_1.default.homedir();
-        const current = process.cwd();
-        let relative = current;
-        if (current.indexOf(home) > -1) {
-            relative = path_1.default.relative(home, current);
-        }
-        let region = yield (0, toolbox_1.getRegion)(true);
-        if (!files.length) {
-            utils_1.logger.info('当前目录为空，初始化云开发项目\n');
-            region = yield (0, utils_1.getSelectRegion)();
-            const envId = yield (0, utils_1.getSelectedEnv)();
-            const projectPath = yield (0, utils_1.downloadTemplate)();
-            yield (0, utils_1.initProjectConfig)(envId, region, projectPath);
-            utils_1.logger.success('初始化项目成功！\n');
-        }
-        const { setup } = yield (0, enquirer_1.prompt)({
-            type: 'confirm',
-            name: 'setup',
-            message: `是否使用云开发部署当前项目 <${chalk_1.default.bold.cyan(relative)}> ？`,
-            initial: true
-        });
-        if (!setup) {
-            return;
-        }
-        const config = yield (0, utils_1.getCloudBaseConfig)();
-        let envId = config === null || config === void 0 ? void 0 : config.envId;
-        if (!(config === null || config === void 0 ? void 0 : config.region) && !region) {
-            region = yield (0, utils_1.getSelectRegion)();
-        }
-        if (!envId) {
-            envId = yield (0, utils_1.getSelectedEnv)();
-            fs_1.default.writeFileSync(path_1.default.join(process.cwd(), 'cloudbaserc.json'), JSON.stringify({
-                envId,
-                region,
-                version: '2.0',
-                $schema: 'https://framework-1258016615.tcloudbaseapp.com/schema/latest.json'
-            }));
-        }
-        const parser = new toolbox_1.ConfigParser();
-        parser.update('region', region);
-        yield callFramework(envId);
-    });
-}
-exports.smartDeploy = smartDeploy;
-function callFramework(envId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const loginState = yield utils_1.authSupevisor.getLoginState();
-        const { token, secretId, secretKey } = loginState;
-        const config = yield (0, utils_1.getCloudBaseConfig)();
-        yield (0, framework_core_1.run)({
-            projectPath: process.cwd(),
-            cloudbaseConfig: {
-                secretId,
-                secretKey,
-                token,
-                envId
-            },
-            config,
-            logLevel: process.argv.includes('--verbose') ? 'debug' : 'info',
-            resourceProviders: {
-                hosting: Hosting,
-                function: Function
-            }
-        }, 'deploy', '');
-    });
-}

package/lib/commands/storage/index.js

@@ -1,13 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./storage"), exports);