Merge pull request #57 from devsapp/support-lifecycle

Support lifecycle

Author: rsonghuster

__tests__/ut/resources_acr_test.ts

@@ -241,10 +241,12 @@ describe('replaceFunction', () => {
       instanceLifecycleConfig: {
         initializer: {
           handler: '',
+          command: [],
           timeout: 3,
         },
         preStop: {
           handler: '',
+          command: [],
           timeout: 3,
         },
       },

package-lock.json

@@ -23,15 +23,15 @@
   "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",
     "@serverless-cd/srm-aliyun-sls20201230": "0.0.5-beta.3",
     "@serverless-devs/diff": "^0.0.3-beta.6",
-    "@serverless-devs/downloads": "^0.0.6",
-    "@serverless-devs/load-component": "^0.0.8",
-    "@serverless-devs/utils": "^0.0.16",
+    "@serverless-devs/downloads": "^0.0.7",
+    "@serverless-devs/load-component": "^0.0.9",
+    "@serverless-devs/utils": "^0.0.17",
     "@serverless-devs/zip": "^0.0.3-beta.8",
     "ajv": "^8.17.1",
     "aliyun-sdk": "^1.12.10",

package.json

@@ -5,6 +5,7 @@ export type IRuntime = `${Runtime}`;
 export interface ILifecycleHook {
   handler?: string;
   timeout?: number;
+  command?: string[];
 }
 
 export interface IHealthCheckConfig {
@@ -125,6 +126,7 @@ export interface IFunction {
   memorySize?: number;
   timeout?: number;
   sessionAffinity?: string;
+  enableLongLiving?: boolean;
 
   logConfig?: 'auto' | ILogConfig;
   nasConfig?: 'auto' | INasConfig;

src/interface/function.ts

@@ -92,50 +92,86 @@ export default function (_local: any, _remote: any) {
   // 适配钩子函数配置
   if (!(_.isEmpty(local?.instanceLifecycleConfig) && _.isEmpty(remote?.instanceLifecycleConfig))) {
     const { initializer, preStop } = local.instanceLifecycleConfig || {};
+    if (initializer?.handler && initializer?.command) {
+      throw new Error(
+        'fc3 pre check: command and handler can not be set at the same time in lifecycle Lifecycle.Initializer',
+      );
+    }
+    if (preStop?.handler && preStop?.command) {
+      throw new Error(
+        'fc3 pre check: command and handler can not be set at the same time in lifecycle Lifecycle.PreStop',
+      );
+    }
     const initializerTimeout = _.get(remote, 'instanceLifecycleConfig.initializer.timeout', 3);
     if (
       remote?.instanceLifecycleConfig?.initializer?.handler ||
+      remote?.instanceLifecycleConfig?.initializer?.command ||
       remote?.instanceLifecycleConfig?.initializer?.timeout
     ) {
-      if (initializer?.handler) {
+      if (initializer?.handler || initializer?.command) {
+        if (remote?.instanceLifecycleConfig?.initializer?.handler && initializer?.command) {
+          _.set(local, 'instanceLifecycleConfig.initializer.handler', '');
+        }
+        if (remote?.instanceLifecycleConfig?.initializer?.command && initializer?.handler) {
+          _.set(local, 'instanceLifecycleConfig.initializer.command', []);
+        }
         if (!initializer.timeout) {
           _.set(local, 'instanceLifecycleConfig.initializer.timeout', initializerTimeout);
         }
       } else {
         _.set(local, 'instanceLifecycleConfig.initializer.handler', '');
+        _.set(local, 'instanceLifecycleConfig.initializer.command', []);
         _.set(local, 'instanceLifecycleConfig.initializer.timeout', 3);
       }
-    } else if (initializer?.handler && !initializer.timeout) {
+    } else if ((initializer?.command || initializer?.handler) && !initializer.timeout) {
       _.set(local, 'instanceLifecycleConfig.initializer.timeout', initializerTimeout);
     }
 
     const preStopTimeout = _.get(remote, 'instanceLifecycleConfig.preStop.timeout', 3);
     if (
       remote?.instanceLifecycleConfig?.preStop?.handler ||
+      remote?.instanceLifecycleConfig?.preStop?.command ||
       remote?.instanceLifecycleConfig?.preStop?.timeout
     ) {
-      if (preStop?.handler) {
+      if (preStop?.handler || preStop?.command) {
+        if (remote?.instanceLifecycleConfig?.preStop?.handler && preStop?.command) {
+          _.set(local, 'instanceLifecycleConfig.preStop.handler', '');
+        }
+        if (remote?.instanceLifecycleConfig?.preStop?.command && preStop?.handler) {
+          _.set(local, 'instanceLifecycleConfig.preStop.command', []);
+        }
         if (!preStop.timeout) {
           _.set(local, 'instanceLifecycleConfig.preStop.timeout', preStopTimeout);
         }
       } else {
         _.set(local, 'instanceLifecycleConfig.preStop.handler', '');
+        _.set(local, 'instanceLifecycleConfig.preStop.command', []);
         _.set(local, 'instanceLifecycleConfig.preStop.timeout', 3);
       }
-    } else if (preStop?.handler && !preStop.timeout) {
+    } else if ((preStop?.command || preStop?.handler) && !preStop.timeout) {
       _.set(local, 'instanceLifecycleConfig.preStop.timeout', preStopTimeout);
     }
   }
 
-  // 如果 local 和 remote 都是 handler 为 '', 则从 props 中删除
+  // 如果 local 和 remote 都是 handler 和 command 为 '', 则从 props 中删除
   if (local?.instanceLifecycleConfig && remote?.instanceLifecycleConfig) {
     const { initializer: initializerL, preStop: preStopL } = local.instanceLifecycleConfig || {};
     const { initializer: initializerR, preStop: preStopR } = remote.instanceLifecycleConfig || {};
-    if (initializerL?.handler === initializerR?.handler && initializerL?.handler === '') {
+    if (
+      initializerL?.handler === initializerR?.handler &&
+      initializerL?.handler === '' &&
+      _.isEqual(initializerL?.command, initializerR?.command) &&
+      _.isEmpty(initializerL?.command)
+    ) {
       _.unset(local, 'instanceLifecycleConfig.initializer');
       _.unset(remote, 'instanceLifecycleConfig.initializer');
     }
-    if (preStopL?.handler === preStopR?.handler && preStopL?.handler === '') {
+    if (
+      preStopL?.handler === preStopR?.handler &&
+      preStopL?.handler === '' &&
+      _.isEqual(preStopL?.command, preStopR?.command) &&
+      _.isEmpty(preStopL?.command)
+    ) {
       _.unset(local, 'instanceLifecycleConfig.preStop');
       _.unset(remote, 'instanceLifecycleConfig.preStop');
     }

src/resources/fc/impl/replace-function-config.ts

@@ -509,6 +509,12 @@
         },
         "ILifecycleHook": {
             "properties": {
+                "command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "handler": {
                     "type": "string"
                 },
@@ -1148,6 +1154,9 @@
             ],
             "type": "number"
         },
+        "enableLongLiving": {
+            "type": "boolean"
+        },
         "endpoint": {
             "type": "string"
         },

src/schema.json

@@ -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');

src/subCommands/deploy/impl/function.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 });
   }