Fix nas config and logConfig by liuzewen99 · Pull Request #135 · devsapp/fc3

liuzewen99 · 2026-01-16T10:34:20Z

No description provided.

rsonghuster · 2026-01-19T13:40:31Z

src/subCommands/deploy/impl/function.ts

-  enableInstanceMetrics: true
-  enableRequestMetrics: true
-  logBeginRule: DefaultRegex
+  enableInstanceMetrics: ${customFields.enableInstanceMetrics}


这个感觉有点问题啊，不应该是跟 376-380 行一样的逻辑吗

rsonghuster · 2026-01-19T13:42:29Z

src/subCommands/deploy/impl/function.ts

      const { project, logstore } = await sls.deploy();
+      const logAutoConfig = parseAutoConfig(this.local.logConfig as string);
+      const logParams = logAutoConfig?.params || {};
+      const existingLogConfig =


这里已经是 sls Auto 的逻辑了，为什么还有 existingLogConfig？

rsonghuster · 2026-01-19T13:46:30Z

__tests__/e2e/nodejs/s_oss_config_auto.yaml

+      handler: index.handler
+      memorySize: 128
+      timeout: 60
+      nasConfig: auto|mountDir=/custom/nas/mount/path|serverAddr=/custom/nas/mount/path


mountDir 一般是 /home 或者 /mnt 开头，你这个测试起来应该跑不过

rsonghuster · 2026-01-19T13:47:50Z

src/subCommands/model/index.ts

+      const customMountDir = params.mountDir
+        ? validateAndNormalizePath(params.mountDir, 'mountDir')
+        : `/mnt/${functionName}`;
+      const customServerAddr = params.serverAddr ? params.serverAddr : `${functionName}`;


这个 params.serverAddr 名字叫 params.nasDir 更容易理解点，而且和 fc 的 serverAddr 没有冲突

rsonghuster · 2026-01-19T13:48:57Z

src/subCommands/model/index.ts

-      let serverAddr = `${mountTargetDomain}:/${functionName}`;
+      const nasAutoConfig = parseAutoConfig(this.local.nasConfig as string);
+      const params = nasAutoConfig?.params || {};
+      const customMountDir = params.mountDir


customMountDir 改成 fcDir 吧，更容易理解点

rsonghuster · 2026-01-19T14:01:29Z

src/subCommands/model/index.ts

+      const nasAutoConfig = parseAutoConfig(this.local.nasConfig as string);
+      const params = nasAutoConfig?.params || {};
+      const customMountDir = params.mountDir
+        ? validateAndNormalizePath(params.mountDir, 'mountDir')


如果这个函数仅仅是校验 fcDir

我建议使用更科学的代码，比如：

必须是 / 开头

/mnt/ 和 /mnt 这种没有子目录的不被允许

这些前缀开头不被允许
[
'/bin', '/boot', '/dev', '/etc', '/lib', '/lib64',
'/media', '/opt', '/proc', '/root', '/run',
'/sbin', '/srv', '/sys', '/usr', '/var'
]

长度不要超过 128

rsonghuster · 2026-01-20T03:41:02Z

src/utils/index.ts

+ * 验证并规范化路径
+ */
+export function validateAndNormalizePath(path: string, paramName = 'path'): string {
+  if (typeof path !== 'string') {


265-286 行没有任何意思，不满足直接报错就好了

rsonghuster · 2026-01-20T03:41:34Z

src/utils/index.ts

+    if (normalizedPath === prefix || normalizedPath.startsWith(`${prefix}/`)) {
+      const message = `Invalid ${paramName}, ${prefix} and its subdirectories are not allowed`;
+      if (logger) logger.warn(message);
+      return '/';


直接报错

rsonghuster · 2026-01-20T03:42:03Z

src/utils/index.ts

+  if (normalizedPath === '/mnt' || normalizedPath === '/mnt/') {
+    const message = `Invalid ${paramName}, /mnt without subdirectory is not allowed`;
+    if (logger) logger.warn(message);
+    return '/';


直接报错，你传给 fc， fc 那边还是会报错，还不如直接拦了

rsonghuster · 2026-01-20T03:43:05Z

src/utils/index.ts

+/**
+ * 验证并规范化路径
+ */
+export function validateAndNormalizePath(path: string, paramName = 'path'): string {


函数validateAndNormalizePath名字就叫 checkFcDir ，语义明确点

rsonghuster · 2026-01-20T07:27:55Z

src/utils/index.ts

+  }
+
+  // 检查 /mnt 是否为顶级目录且没有子目录
+  if (normalizedPath === '/mnt' || normalizedPath === '/mnt/') {


我只是举个例子啊！不是固定的 /mnt 。。。。。

liuzewen99 requested a review from rsonghuster January 16, 2026 10:34

liuzewen99 force-pushed the fix-nasConfig branch 4 times, most recently from abbd147 to b4c3f0d Compare January 19, 2026 10:20

rsonghuster reviewed Jan 19, 2026

View reviewed changes

rsonghuster reviewed Jan 20, 2026

View reviewed changes

liuzewen99 force-pushed the fix-nasConfig branch from aba2c4b to d91d422 Compare January 20, 2026 04:02

rsonghuster reviewed Jan 20, 2026

View reviewed changes

liuzewen99 force-pushed the fix-nasConfig branch 3 times, most recently from ad984e2 to 8c3890c Compare January 20, 2026 08:53

fix: nas config and logConfig

35e097b

liuzewen99 force-pushed the fix-nasConfig branch from 8c3890c to 35e097b Compare January 20, 2026 09:33

rsonghuster merged commit 0cb5e83 into master Jan 20, 2026
7 of 8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix nas config and logConfig#135

Fix nas config and logConfig#135
rsonghuster merged 1 commit intomasterfrom
fix-nasConfig

liuzewen99 commented Jan 16, 2026

Uh oh!

rsonghuster Jan 19, 2026

Uh oh!

rsonghuster Jan 19, 2026

Uh oh!

rsonghuster Jan 19, 2026 •

edited

Loading

Uh oh!

rsonghuster Jan 19, 2026

Uh oh!

rsonghuster Jan 19, 2026

Uh oh!

rsonghuster Jan 19, 2026 •

edited

Loading

Uh oh!

rsonghuster Jan 20, 2026

Uh oh!

rsonghuster Jan 20, 2026

Uh oh!

rsonghuster Jan 20, 2026

Uh oh!

rsonghuster Jan 20, 2026

Uh oh!

rsonghuster Jan 20, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

liuzewen99 commented Jan 16, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rsonghuster Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rsonghuster Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

rsonghuster Jan 19, 2026 •

edited

Loading

rsonghuster Jan 19, 2026 •

edited

Loading