@cloudbase/cli 2.0.13 → 2.1.1-alpha.0

package/types/types.d.ts

@@ -490,6 +490,9 @@ export interface IDescribeCloudRunServerDetail {
     ServerConfig: ITcbrServerBaseConfig;
     RequestId: string;
 }
+export declare const enum TCBR_LOG_TYPE {
+    NONE = "none"
+}
 export interface ITcbrServiceOptions {
     noConfirm: boolean;
     override: boolean;
@@ -511,6 +514,7 @@ export interface ITcbrServiceOptions {
     image: string;
     custom_image: string;
     library_image: string;
+    log_type: TCBR_LOG_TYPE;
     json: boolean;
 }
 export interface ICloudRunProcessLog {

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "typescript.tsdk": "node_modules\\typescript\\lib"
-}

package/lib/commands/env/create.js

@@ -1,115 +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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateCommand = void 0;
-const inquirer_1 = __importDefault(require("inquirer"));
-const env_1 = require("../../env");
-const utils_1 = require("../../utils");
-const error_1 = require("../../error");
-const common_1 = require("../common");
-const decorators_1 = require("../../decorators");
-let CreateCommand = class CreateCommand extends common_1.Command {
-    get options() {
-        return {
-            cmd: 'env',
-            childCmd: 'create <alias>',
-            deprecateCmd: 'env:create <alias>',
-            options: [],
-            desc: '创建云开发免费环境',
-            requiredEnvId: false
-        };
-    }
-    execute(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const alias = params === null || params === void 0 ? void 0 : params[0];
-            if (!alias) {
-                throw new error_1.CloudBaseError('环境名称不能为空！');
-            }
-            const loading = (0, utils_1.loadingFactory)();
-            loading.start('检查中...');
-            const { CurrentFreeEnvNum, MaxFreeEnvNum, CurrentEnvNum, MaxEnvNum } = yield (0, env_1.getEnvLimit)();
-            loading.stop();
-            if (+CurrentFreeEnvNum >= +MaxFreeEnvNum) {
-                const link = (0, utils_1.genClickableLink)('https://console.cloud.tencent.com/tcb');
-                throw new error_1.CloudBaseError(`免费环境数量已达上限，无法创建免费的环境，请到云开发-控制台中创建付费环境\n👉 ${link}`);
-            }
-            if (+CurrentEnvNum >= +MaxEnvNum) {
-                throw new error_1.CloudBaseError('环境数量已达上限，无法创建新的环境！');
-            }
-            const { payment } = yield inquirer_1.default.prompt({
-                type: 'list',
-                name: 'payment',
-                choices: [
-                    {
-                        name: '按量计费（免费配额）',
-                        value: 'postpay'
-                    },
-                    {
-                        name: '包年包月（免费版本）',
-                        value: 'prepay'
-                    }
-                ],
-                message: '请选择环境计费模式：',
-                default: 'postpay'
-            });
-            const { confirm } = yield inquirer_1.default.prompt({
-                type: 'confirm',
-                name: 'confirm',
-                message: '因支付权限问题，仅支持通过 API 秘钥登录的主账户使用 CLI 创建包年包月免费环境，其他用户需要登录控制台支付相关订单才能完成环境创建，是否继续？',
-                default: false
-            });
-            if (!confirm) {
-                throw new error_1.CloudBaseError('创建环境流程终止');
-            }
-            loading.start('环境创建中...');
-            try {
-                const res = yield (0, env_1.createEnv)({
-                    alias,
-                    paymentMode: payment
-                });
-            }
-            catch (e) {
-                if (e.code === 'ResourceInsufficient') {
-                    throw new error_1.CloudBaseError('环境数量已达上限，无法创建新的环境！');
-                }
-                throw e;
-            }
-            loading.succeed('创建环境成功，初始化预计需要花费 3 分钟');
-            console.log('你可以使用 cloudbase init 创建云开发项目');
-        });
-    }
-};
-__decorate([
-    (0, decorators_1.InjectParams)(),
-    __param(0, (0, decorators_1.ArgsParams)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], CreateCommand.prototype, "execute", null);
-CreateCommand = __decorate([
-    (0, common_1.ICommand)()
-], CreateCommand);
-exports.CreateCommand = CreateCommand;

package/lib/commands/run/create.js

@@ -1,162 +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.CreateRun = 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 ZoneMap = {
-    shanghai: '上海',
-    guangzhou: '广州'
-};
-let CreateRun = class CreateRun extends common_1.Command {
-    get options() {
-        return {
-            cmd: 'run:deprecated',
-            childCmd: 'create',
-            options: [
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id'
-                },
-                {
-                    flags: '-n, --name <name>',
-                    desc: '服务名称，必填'
-                },
-                {
-                    flags: '-c, --vpc <vpc>',
-                    desc: '云托管网络设置，默认系统创建，选择已有私有网络则填入格式为私有网络Id|子网Id1,...,子网Idn'
-                },
-                {
-                    flags: '-p, --repo <repo>',
-                    desc: '镜像仓库名，默认系统创建'
-                },
-                {
-                    flags: '-m, --remark <remark>',
-                    desc: '备注，默认为空'
-                },
-                {
-                    flags: '-a, --publicAccess <publicAccess>',
-                    desc: '是否允许公网访问(Y/N)，默认为允许'
-                }
-            ],
-            desc: '创建云托管服务'
-        };
-    }
-    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 { name: _name = '', vpc: _vpc = '', repo: _repo = '', log: _log = '', remark: _remark = '', publicAccess: _publicAccess = '' } = options;
-            let name;
-            let remark;
-            let vpcInfo;
-            let imageRepo;
-            let logType;
-            let esInfo;
-            let publicAccess;
-            const loading = (0, utils_1.loadingFactory)();
-            if (!_name) {
-                throw new error_1.CloudBaseError('请填入服务名');
-            }
-            else {
-                name = _name;
-            }
-            remark = _remark;
-            if (!_vpc) {
-                vpcInfo = {
-                    VpcId: '',
-                    SubnetIds: [],
-                    CreateType: 1
-                };
-            }
-            else {
-                vpcInfo = {
-                    VpcId: _vpc.split('|')[0],
-                    SubnetIds: _vpc.split('|')[1].split(','),
-                    CreateType: 2
-                };
-            }
-            if (!_repo) {
-                imageRepo = undefined;
-            }
-            else {
-                imageRepo = _repo;
-            }
-            if (!_log) {
-                logType = 'cls';
-            }
-            else {
-                logType = 'es';
-                esInfo = _log.split('&').reduce((pre, item) => {
-                    pre[item.split('=')[0]] = item.split('=')[0] === 'Port' ? Number(item.split('=')[1]) : item.split('=')[1];
-                    return pre;
-                }, {});
-            }
-            if (!_publicAccess) {
-                publicAccess = 1;
-            }
-            else if (/[^nNyY]/.test(_publicAccess) || _publicAccess.length !== 1) {
-                throw new error_1.CloudBaseError('请输入符合规范的公网访问服务设置');
-            }
-            else if (_publicAccess === 'N' || _publicAccess === 'n') {
-                publicAccess = 2;
-            }
-            else {
-                publicAccess = 1;
-            }
-            const res = yield (0, run_1.createRun)({
-                envId,
-                name,
-                remark,
-                vpcInfo,
-                imageRepo,
-                logType,
-                esInfo,
-                publicAccess,
-                isPublic: true
-            });
-            if (res === 'succ')
-                loading.succeed(`云托管服务 ${name} 创建成功！`);
-            else
-                throw new error_1.CloudBaseError('创建失败，请查看是否已经有同名服务');
-        });
-    }
-};
-__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)
-], CreateRun.prototype, "execute", null);
-CreateRun = __decorate([
-    (0, common_1.ICommand)()
-], CreateRun);
-exports.CreateRun = CreateRun;

