fix: nas config and logConfig

Author: liuzewen99

__tests__/e2e/ci-mac-linux.sh

@@ -91,6 +91,7 @@ cd ..
 
 echo "test nodejs runtime with provision config mode=drain  ..."
 cd nodejs
+
 export fc_component_function_name=nodejs18-provision-drain-$(uname)-$(uname -m)-$RANDSTR
 s deploy -y -t s_provision_drain.yaml
 s invoke -e '{"hello":"fc nodejs provision config mode=drain"}' -t s_provision_drain.yaml

__tests__/e2e/nodejs/s_oss_config_auto.yaml

@@ -38,4 +38,39 @@ resources:
       handler: index.handler
       memorySize: 128
       timeout: 60
-      ossMountConfig: auto|mountDir=/mnt/test-oss-bucket|bucketPath=/|rules=[{"allowedOrigin":"*","allowedMethod":["GET","POST","PUT","DELETE","HEAD"],"allowedHeader":"*","exposeHeader":"Content-Length","maxAgeSeconds":30}]
+      ossMountConfig: auto|mountDir=/mnt/test-oss-bucket|bucketPath=/|rules=[{"allowedOrigin":"*","allowedMethod":["GET","POST","PUT","DELETE","HEAD"],"allowedHeader":"*","exposeHeader":"Content-Length","maxAgeSeconds":30}]
+
+  fcDemo3: # 业务名称/模块名称
+    component: ${env('fc_component_version', path('../../../'))}
+    actions:
+      pre-deploy:
+        - run: npm install
+          path: ./test-auto-code
+    props: # 组件的属性值
+      region: ${vars.region}
+      functionName: fc3-event-${env('fc_component_function_name', 'nodejs18')}-nasConfig
+      role: acs:ram::${config('AccountID')}:role/aliyunaliyunfcdefaultrole
+      runtime: ${env('fc_component_runtime', 'nodejs18')}
+      code: ./test-auto-code
+      handler: index.handler
+      memorySize: 128
+      timeout: 60
+      nasConfig: auto|mountDir=/custom/nas/mount/path|serverAddr=/custom/nas/mount/path
+      vpcConfig: auto
+
+  fcDemo4: # 业务名称/模块名称
+    component: ${env('fc_component_version', path('../../../'))}
+    actions:
+      pre-deploy:
+        - run: npm install
+          path: ./test-auto-code
+    props: # 组件的属性值
+      region: ${vars.region}
+      functionName: fc3-event-${env('fc_component_function_name', 'nodejs18')}-logConfig
+      role: acs:ram::${config('AccountID')}:role/aliyunaliyunfcdefaultrole
+      runtime: ${env('fc_component_runtime', 'nodejs18')}
+      code: ./test-auto-code
+      handler: index.handler
+      memorySize: 128
+      timeout: 60
+      logConfig: auto|enableRequestMetrics=false|enableInstanceMetrics=false

src/subCommands/deploy/impl/function.ts

@@ -18,7 +18,12 @@ import FC, { GetApiType } from '../../../resources/fc';
 import VPC_NAS from '../../../resources/vpc-nas';
 import Base from './base';
 import { ICredentials } from '@serverless-devs/component-interface';
-import { calculateCRC64, getFileSize } from '../../../utils';
+import {
+  calculateCRC64,
+  getFileSize,
+  parseAutoConfig,
+  validateAndNormalizePath,
+} from '../../../utils';
 import OSS from '../../../resources/oss';
 import { setNodeModulesBinPermissions } from '../../../resources/fc/impl/utils';
 
