@cloudbase/cli 2.0.13 → 2.0.14

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

@@ -81,6 +81,10 @@ let CreateServiceTcbr = class CreateServiceTcbr extends common_1.Command {
                     flags: '--envParams <envParams>',
                     desc: '环境变量，格式为xx=a&yy=b，默认为空'
                 },
+                {
+                    flags: '--log_type <log_type>',
+                    desc: '日志类型，只能为 none，如需自定义日志，请前往控制台配置'
+                },
                 {
                     flags: '--containerPort <containerPort>',
                     desc: '监听端口，必填'

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

@@ -80,6 +80,10 @@ let DeployServiceTcbr = class DeployServiceTcbr extends common_1.Command {
                     flags: '--envParams <envParams>',
                     desc: '环境变量，格式为xx=a&yy=b，默认为空'
                 },
+                {
+                    flags: '--log_type <log_type>',
+                    desc: '日志类型，只能为 none，如需自定义日志，请前往控制台配置'
+                },
                 {
                     flags: '--containerPort <containerPort>',
                     desc: '监听端口，必填'

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

@@ -80,6 +80,10 @@ let UpdateServiceTcbr = class UpdateServiceTcbr extends common_1.Command {
                     flags: '--envParams <envParams>',
                     desc: '环境变量，格式为xx=a&yy=b，默认为空'
                 },
+                {
+                    flags: '--log_type <log_type>',
+                    desc: '日志类型，只能为 none，如需自定义日志，请前往控制台配置'
+                },
                 {
                     flags: '--containerPort <containerPort>',
                     desc: '监听端口，必填'

package/lib/run/service/common.js

@@ -87,7 +87,7 @@ function checkRequiredParams(options) {
 }
 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, custom_image, library_image, json: _json = false } = options;
+        let { noConfirm: _noConfirm = false, override: _override = (defaultOverride || false), envId, serviceName, path, cpu, mem, minNum, maxNum, policyDetails, customLogs, envParams, containerPort, remark, targetDir, dockerfile, image, custom_image, library_image, log_type, json: _json = false } = options;
         checkRequiredParams({
             envId,
             serviceName,
@@ -111,7 +111,10 @@ function tcbrServiceOptions(options, isCreated, defaultOverride, previousServerC
             maxNum,
             minNum
         });
-        const defaultLogType = 'none';
+        if (log_type && log_type !== "none") {
+            throw new toolbox_1.CloudBaseError('日志类型 log_type 只能为 none，如需自定义日志，请前往控制台配置');
+        }
+        const defaultLogType = "none";
         const newServiceOptions = {
             ServerName: serviceName,
             EnvId: envId,
@@ -132,7 +135,10 @@ function tcbrServiceOptions(options, isCreated, defaultOverride, previousServerC
                 Port: containerPort,
                 HasDockerfile: true,
                 Dockerfile: dockerfile || 'Dockerfile',
-                LogType: defaultLogType
+                LogType: (0, utils_1.parseInputParam)(log_type, _override, null, previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogType, defaultLogType),
+                LogSetId: previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogSetId,
+                LogTopicId: previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogTopicId,
+                LogParseType: previousServerConfig === null || previousServerConfig === void 0 ? void 0 : previousServerConfig.LogParseType,
             },
             DeployInfo: Object.assign({}, DeployInfo)
         };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.0.13",
+    "version": "2.0.14",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {

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

@@ -27,7 +27,10 @@ export declare function tcbrServiceOptions(options: ITcbrServiceOptions, isCreat
         Port: number;
         HasDockerfile: boolean;
         Dockerfile: string;
-        LogType: string;
+        LogType: any;
+        LogSetId: any;
+        LogTopicId: any;
+        LogParseType: any;
     };
     DeployInfo: any;
 }>;

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 {