@cloudbase/cli 2.9.5 → 2.9.6

package/lib/commands/cloudrun/base.js

@@ -79,6 +79,10 @@ const AccessType = {
     MINIAPP: 'MINIAPP',
     VPC: 'VPC'
 };
+const ResourceTitle = {
+    container: '容器型云托管',
+    function: '函数型云托管'
+};
 function getCloudrunService(envId) {
     return __awaiter(this, void 0, void 0, function* () {
         const region = yield (0, toolbox_1.getRegion)();
@@ -598,12 +602,17 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                 }
                 serviceName = yield _inputServiceName(defaultName);
             }
+            const containerConfigFile = 'container.config.json';
+            const containerConfigPath = path_1.default.join(targetDir, containerConfigFile);
+            if (yield fs_extra_1.default.pathExists(containerConfigPath)) {
+                log.warn(`CLI 中 ${containerConfigFile} 文件将不会生效，请通过命令行参数进行配置！`);
+            }
             if (!force) {
                 const answers = yield inquirer_1.default.prompt([
                     {
                         type: 'confirm',
                         name: 'confirm',
-                        message: `即将开始部署，是否确认继续？`,
+                        message: '即将开始部署，是否确认继续？',
                         default: true
                     }
                 ]);
@@ -643,29 +652,25 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
             function _runDeploy() {
                 return __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const res = serverType === 'function'
-                            ? yield iac_core_1.IAC.FunctionV2.apply({
-                                cwd: targetDir,
-                                envId: envId,
-                                name: serviceName
-                            }, function (message) {
-                                (0, utils_2.trackCallback)(message, log);
-                            })
-                            : yield iac_core_1.IAC.Cloudrun.apply({
-                                cwd: targetDir,
-                                envId: envId,
-                                name: serviceName,
-                                port: port ? Number(port) : undefined
-                            }, function (message) {
-                                (0, utils_2.trackCallback)(message, log);
-                            });
+                        utils_2.trackCallback === null || utils_2.trackCallback === void 0 ? void 0 : (0, utils_2.trackCallback)({
+                            details: `正在提交${ResourceTitle[serverType]} ${serviceName} 中，请稍候...`,
+                            status: 'progress'
+                        }, log);
+                        yield cloudrunService.deploy({
+                            serverName: serviceName,
+                            targetPath: targetDir,
+                            serverConfig: Object.assign({}, (port ? { Port: Number(port) } : {}))
+                        });
+                        utils_2.trackCallback === null || utils_2.trackCallback === void 0 ? void 0 : (0, utils_2.trackCallback)({
+                            details: `提交${ResourceTitle[serverType]} ${serviceName} 已完成！`,
+                            status: 'done'
+                        }, log);
                         yield (0, utils_2.upsertCloudbaserc)(targetDir, {
                             envId,
                             cloudrun: { name: serviceName }
                         });
-                        const { envId: _envId, name, resourceType: _resourceType } = res === null || res === void 0 ? void 0 : res.data;
                         (0, utils_2.trackCallback)({
-                            details: `请打开链接查看部署状态: https://tcb.cloud.tencent.com/dev?envId=${_envId}#/platform-run/service/detail?serverName=${name}&tabId=deploy&envId=${_envId}`
+                            details: `请打开链接查看部署状态: https://tcb.cloud.tencent.com/dev?envId=${envId}#/platform-run/service/detail?serverName=${serviceName}&tabId=deploy&envId=${envId}`
                         }, log);
                     }
                     catch (e) {
@@ -675,7 +680,7 @@ let CloudRunDeployCommand = class CloudRunDeployCommand extends common_1.Command
                                 {
                                     type: 'confirm',
                                     name: 'confirm',
-                                    message: `平台当前有部署发布任务正在运行中。确认继续部署，正在执行的部署任务将被取消，并立即部署最新的代码`,
+                                    message: '平台当前有部署发布任务正在运行中。确认继续部署，正在执行的部署任务将被取消，并立即部署最新的代码',
                                     default: true
                                 }
                             ])
@@ -743,11 +748,11 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
             options: [
                 {
                     flags: '--runMode <runMode>',
-                    desc: `运行模式，可选值: normal(普通函数) | agent(函数式 Agent)，默认值: normal`
+                    desc: '运行模式，可选值: normal(普通函数) | agent(函数式 Agent)，默认值: normal'
                 },
                 {
                     flags: '--agentId <agentId>',
-                    desc: `在 agent 模式下需要提供 Agent ID 进行调试`
+                    desc: '在 agent 模式下需要提供 Agent ID 进行调试'
                 },
                 {
                     flags: '-e, --envId <envId>',
@@ -793,7 +798,7 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
                 },
                 {
                     flags: '--open-debug-panel <openDebugPanel>',
-                    desc: `是否打开调试面板，默认为 'true'`
+                    desc: '是否打开调试面板，默认为 \'true\''
                 }
             ],
             requiredEnvId: false,
@@ -828,7 +833,7 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
                         {
                             type: 'input',
                             name: 'agentId',
-                            message: `请输入 Agent ID（如没有请填写任意值）:`,
+                            message: '请输入 Agent ID（如没有请填写任意值）:',
                             validate: (val) => {
                                 return val.trim() ? true : 'Agent ID 不能为空';
                             }
@@ -895,7 +900,7 @@ let CloudRunRunCommand = class CloudRunRunCommand extends common_1.Command {
                     logger.info(`[nodemon ${e.type}] ${e.message}`);
                 })
                     .on('crash', () => {
-                    logger.error(`Server crashed.`);
+                    logger.error('Server crashed.');
                     process.exit(1);
                 })
                     .on('exit', (e) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.9.5",
+    "version": "2.9.6",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -53,7 +53,7 @@
         "@cloudbase/functions-framework": "1.16.0",
         "@cloudbase/iac-core": "0.0.3-alpha.11",
         "@cloudbase/lowcode-cli": "^0.22.2",
-        "@cloudbase/manager-node": "4.6.1",
+        "@cloudbase/manager-node": "4.6.3",
         "@cloudbase/toolbox": "^0.7.9",
         "@dotenvx/dotenvx": "^1.48.3",
         "@musistudio/claude-code-router": "1.0.36",