diff --git a/package-lock.json b/package-lock.json index 43f165b6..f9123eb5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "license": "ISC", "dependencies": { "@alicloud/fc2": "^2.6.6", - "@alicloud/fc20230330": "4.3.2", + "@alicloud/fc20230330": "4.3.3", "@alicloud/pop-core": "^1.8.0", "@serverless-cd/srm-aliyun-pop-core": "^0.0.7-beta.21", "@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9", @@ -201,9 +201,9 @@ } }, "node_modules/@alicloud/fc20230330": { - "version": "4.3.2", - "resolved": "https://registry.npmmirror.com/@alicloud/fc20230330/-/fc20230330-4.3.2.tgz", - "integrity": "sha512-svXf6mbNgLtvCRHM/Z2P8VJXZGoQhyWoosYmFeasMBeNRDaPgGzYOpmY6FedL/4nzSn6Z6gV5DQT4EGz/AKq4Q==", + "version": "4.3.3", + "resolved": "https://registry.npmmirror.com/@alicloud/fc20230330/-/fc20230330-4.3.3.tgz", + "integrity": "sha512-WuKkefJ0oul7+oWuJrCSqRohsNoX2nMt4f+/NnN9UduF77KuDMYP9YvMQXzlZeNf0eot/cc0V4YNQ6zlQihRKg==", "dependencies": { "@alicloud/openapi-core": "^1.0.0", "@darabonba/typescript": "^1.0.0" @@ -16067,9 +16067,9 @@ } }, "@alicloud/fc20230330": { - "version": "4.3.2", - "resolved": "https://registry.npmmirror.com/@alicloud/fc20230330/-/fc20230330-4.3.2.tgz", - "integrity": "sha512-svXf6mbNgLtvCRHM/Z2P8VJXZGoQhyWoosYmFeasMBeNRDaPgGzYOpmY6FedL/4nzSn6Z6gV5DQT4EGz/AKq4Q==", + "version": "4.3.3", + "resolved": "https://registry.npmmirror.com/@alicloud/fc20230330/-/fc20230330-4.3.3.tgz", + "integrity": "sha512-WuKkefJ0oul7+oWuJrCSqRohsNoX2nMt4f+/NnN9UduF77KuDMYP9YvMQXzlZeNf0eot/cc0V4YNQ6zlQihRKg==", "requires": { "@alicloud/openapi-core": "^1.0.0", "@darabonba/typescript": "^1.0.0" diff --git a/package.json b/package.json index f9ec91b9..17a94454 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "license": "ISC", "dependencies": { "@alicloud/fc2": "^2.6.6", - "@alicloud/fc20230330": "4.3.2", + "@alicloud/fc20230330": "4.3.3", "@alicloud/pop-core": "^1.8.0", "@serverless-cd/srm-aliyun-pop-core": "^0.0.7-beta.21", "@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9", diff --git a/src/interface/function.ts b/src/interface/function.ts index 819ff85a..9ad8fefd 100644 --- a/src/interface/function.ts +++ b/src/interface/function.ts @@ -125,6 +125,7 @@ export interface IFunction { memorySize?: number; timeout?: number; sessionAffinity?: string; + enableLongLiving?: boolean; logConfig?: 'auto' | ILogConfig; nasConfig?: 'auto' | INasConfig; diff --git a/src/schema.json b/src/schema.json index 0fff8c56..651e933b 100644 --- a/src/schema.json +++ b/src/schema.json @@ -1148,6 +1148,9 @@ ], "type": "number" }, + "enableLongLiving": { + "type": "boolean" + }, "endpoint": { "type": "string" }, diff --git a/src/subCommands/deploy/impl/function.ts b/src/subCommands/deploy/impl/function.ts index 0915f9cb..38493727 100644 --- a/src/subCommands/deploy/impl/function.ts +++ b/src/subCommands/deploy/impl/function.ts @@ -138,6 +138,10 @@ export default class Service extends Base { return; } + if (_.get(this.remote, 'disableOndemand') === false) { + _.unset(this.remote, 'disableOndemand'); + } + _.unset(this.local, 'endpoint'); const { code } = this.local; _.unset(this.local, 'code'); diff --git a/src/subCommands/plan/index.ts b/src/subCommands/plan/index.ts index 6fee3a67..cdfc9c50 100644 --- a/src/subCommands/plan/index.ts +++ b/src/subCommands/plan/index.ts @@ -115,7 +115,9 @@ export default class Plan { _.unset(local, 'concurrencyConfig'); _.unset(local, 'customContainerConfig.registryConfig'); _.unset(remote, 'functionArn'); - + if (_.get(remote, 'disableOndemand') === false) { + _.unset(remote, 'disableOndemand'); + } const config = FC.replaceFunctionConfig(local, remote); return diffConvertPlanYaml(config.remote, config.local, { deep: 0, complete: true }); }