package/lib/commands/run/service/create.js

@@ -1,144 +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.CreateServiceTcbr = void 0;
-const common_1 = require("../../common");
-const decorators_1 = require("../../../decorators");
-const error_1 = require("../../../error");
-const run_1 = require("../../../run");
-const utils_1 = require("../../../utils");
-let CreateServiceTcbr = class CreateServiceTcbr extends common_1.Command {
-    get options() {
-        return {
-            cmd: 'run',
-            childCmd: 'service:create',
-            options: [
-                {
-                    flags: '--noConfirm',
-                    desc: '发布前是否跳过二次确认'
-                },
-                {
-                    flags: '--override',
-                    desc: '缺省的参数是否沿用旧版本配置'
-                },
-                {
-                    flags: '-e, --envId <envId>',
-                    desc: '环境 Id，必填'
-                },
-                {
-                    flags: '-s, --serviceName <serviceName>',
-                    desc: '服务名，必填'
-                },
-                {
-                    flags: '--path <path>',
-                    desc: '本地代码根目录'
-                },
-                {
-                    flags: '--cpu <cpu>',
-                    desc: '单一实例cpu规格，默认0.5'
-                },
-                {
-                    flags: '--mem <mem>',
-                    desc: '单一实例内存规格，默认1'
-                },
-                {
-                    flags: '--minNum <minNum>',
-                    desc: '最小副本数，默认0'
-                },
-                {
-                    flags: '--maxNum <maxNum>',
-                    desc: '最大副本数，默认50，不能大于50'
-                },
-                {
-                    flags: '--policyDetails <policyDetails>',
-                    desc: '扩缩容配置，格式为条件类型=条件比例（%），多个条件之间用&隔开，内存条件为mem，cpu条件为cpu，默认内存>60% 或 CPU>60%，即cpu=60&mem=60'
-                },
-                {
-                    flags: '--customLogs <customLogs>',
-                    desc: '日志采集路径，默认stdout'
-                },
-                {
-                    flags: '--envParams <envParams>',
-                    desc: '环境变量，格式为xx=a&yy=b，默认为空'
-                },
-                {
-                    flags: '--containerPort <containerPort>',
-                    desc: '监听端口，必填'
-                },
-                {
-                    flags: '--remark <remark>',
-                    desc: '版本备注，默认为空'
-                },
-                {
-                    flags: '--targetDir <targetDir>',
-                    desc: '目标目录'
-                },
-                {
-                    flags: '--dockerfile <dockerfile>',
-                    desc: 'Dockerfile文件名，默认为 Dockerfile'
-                },
-                {
-                    flags: '--custom_image <custom_image>',
-                    desc: 'TCR 仓库镜像 URL'
-                },
-                {
-                    flags: '--image <image>',
-                    desc: '镜像标签或ID'
-                },
-                {
-                    flags: '--json',
-                    desc: '以 JSON 形式展示结果'
-                }
-            ],
-            desc: '在指定环境下创建服务'
-        };
-    }
-    execute(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let envCheckType = yield (0, utils_1.checkTcbrEnv)(options.envId, true);
-            if (envCheckType !== 0) {
-                (0, utils_1.logEnvCheck)(options.envId, envCheckType);
-                return;
-            }
-            const { data: serviceDetail } = yield (0, run_1.describeCloudRunServerDetail)({
-                envId: options.envId,
-                serviceName: options.serviceName
-            });
-            if (serviceDetail !== undefined) {
-                throw new error_1.CloudBaseError('当前服务已存在，请使用 tcb run service:deploy 更新服务');
-            }
-            yield (0, run_1.createTcbrService)(options);
-        });
-    }
-};
-__decorate([
-    (0, decorators_1.InjectParams)(),
-    __param(0, (0, decorators_1.ArgsOptions)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], CreateServiceTcbr.prototype, "execute", null);
-CreateServiceTcbr = __decorate([
-    (0, common_1.ICommand)()
-], CreateServiceTcbr);
-exports.CreateServiceTcbr = CreateServiceTcbr;

package/lib/run/create.js

@@ -1,19 +0,0 @@
-"use strict";
-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.createRun = void 0;
-const utils_1 = require("../utils");
-const tcbService = utils_1.CloudApiService.getInstance('tcb');
-const createRun = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    const { Result } = yield tcbService.request('EstablishCloudBaseRunServer', Object.assign(Object.assign({ EnvId: options.envId, ServiceName: options.name, Remark: options.remark, VpcInfo: options.vpcInfo, LogType: options.logType, IsPublic: options.isPublic }, (options.imageRepo ? { ImageRepo: options.imageRepo } : {})), (options.logType === 'es' ? { EsInfo: options.esInfo } : {})));
-    return Result;
-});
-exports.createRun = createRun;