@@ -349,22 +354,33 @@ export default class Service extends Base {
     if (slsAuto) {
       const sls = new Sls(region, credential as ICredentials);
       const { project, logstore } = await sls.deploy();
+      const logAutoConfig = parseAutoConfig(this.local.logConfig as string);
+      const logParams = logAutoConfig?.params || {};
+      const existingLogConfig =
+        typeof this.local.logConfig === 'object' && this.local.logConfig !== null
+          ? this.local.logConfig
+          : {};
+      const customFields: Record<string, any> = { ...existingLogConfig, ...logParams };
       logger.write(
         yellow(`Created log resource succeeded, please replace logConfig: auto in yaml with:
 logConfig:
-  enableInstanceMetrics: true
-  enableRequestMetrics: true
-  logBeginRule: DefaultRegex
+  enableInstanceMetrics: ${customFields.enableInstanceMetrics}
+  enableRequestMetrics: ${customFields.enableRequestMetrics}
+  logBeginRule: ${customFields.logBeginRule}
   logstore: ${logstore}
   project: ${project}\n`),
       );
+
       this.createResource.sls = { project, logstore };
       _.set(this.local, 'logConfig', {
-        enableInstanceMetrics: true,
-        enableRequestMetrics: true,
-        logBeginRule: 'DefaultRegex',
+        enableInstanceMetrics:
+          'enableInstanceMetrics' in customFields ? customFields.enableInstanceMetrics : true,
+        enableRequestMetrics:
+          'enableRequestMetrics' in customFields ? customFields.enableRequestMetrics : true,
+        logBeginRule: 'logBeginRule' in customFields ? customFields.logBeginRule : 'DefaultRegex',
         logstore,
         project,
+        ...customFields,
       });
     }
 
@@ -443,7 +459,12 @@ vpcConfig:
         _.set(this.local, 'vpcConfig', vpcConfig);
       }
       if (nasAuto) {
-        let serverAddr = `${mountTargetDomain}:/${functionName}`;
+        const { params } = parseAutoConfig(this.local.nasConfig as string);
+        const customMountDir = params.mountDir
+          ? validateAndNormalizePath(params.mountDir, 'mountDir')
+          : `/mnt/${functionName}`;
+        const customServerAddr = params.serverAddr ? params.serverAddr : `${functionName}`;
+        let serverAddr = `${mountTargetDomain}:/${customServerAddr}`;
         if (serverAddr.length > 128) {
           serverAddr = serverAddr.substring(0, 128);
         }
@@ -454,8 +475,9 @@ nasConfig:
   userId: 0
   mountPoints:
     - serverAddr: ${serverAddr}
-      mountDir: /mnt/${functionName}
-      enableTLS: false\n`),
+      mountDir: ${customMountDir}
+      enableTLS: false
+`),
         );
         this.createResource.nas = { mountTargetDomain, fileSystemId };
         _.set(this.local, 'nasConfig', {
@@ -464,7 +486,7 @@ nasConfig:
           mountPoints: [
             {
               serverAddr,
-              mountDir: `/mnt/${functionName}`,
+              mountDir: customMountDir,
               enableTLS: false,
             },
           ],

src/subCommands/model/index.ts

@@ -14,6 +14,7 @@ import { OSSMountPoint, VPCConfig } from '@alicloud/fc20230330';
 import { MODEL_DOWNLOAD_TIMEOUT } from './constants';
 import { initClient } from './utils';
 import * as $Dev20230714 from '@alicloud/devs20230714';
+import { parseAutoConfig, validateAndNormalizePath } from '../../utils';
 
 const commandsList = Object.keys(commandsHelp.subCommands);
 
@@ -239,7 +240,13 @@ vpcConfig:
     }
 
     if (nasAuto) {
-      let serverAddr = `${mountTargetDomain}:/${functionName}`;
+      const nasAutoConfig = parseAutoConfig(this.local.nasConfig as string);
+      const params = nasAutoConfig?.params || {};
+      const customMountDir = params.mountDir
+        ? validateAndNormalizePath(params.mountDir, 'mountDir')
+        : `/mnt/${functionName}`;
+      const customServerAddr = params.serverAddr ? params.serverAddr : `${functionName}`;
+      let serverAddr = `${mountTargetDomain}:/${customServerAddr}`;
       if (serverAddr.length > 128) {
         serverAddr = serverAddr.substring(0, 128);
       }
@@ -250,7 +257,7 @@ groupId: 0
 userId: 0
 mountPoints:
   - serverAddr: ${serverAddr}
-    mountDir: /mnt/${functionName}
+    mountDir: ${customMountDir}
     enableTLS: false\n`),
       );
       this.createResource.nas = { mountTargetDomain, fileSystemId };
@@ -260,7 +267,7 @@ mountPoints:
         mountPoints: [
           {
             serverAddr,
-            mountDir: `/mnt/${functionName}`,
+            mountDir: customMountDir,
             enableTLS: false,
           },
         ],

src/utils/index.ts

@@ -49,6 +49,40 @@ export const isAuto = (config: unknown): boolean => {
   return _.toUpper(autoConfig) === 'AUTO';
 };
 
+export const parseAutoConfig = (
+  config: string,
+): { isAuto: boolean; params: Record<string, any> } => {
+  if (!_.isString(config)) {
+    return { isAuto: false, params: {} };
+  }
+
+  const parts = config.split('|');
+  const baseConfig = parts[0];
+  logger.debug(`parseAutoConfig, baseConfig = ${baseConfig}`);
+
+  if (_.toUpper(baseConfig) === 'AUTO') {
+    const params: Record<string, any> = {};
+    for (let i = 1; i < parts.length; i++) {
+      const [key, value] = parts[i].split('=');
+      if (key && value) {
+        const trimmedValue = value.trim();
+        if (typeof trimmedValue === 'string') {
+          try {
+            params[key.trim()] = JSON.parse(trimmedValue);
+          } catch (error) {
+            params[key.trim()] = trimmedValue;
+          }
+        } else {
+          params[key.trim()] = trimmedValue;
+        }
+      }
+    }
+    return { isAuto: true, params };
+  }
+
+  return { isAuto: false, params: {} };
+};
+
 export const isAutoVpcConfig = (config: unknown): boolean => {
   logger.debug(`isAutoVpcConfig, vpcConfig = ${JSON.stringify(config)}`);
   if (_.isString(config)) {
@@ -223,3 +257,41 @@ export function getUserAgent(userAgent: string, command: string) {
   }
   return `${function_ai}Component:fc3;Nodejs:${process.version};OS:${process.platform}-${process.arch}command:${command}`;
 }
+
+/**
+ * 验证并规范化路径
+ */
+export function validateAndNormalizePath(path: string, paramName = 'path'): string {
+  if (typeof path !== 'string') {
+    const message = `Invalid ${paramName}, expected string but got ${typeof path}`;
+    if (logger) logger.warn(message);
+    return '/';
+  }
+
+  if (!path) {
+    if (logger) logger.debug(`Empty ${paramName}, using default value`);
+    return '/';
+  }
+
+  let normalizedPath = path.trim();
+
+  if (!normalizedPath.startsWith('/')) {
+    normalizedPath = `/${normalizedPath}`;
+    if (logger) logger.debug(`${paramName} does not start with '/', prepending '/'`);
+  }
+
+  if (normalizedPath.length > 1 && normalizedPath.endsWith('/')) {
+    normalizedPath = normalizedPath.slice(0, -1);
+    if (logger) logger.debug(`${paramName} ends with '/', removing trailing '/'`);
+  }
+
+  if (normalizedPath.length > 1024) {
+    normalizedPath = normalizedPath.substring(0, 1024);
+    if (logger)
+      logger.warn(
+        `${paramName} is too long (${normalizedPath.length}), truncating to 1024 characters`,
+      );
+  }
+
+  return normalizedPath;
+}