@cloudbase/cli 1.12.7-alpha.3 → 2.0.1

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

@@ -0,0 +1,115 @@
+"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.ListServiceTcbr = void 0;
+const common_1 = require("../../common");
+const decorators_1 = require("../../../decorators");
+const run_1 = require("../../../run");
+const utils_1 = require("../../../utils");
+const checkTcbrEnv_1 = require("../../../utils/checkTcbrEnv");
+let ListServiceTcbr = class ListServiceTcbr extends common_1.Command {
+    get options() {
+        return {
+            cmd: 'run',
+            childCmd: 'service:list',
+            options: [
+                {
+                    flags: '-e, --envId <envId>',
+                    desc: '环境 Id'
+                },
+                {
+                    flags: '-s, --serviceName <serviceName>',
+                    desc: '服务名'
+                },
+                {
+                    flags: '--json',
+                    desc: '以 JSON 形式展示结果'
+                }
+            ],
+            desc: '展示环境下服务信息'
+        };
+    }
+    execute(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { envId, serviceName = '' } = options;
+            let envCheckType = yield (0, checkTcbrEnv_1.checkTcbrEnv)(envId, true);
+            if (envCheckType !== 0) {
+                (0, checkTcbrEnv_1.logEnvCheck)(envId, envCheckType);
+                return;
+            }
+            const loading = (0, utils_1.loadingFactory)();
+            const head = ['服务名称', '状态', '公网访问', '创建时间', '更新时间'];
+            loading.start('正在获取服务列表');
+            const serverList = yield (0, run_1.listService)({
+                envId: envId
+            });
+            loading.stop();
+            const specificServer = serverList.filter(serverItem => serverItem.ServerName === serviceName);
+            if (options.json) {
+                console.log(JSON.stringify({
+                    code: 0,
+                    errmsg: 'success',
+                    data: specificServer.length ?
+                        specificServer
+                        : serverList
+                }, null, 2));
+                return;
+            }
+            if (!serverList.length) {
+                console.log('当前环境下没有服务');
+                return;
+            }
+            let tableData;
+            if (specificServer.length) {
+                tableData = [[
+                        specificServer[0].ServerName,
+                        specificServer[0].Status,
+                        `是 ${(0, utils_1.genClickableLink)(specificServer[0].DefaultDomainName)}`,
+                        specificServer[0].CreatedTime,
+                        specificServer[0].UpdateTime
+                    ]];
+            }
+            else {
+                tableData = serverList.map(serverItem => [
+                    serverItem.ServerName,
+                    serverItem.Status,
+                    `是 ${(0, utils_1.genClickableLink)(serverItem.DefaultDomainName)}`,
+                    serverItem.CreatedTime,
+                    serverItem.UpdateTime
+                ]);
+            }
+            (0, utils_1.printHorizontalTable)(head, tableData);
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.ArgsOptions)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], ListServiceTcbr.prototype, "execute", null);
+ListServiceTcbr = __decorate([
+    (0, common_1.ICommand)()
+], ListServiceTcbr);
+exports.ListServiceTcbr = ListServiceTcbr;

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

@@ -0,0 +1,132 @@
+"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.UpdateServiceTcbr = void 0;
+const common_1 = require("../../common");
+const decorators_1 = require("../../../decorators");
+const run_1 = require("../../../run");
+const utils_1 = require("../../../utils");
+let UpdateServiceTcbr = class UpdateServiceTcbr extends common_1.Command {
+    get options() {
+        return {
+            cmd: 'run',
+            childCmd: 'service:deploy',
+            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: '--dockerfile <dockerfile>',
+                    desc: 'Dockerfile文件名，默认为 Dockerfile'
+                },
+                {
+                    flags: '--library_image <library_image>',
+                    desc: '线上镜像仓库的 tag'
+                },
+                {
+                    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;
+            }
+            yield (0, run_1.updateTcbrService)(options);
+        });
+    }
+};
+__decorate([
+    (0, decorators_1.InjectParams)(),
+    __param(0, (0, decorators_1.ArgsOptions)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], UpdateServiceTcbr.prototype, "execute", null);
+UpdateServiceTcbr = __decorate([
+    (0, common_1.ICommand)()
+], UpdateServiceTcbr);
+exports.UpdateServiceTcbr = UpdateServiceTcbr;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.versionCommonOptions = void 0;
 const versionCommonOptions = (sub) => ({
-    cmd: 'run',
+    cmd: 'run:deprecated',
     childCmd: {
         cmd: 'version',
         desc: '云托管版本管理'

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

@@ -115,6 +115,11 @@ let CreateVersion = class CreateVersion extends common_1.Command {
     }
     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 = '', 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) {
                 throw new error_1.CloudBaseError('必须输入 serviceName');

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

@@ -47,6 +47,11 @@ let DeleteVersion = class DeleteVersion extends common_1.Command {
     }
     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('必须输入 serviceName 和 versionName');

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

@@ -55,6 +55,11 @@ let ListVersion = class ListVersion extends common_1.Command {
     }
     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);

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

@@ -110,6 +110,11 @@ let ModifyVersion = class ModifyVersion extends common_1.Command {
     }
     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('请填入有效云托管服务名');

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

@@ -134,6 +134,11 @@ let UpdateVersion = class UpdateVersion extends common_1.Command {
     }
     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('必须输入 serviceName 和 versionName');

package/lib/constant.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConcurrencyTaskStatus = exports.StatusMap = exports.ALL_COMMANDS = exports.STATUS_TEXT = exports.REQUEST_TIMEOUT = exports.DefaultCloudBaseConfig = exports.DefaultFunctionDeployConfig = exports.ConfigItems = void 0;
+exports.DEFAULT_CPU_MEM_SET = exports.CPU_MEM_OPTS = exports.ConcurrencyTaskStatus = exports.StatusMap = exports.ALL_COMMANDS = exports.STATUS_TEXT = exports.REQUEST_TIMEOUT = exports.DefaultCloudBaseConfig = exports.DefaultFunctionDeployConfig = exports.ConfigItems = void 0;
 class ConfigItems {
 }
 exports.ConfigItems = ConfigItems;
@@ -99,3 +99,22 @@ exports.ConcurrencyTaskStatus = {
     InProgress: '进行中',
     Failed: '失败'
 };
+exports.CPU_MEM_OPTS = [
+    { cpu: 0.25, mems: [0.5] },
+    { cpu: 0.5, mems: [1] },
+    { cpu: 1, mems: [2] },
+    { cpu: 2, mems: [4] },
+    { cpu: 4, mems: [8] },
+    { cpu: 8, mems: [16] },
+    { cpu: 16, mems: [32] },
+];
+exports.DEFAULT_CPU_MEM_SET = [
+    {
+        PolicyType: 'mem',
+        PolicyThreshold: 60
+    },
+    {
+        PolicyType: 'cpu',
+        PolicyThreshold: 60
+    },
+];

package/lib/help.js

@@ -6,45 +6,47 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.outputHelpInfo = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const outputHelpInfo = () => {
-    const commands = `
-  命令
-
-    login           [options]                  登录腾讯云账号
-    logout                                     登出腾讯云账号
-    env             [cmd]                      环境管理操作
-    fn              [cmd]                      操作函数
-    framework       [cmd]                      云开发 Serverless 应用框架操作
-    hosting         [cmd]                      静态托管资源管理操作
-    new             [appName] [template]       创建新的云开发应用
-    open            [link]                     在浏览器中打开云开发相关连接
-    storage         [cmd]                      云存储资源管理操作
-    service         [cmd]                      HTTP 访问服务管理操作`;
-    const options = `
-  选项
-
-    --verbose                                  打印出内部运行信息
-    -r, --region <region>                      指定环境地域
-    --mode <mode>                              指定加载 env 文件的环境
-    --config-file <path>                       指定配置文件路径
-    -v, --version                              输出当前版本
+    const commands = `
+  命令
+
+    login           [options]                  登录腾讯云账号
+    logout                                     登出腾讯云账号
+    env             [cmd]                      环境管理操作
+    fn              [cmd]                      操作函数
+    framework       [cmd]                      云开发 Serverless 应用框架操作
+    hosting         [cmd]                      静态托管资源管理操作
+    new             [appName] [template]       创建新的云开发应用
+    open            [link]                     在浏览器中打开云开发相关连接
+    storage         [cmd]                      云存储资源管理操作
+    service         [cmd]                      HTTP 访问服务管理操作
+    run:deprecated  [cmd]                      云托管环境管理操作 (BAAS 或 RUN 类型环境)
+    run             [cmd]                      云托管环境管理操作 (TCBR 类型环境)`;
+    const options = `
+  选项
+
+    --verbose                                  打印出内部运行信息
+    -r, --region <region>                      指定环境地域
+    --mode <mode>                              指定加载 env 文件的环境
+    --config-file <path>                       指定配置文件路径
+    -v, --version                              输出当前版本
     -h, --help                                 查看命令帮助信息`;
-    const tips = `
-  Tips:
-
-    ${chalk_1.default.gray('–')} 登录
-
-      ${chalk_1.default.cyan('$ tcb login')}
-
-    ${chalk_1.default.gray('–')} 创建新的云开发应用
-
-      ${chalk_1.default.cyan('$ tcb new appName')}
-
-    ${chalk_1.default.gray('–')} 部署云函数
-
-      ${chalk_1.default.cyan('$ tcb fn deploy')}
-
-    ${chalk_1.default.gray('–')} 查看命令使用介绍
-
+    const tips = `
+  Tips:
+
+    ${chalk_1.default.gray('–')} 登录
+
+      ${chalk_1.default.cyan('$ tcb login')}
+
+    ${chalk_1.default.gray('–')} 创建新的云开发应用
+
+      ${chalk_1.default.cyan('$ tcb new appName')}
+
+    ${chalk_1.default.gray('–')} 部署云函数
+
+      ${chalk_1.default.cyan('$ tcb fn deploy')}
+
+    ${chalk_1.default.gray('–')} 查看命令使用介绍
+
       ${chalk_1.default.cyan('$ tcb fn -h')}`;
     console.log(commands, '\n', options, '\n', tips);
 };

package/lib/run/index.js

@@ -21,3 +21,4 @@ __exportStar(require("./image"), exports);
 __exportStar(require("./delete"), exports);
 __exportStar(require("./repo"), exports);
 __exportStar(require("./standalonegateway"), exports);
+__exportStar(require("./service"), exports);

package/lib/run/service/common.js

@@ -0,0 +1,163 @@
+"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.tcbrServiceOptions = exports.mergeEnvParams = exports.parseEnvParams = exports.extractPolicyDetails = exports.convertNumber = exports.describeWxCloudBaseRunReleaseOrder = void 0;
+const utils_1 = require("../../utils");
+const toolbox_1 = require("@cloudbase/toolbox");
+const index_1 = require("./index");
+const __1 = require("..");
+const constant_1 = require("../../constant");
+const tcbService = utils_1.CloudApiService.getInstance('tcb');
+function describeWxCloudBaseRunReleaseOrder(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const res = yield tcbService.request('DescribeWxCloudBaseRunReleaseOrder', {
+            EnvId: options.envId,
+            ServerName: options.serviceName
+        });
+        return res;
+    });
+}
+exports.describeWxCloudBaseRunReleaseOrder = describeWxCloudBaseRunReleaseOrder;
+const convertNumber = (item) => {
+    if (isNaN(Number(item))) {
+        throw new toolbox_1.CloudBaseError(`${item} 必须为数字`);
+    }
+    return Number(item);
+};
+exports.convertNumber = convertNumber;
+const extractPolicyDetails = (policyDetails) => {
+    return policyDetails.split('&').map(condition => {
+        let [type, threshold] = [condition.split('=')[0], Number(condition.split('=')[1])];
+        if (isNaN(threshold) || !['cpu', 'mem'].includes(type)) {
+            throw new toolbox_1.CloudBaseError('请输入合法的缩扩容配置');
+        }
+        return {
+            PolicyType: type,
+            PolicyThreshold: threshold
+        };
+    });
+};
+exports.extractPolicyDetails = extractPolicyDetails;
+const parseEnvParams = (envParams) => {
+    return envParams.split('&').reduce((acc, cur) => {
+        const [key, value] = cur.split('=');
+        acc[key] = value;
+        return acc;
+    }, {});
+};
+exports.parseEnvParams = parseEnvParams;
+const mergeEnvParams = (curEnvParams, preEnvParams) => {
+    const curEnv = (0, exports.parseEnvParams)(curEnvParams);
+    const preEnv = preEnvParams ? JSON.parse(preEnvParams) : {};
+    const curEnvKeys = Object.keys(curEnv);
+    Object.entries(preEnv).forEach(([key, value]) => {
+        if (!curEnvKeys.includes(key)) {
+            curEnv[key] = value;
+        }
+    });
+    return JSON.stringify(curEnv);
+};
+exports.mergeEnvParams = mergeEnvParams;
+function checkRequiredParams(options) {
+    if (!options.envId) {
+        throw new toolbox_1.CloudBaseError('必须使用 -e 或 --envId 指定环境ID');
+    }
+    if (!options.serviceName) {
+        throw new toolbox_1.CloudBaseError('必须使用 -s 或 --serviceName 指定服务名');
+    }
+    if (!options.containerPort) {
+        throw new toolbox_1.CloudBaseError('必须使用 --containerPort 指定监听端口号');
+    }
+    if (!options.isCreated && !options.path) {
+        throw new toolbox_1.CloudBaseError('请使用 --path 指定代码根目录');
+    }
+    if (options.isCreated && !options.path && !options.library_image && !options.image) {
+        throw new toolbox_1.CloudBaseError('请使用 --path 指定代码根目录或 --library_image 指定线上镜像 tag ');
+    }
+}
+function tcbrServiceOptions(options, isCreated, defaultOverride, previousServerConfig) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let { noConfirm: _noConfirm = false, override: _override = (defaultOverride || false), envId, serviceName, path, cpu, mem, minNum, maxNum, policyDetails, customLogs, envParams, containerPort, remark, targetDir, dockerfile, image, library_image, json: _json = false } = options;
+        checkRequiredParams({
+            envId,
+            serviceName,
+            containerPort,
+            isCreated,
+            path,
+            library_image,
+            image
+        });
+        containerPort = Number(containerPort);
+        const DeployInfo = {
+            DeployType: library_image || image
+                ? 'image'
+                : 'package',
+            DeployRemark: remark || '',
+        };
+        let { cpuConverted, memConverted, maxNumConverted, minNumConverted } = (0, utils_1.parseOptionalParams)({
+            cpu,
+            mem,
+            maxNum,
+            minNum
+        });
+        const newServiceOptions = {
+            ServerName: serviceName,
+            EnvId: envId,
+            ServerConfig: {
+                EnvId: envId,
+                MaxNum: (0, utils_1.parseInputParam)(maxNumConverted, _override, exports.convertNumber, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.MaxNum, 50),
+                MinNum: (0, utils_1.parseInputParam)(minNumConverted, _override, exports.convertNumber, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.MinNum, 0),
+                BuildDir: (0, utils_1.parseInputParam)(targetDir, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.BuildDir, '.'),
+                Cpu: (0, utils_1.parseInputParam)(cpuConverted, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.Cpu, 0.5),
+                Mem: (0, utils_1.parseInputParam)(memConverted, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.Mem, 1),
+                OpenAccessTypes: ['PUBLIC'],
+                ServerName: serviceName,
+                InitialDelaySeconds: 2,
+                CustomLogs: (0, utils_1.parseInputParam)(customLogs, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.CustomLogs, 'stdout'),
+                CreateTime: (previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.CreateTime) || (new Date()).toLocaleString().replace(/\//g, '-'),
+                PolicyDetails: (0, utils_1.parseInputParam)(policyDetails, _override, exports.extractPolicyDetails, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.PolicyDetails, constant_1.DEFAULT_CPU_MEM_SET),
+                EnvParams: (0, utils_1.parseInputParam)(envParams, _override, exports.mergeEnvParams, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.EnvParams, '', previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.EnvParams),
+                Port: containerPort,
+                HasDockerfile: true,
+                Dockerfile: dockerfile || 'Dockerfile',
+            },
+            DeployInfo: Object.assign({}, DeployInfo)
+        };
+        if (DeployInfo.DeployType === 'package') {
+            const { PackageName, PackageVersion } = yield (0, index_1.packageDeploy)({
+                envId,
+                serviceName,
+                filePath: path,
+            });
+            DeployInfo.PackageName = PackageName;
+            DeployInfo.PackageVersion = PackageVersion;
+        }
+        else if (DeployInfo.DeployType === 'image') {
+            const imageList = yield (0, __1.listImage)({
+                envId,
+                serviceName
+            });
+            if (library_image) {
+                const imageInfo = imageList.find(({ Tag }) => Tag === library_image);
+                if (!imageInfo) {
+                    throw new toolbox_1.CloudBaseError(`镜像 ${library_image} 不存在`);
+                }
+                DeployInfo.ImageUrl = imageInfo.ImageUrl;
+            }
+            else {
+                throw new toolbox_1.CloudBaseError('暂不支持 --image 参数，请使用 --library_image 指定线上镜像 tag');
+            }
+        }
+        newServiceOptions.DeployInfo = Object.assign({}, DeployInfo);
+        return newServiceOptions;
+    });
+}
+exports.tcbrServiceOptions = tcbrServiceOptions;