package/lib/run/service/create.js

@@ -1,67 +0,0 @@
-"use strict";
-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.createTcbrService = exports.createCloudRunServer = exports.describeCloudRunServerDetail = void 0;
-const utils_1 = require("../../utils");
-const _1 = require(".");
-const inquirer_1 = __importDefault(require("inquirer"));
-const toolbox_1 = require("@cloudbase/toolbox");
-const describeCloudRunServerDetail = (options) => __awaiter(void 0, void 0, void 0, function* () {
-    return yield (0, utils_1.callTcbrApi)('DescribeCloudRunServerDetail', {
-        EnvId: options.envId,
-        ServerName: options.serviceName,
-    });
-});
-exports.describeCloudRunServerDetail = describeCloudRunServerDetail;
-function createCloudRunServer(serviceConfigOptions) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (0, utils_1.callTcbrApi)('CreateCloudRunServer', serviceConfigOptions);
-    });
-}
-exports.createCloudRunServer = createCloudRunServer;
-function createTcbrService(options) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const newServiceOptions = yield (0, _1.tcbrServiceOptions)(options, false, false);
-        if (!options.noConfirm) {
-            const { confirm } = yield inquirer_1.default.prompt([
-                {
-                    type: 'confirm',
-                    name: 'confirm',
-                    message: '确定要创建服务吗？',
-                }
-            ]);
-            if (!confirm) {
-                return;
-            }
-        }
-        const createRes = yield createCloudRunServer(newServiceOptions);
-        const taskId = (_a = createRes.data) === null || _a === void 0 ? void 0 : _a.TaskId;
-        if (options.json) {
-            console.log(JSON.stringify(createRes, null, 2));
-        }
-        if (process.argv.includes('--verbose')) {
-            yield (0, _1.getLogs)({
-                envId: options.envId,
-                taskId,
-                serviceName: options.serviceName
-            });
-            console.log(`本次任务的 TaskID： ${taskId}`);
-        }
-        else {
-            toolbox_1.logger.success('创建服务成功, 本次任务的 TaskID: ' + taskId);
-        }
-    });
-}
-exports.createTcbrService = createTcbrService;

