Merge pull request #76 from devsapp/feat-SessionAffinityConfig

feat: support sessionAffinityConfig

Author: rsonghuster

__tests__/e2e/ci-mac-linux.sh

@@ -47,6 +47,13 @@ s remove -y
 rm -rf ./target
 cd ..
 
+echo "test php runtime with session config"
+cd php
+export fc_component_function_name=php-$(uname)-$(uname -m)-$RANDSTR
+s deploy -y
+s info
+s remove -y
+cd ..
 
 echo "test custom go runtime ..."
 cd custom

__tests__/e2e/php/s.yaml

@@ -16,4 +16,10 @@ resources:
       code: ./code
       timeout: 30
       handler: index.handler
-      memorySize: 128
+      memorySize: 2048
+      instanceIsolationMode: SESSION_EXCLUSIVE
+      sessionAffinity: GENERATED_COOKIE
+      sessionAffinityConfig:
+        sessionConcurrencyPerInstance: 1
+        sessionIdleTimeoutInSeconds: 1800
+        sessionTTLInSeconds: 21600

__tests__/it/integration_test.ts

@@ -87,6 +87,8 @@ describe('Integration Tests', () => {
       role: '',
       runtime: 'python3.9',
       timeout: 60,
+      instanceIsolationMode: "SHARE",
+      sessionAffinity: "NONE",
       asyncInvokeConfig: undefined,
       concurrencyConfig: undefined,
       customDomain: undefined,
@@ -129,6 +131,8 @@ describe('Integration Tests', () => {
       runtime: 'python3.9',
       timeout: 60,
       disableOndemand: false,
+      instanceIsolationMode: "SHARE",
+      sessionAffinity: "NONE",
       triggers: [
         {
           description: 'xxxx',

package-lock.json

@@ -24,7 +24,7 @@
   "dependencies": {
     "@alicloud/devs20230714": "^2.4.5",
     "@alicloud/fc2": "^2.6.6",
-    "@alicloud/fc20230330": "4.3.4",
+    "@alicloud/fc20230330": "4.4.0",
     "@alicloud/pop-core": "^1.8.0",
     "@serverless-cd/srm-aliyun-pop-core": "^0.0.8-beta.1",
     "@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9",

package.json

@@ -40,6 +40,8 @@ export const FC_RESOURCES_EMPTY_CONFIG = {
   },
   environmentVariables: {},
   layers: [],
+  instanceIsolationMode: 'SHARE',
+  sessionAffinity: 'NONE',
 };
 
 export const FC_TRIGGER_DEFAULT_CONFIG = {

src/default/config.ts

@@ -102,6 +102,14 @@ export interface ITracingConfig {
   type?: string;
 }
 
+export interface ISessionAffinityConfig {
+  sessionConcurrencyPerInstance?: number;
+  sessionIdleTimeoutInSeconds?: number;
+  sessionTTLInSeconds?: number;
+  affinityHeaderFieldName?: string;
+  sseEndpointPath?: string;
+}
+
 export interface IVpcConfig {
   securityGroupId: string;
   vSwitchIds: string[] | 'auto';
@@ -126,6 +134,8 @@ export interface IFunction {
   memorySize?: number;
   timeout?: number;
   sessionAffinity?: string;
+  sessionAffinityConfig?: ISessionAffinityConfig | string;
+  instanceIsolationMode?: string;
   enableLongLiving?: boolean;
 
   logConfig?: 'auto' | ILogConfig;

src/interface/function.ts

@@ -517,6 +517,10 @@ export default class FC extends FC_Client {
       _.unset(body.customContainerConfig, 'entrypoint');
     }
 
+    if (body.sessionAffinityConfig) {
+      body.sessionAffinityConfig = JSON.parse(body.sessionAffinityConfig);
+    }
+
     if (body.layers) {
       logger.debug(body.layers);
       const newLayers = [];

src/resources/fc/index.ts

@@ -884,6 +884,26 @@
             ],
             "type": "string"
         },
+        "ISessionAffinityConfig": {
+            "properties": {
+                "affinityHeaderFieldName": {
+                    "type": "string"
+                },
+                "sessionConcurrencyPerInstance": {
+                    "type": "number"
+                },
+                "sessionIdleTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "sessionTTLInSeconds": {
+                    "type": "number"
+                },
+                "sseEndpointPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "ITags": {
             "properties": {
                 "key": {
@@ -1173,6 +1193,9 @@
         "handler": {
             "type": "string"
         },
+        "instanceIsolationMode": {
+            "type": "string"
+        },
         "instanceLifecycleConfig": {
             "properties": {
                 "initializer": {
@@ -1240,6 +1263,16 @@
         "sessionAffinity": {
             "type": "string"
         },
+        "sessionAffinityConfig": {
+            "anyOf": [
+                {
+                    "$ref": "#/definitions/ISessionAffinityConfig"
+                },
+                {
+                    "type": "string"
+                }
+            ]
+        },
         "tags": {
             "items": {
                 "$ref": "#/definitions/ITags"

src/schema.json

@@ -110,9 +110,15 @@ export default class Service extends Base {
         await this._pushImage();
       }
     }
-
     // 部署函数
     const config = _.defaults(this.local, FC_RESOURCES_EMPTY_CONFIG);
+    if (
+      !_.isEmpty(config.sessionAffinityConfig) &&
+      typeof config.sessionAffinityConfig !== 'string'
+    ) {
+      logger.debug('sessionAffinityConfig', config.sessionAffinityConfig);
+      config.sessionAffinityConfig = JSON.stringify(config.sessionAffinityConfig);
+    }
     await this.fcSdk.deployFunction(config, {
       slsAuto: !_.isEmpty(this.createResource.sls),
       type: this.type,
@@ -146,6 +152,14 @@ export default class Service extends Base {
       _.unset(this.remote, 'resourceGroupId');
     }
 
+    if (_.get(this.remote, 'instanceIsolationMode') === 'SHARE') {
+      _.unset(this.remote, 'instanceIsolationMode');
+    }
+
+    if (_.get(this.remote, 'sessionAffinity') === 'NONE') {
+      _.unset(this.remote, 'sessionAffinity');
+    }
+
     _.unset(this.local, 'endpoint');
     const { code } = this.local;
     _.unset(this.local, 'code');
@@ -390,7 +404,7 @@ vpcConfig:
         _.set(this.local, 'vpcConfig', vpcConfig);
       }
       if (nasAuto) {
-        let modelConfig = supplement?.modelConfig || annotations?.modelConfig;
+        const modelConfig = supplement?.modelConfig || annotations?.modelConfig;
 
         logger.write(
           yellow(`Created nas resource succeeded, please replace nasConfig: auto in yaml with: