@cloudbase/manager-node 4.6.2 → 4.6.3

package/lib/cloudrun/index.js

@@ -11,6 +11,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudRunService = void 0;
 exports.codeToZip = codeToZip;
+exports.parseObjectToDiffConfigItem = parseObjectToDiffConfigItem;
 const archiver_1 = __importDefault(require("archiver"));
 const fs_extra_1 = require("fs-extra");
 const path_1 = __importDefault(require("path"));
@@ -195,7 +196,7 @@ class CloudRunService {
         if (await this._checkFunctionExist(serverName)) {
             // 更新
             const serverDetail = await this.detail({ serverName });
-            const _serverConfig = Object.assign(Object.assign(Object.assign({}, ((serverDetail === null || serverDetail === void 0 ? void 0 : serverDetail.ServerConfig) || {})), serverConfig), ((serverDetail === null || serverDetail === void 0 ? void 0 : serverDetail.ServerConfig.Tag) === 'function:' ? { Port: 3000 } : {}) // 函数型不能指定端口，需要固定为3000
+            const _serverConfig = Object.assign(Object.assign({}, serverConfig), ((serverDetail === null || serverDetail === void 0 ? void 0 : serverDetail.ServerConfig.Tag) === 'function:' ? { Port: 3000 } : {}) // 函数型不能指定端口，需要固定为3000
             );
             deployInfo.ReleaseType = 'FULL';
             return this._upsertFunction(false, {
@@ -224,7 +225,13 @@ class CloudRunService {
                     RepoLanguage: 'Node.js'
                 };
             }
-            const _serverConfig = Object.assign(Object.assign(Object.assign({ OpenAccessTypes: ['OA', 'PUBLIC'], Cpu: 0, Mem: 0, MinNum: 0, MaxNum: 0, PolicyDetails: [], EnvParams: JSON.stringify({}), InitialDelaySeconds: 0, CustomLogs: '', HasDockerfile: true, CreateTime: '', EnvId: envConfig.EnvId, ServerName: serverName, Port: type === 'container' ? 80 : 3000, Dockerfile: 'Dockerfile', BuildDir: '' }, serverConfig), (type === 'function' ? { Port: 3000 } : {})), { Tag: type === 'container' ? '' : 'function:' });
+            const _serverConfig = Object.assign(Object.assign(Object.assign({ OpenAccessTypes: ['OA', 'PUBLIC'], 
+                // Cpu: 0,
+                // Mem: 0,
+                MinNum: 0, 
+                // MaxNum: 0,
+                // PolicyDetails: [],
+                EnvParams: JSON.stringify({}), InitialDelaySeconds: 0, CustomLogs: '', HasDockerfile: true, CreateTime: '', EnvId: envConfig.EnvId, ServerName: serverName, Port: type === 'container' ? 80 : 3000, Dockerfile: 'Dockerfile', BuildDir: '' }, serverConfig), (type === 'function' ? { Port: 3000 } : {})), { Tag: type === 'container' ? '' : 'function:' });
             return this._upsertFunction(true, {
                 name: serverName,
                 deployInfo,
@@ -258,11 +265,12 @@ class CloudRunService {
     _upsertFunction(isNew, data) {
         const { name, deployInfo, serverConfig } = data;
         const envConfig = this.environment.lazyEnvironmentConfig;
+        const Items = parseObjectToDiffConfigItem(serverConfig);
         return this.tcbrService.request(isNew ? 'CreateCloudRunServer' : 'UpdateCloudRunServer', {
             EnvId: envConfig.EnvId,
             ServerName: name,
             DeployInfo: deployInfo,
-            ServerConfig: serverConfig
+            Items,
         });
     }
 }
@@ -335,3 +343,60 @@ async function codeToZip(cwd, options) {
     await archive.finalize();
     return bufferPromise;
 }
+/**
+ * 提交参数变化映射
+ */
+const SUBMIT_DIFF_MAP = {
+    Cpu: 'CpuSpecs',
+    Mem: 'MemSpecs',
+    OpenAccessTypes: 'AccessTypes',
+    EnvParams: 'EnvParam',
+    CustomLogs: 'LogPath'
+};
+/**
+ * 将 object 参数转为 [{key:"Port", IntValue:80}] 的格式，并且剔除空字符串
+ */
+function parseObjectToDiffConfigItem(data) {
+    const kvs = Object.entries(data);
+    const Items = [];
+    kvs.forEach(([k, v]) => {
+        const Key = SUBMIT_DIFF_MAP[k] || k;
+        if ([
+            'CustomLogs',
+            'EnvParams',
+            'CreateTime',
+            'Dockerfile',
+            'BuildDir',
+            'LogType',
+            'LogSetId',
+            'LogTopicId',
+            'LogParseType',
+            'Tag',
+            'InternalAccess',
+            'InternalDomain',
+            'OperationMode',
+            'SessionAffinity'
+        ].includes(k)) {
+            !!v && Items.push({ Key, Value: v });
+        }
+        else if (['MinNum', 'MaxNum', 'InitialDelaySeconds', 'Port'].includes(k)) {
+            Items.push({ Key, IntValue: v });
+        }
+        else if (['HasDockerfile'].includes(k)) {
+            Items.push({ Key, BoolValue: v });
+        }
+        else if (['Cpu', 'Mem'].includes(k)) {
+            Items.push({ Key, FloatValue: v });
+        }
+        else if (['OpenAccessTypes', 'EntryPoint', 'Cmd'].includes(k)) {
+            Items.push({ Key, ArrayValue: v });
+        }
+        else if (['PolicyDetails'].includes(k)) {
+            Items.push({ Key, PolicyDetails: v });
+        }
+        else if (['TimerScale'].includes(k)) {
+            Items.push({ Key, TimerScale: v });
+        }
+    });
+    return Items;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "4.6.2",
+    "version": "4.6.3",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {

package/types/cloudrun/index.d.ts

@@ -1,6 +1,6 @@
 import { Environment } from '../environment';
 import { IResponseInfo } from '../interfaces';
-import { CloudrunServerType, ICloudrunDetailResponse, ICloudrunListResponse, ICloudrunServerBaseConfig, ITemplate } from './type';
+import { CloudrunServerType, ICloudrunDetailResponse, ICloudrunListResponse, ICloudrunServerBaseConfig, ICloudrunServerBaseInfo, IDiffConfigItem, ITemplate } from './type';
 /**
  * 云托管服务管理类
  * 提供云托管服务的初始化、下载、列表查询和删除等功能
@@ -112,3 +112,7 @@ export declare class CloudRunService {
 export declare function codeToZip(cwd: string, options?: {
     installDependency?: boolean;
 }): Promise<Buffer>;
+/**
+ * 将 object 参数转为 [{key:"Port", IntValue:80}] 的格式，并且剔除空字符串
+ */
+export declare function parseObjectToDiffConfigItem(data: Partial<ICloudrunServerBaseInfo>): IDiffConfigItem[];

package/types/cloudrun/type.d.ts

@@ -246,6 +246,16 @@ export interface ICloudrunServerBaseConfig {
      */
     Cmd?: string[];
 }
+export interface IDiffConfigItem {
+    Key: string;
+    Value?: string;
+    IntValue?: number;
+    BoolValue?: boolean;
+    FloatValue?: number;
+    ArrayValue?: string[];
+    PolicyDetails?: ICloudrunHpaPolicy[];
+    TimerScale?: ICloudrunTimerScale[];
+}
 /**
  * 在线版本信息
  */