package/types/commands/env/create.d.ts

@@ -1,12 +0,0 @@
-import { Command } from '../common';
-export declare class CreateCommand extends Command {
-    get options(): {
-        cmd: string;
-        childCmd: string;
-        deprecateCmd: string;
-        options: any[];
-        desc: string;
-        requiredEnvId: boolean;
-    };
-    execute(params: any): Promise<void>;
-}

package/types/commands/run/create.d.ts

@@ -1,13 +0,0 @@
-import { Command } from '../common';
-export declare class CreateRun extends Command {
-    get options(): {
-        cmd: string;
-        childCmd: string;
-        options: {
-            flags: string;
-            desc: string;
-        }[];
-        desc: string;
-    };
-    execute(envId: any, options: any): Promise<void>;
-}

package/types/commands/run/service/create.d.ts

@@ -1,13 +0,0 @@
-import { Command } from '../../common';
-export declare class CreateServiceTcbr extends Command {
-    get options(): {
-        cmd: string;
-        childCmd: string;
-        options: {
-            flags: string;
-            desc: string;
-        }[];
-        desc: string;
-    };
-    execute(options: any): Promise<void>;
-}

package/types/run/create.d.ts

@@ -1,2 +0,0 @@
-import { ICreateRunOptions } from '../types';
-export declare const createRun: (options: ICreateRunOptions) => Promise<any>;

package/types/run/service/create.d.ts

@@ -1,7 +0,0 @@
-import { ITcbrServiceOptions } from '../../types';
-export declare const describeCloudRunServerDetail: (options: {
-    envId: string;
-    serviceName: string;
-}) => Promise<any>;
-export declare function createCloudRunServer(serviceConfigOptions: Record<string, any>): Promise<any>;
-export declare function createTcbrService(options: ITcbrServiceOptions): Promise<void>;