fix(router): file mode duplicated prefix (#2084)

Noroth · web-flow · commit 2b0e18d2ddc3 · 2025-07-25T10:44:13.000Z
diff --git a/router/core/supervisor_instance.go b/router/core/supervisor_instance.go
@@ -73,7 +73,7 @@ func newRouter(ctx context.Context, params RouterResources, additionalOptions ..
 		}
 
 		if cfg.AccessLogs.Output.File.Enabled {
-			f, err := logging.NewLogFile(cfg.AccessLogs.Output.File.Path, os.FileMode(cfg.AccessLogs.Output.File.FileMode))
+			f, err := logging.NewLogFile(cfg.AccessLogs.Output.File.Path, os.FileMode(cfg.AccessLogs.Output.File.Mode))
 			if err != nil {
 				return nil, fmt.Errorf("could not create log file: %w", err)
 			}
diff --git a/router/pkg/config/config.go b/router/pkg/config/config.go
@@ -881,9 +881,9 @@ type AccessLogsStdOutOutputConfig struct {
 }
 
 type AccessLogsFileOutputConfig struct {
-	Enabled  bool     `yaml:"enabled" env:"ACCESS_LOGS_OUTPUT_FILE_ENABLED" envDefault:"false"`
-	Path     string   `yaml:"path" env:"ACCESS_LOGS_FILE_OUTPUT_PATH" envDefault:"access.log"`
-	FileMode FileMode `yaml:"file_mode" env:"ACCESS_LOGS_FILE_OUTPUT_FILE_MODE" envDefault:"0640"`
+	Enabled bool     `yaml:"enabled" env:"ACCESS_LOGS_OUTPUT_FILE_ENABLED" envDefault:"false"`
+	Path    string   `yaml:"path" env:"ACCESS_LOGS_FILE_OUTPUT_PATH" envDefault:"access.log"`
+	Mode    FileMode `yaml:"mode" env:"ACCESS_LOGS_FILE_OUTPUT_MODE" envDefault:"0640"`
 }
 
 type AccessLogsRouterConfig struct {
diff --git a/router/pkg/config/config.schema.json b/router/pkg/config/config.schema.json
@@ -677,7 +677,7 @@
                   "type": "string",
                   "description": "The path to the log file. The path is used to specify the path to the log file."
                 },
-                "file_mode": {
+                "mode": {
                   "type": "string",
                   "description": "The file mode (permissions) for the log file as an octal string. Must be exactly 3 octal digits (0-7), optionally prefixed with '0' (e.g., '640', '0640', '755', '0755'). The default value is '0640'.",
                   "default": "0640",
diff --git a/router/pkg/config/config_test.go b/router/pkg/config/config_test.go
@@ -1309,12 +1309,12 @@ access_logs:
     file:
       enabled: true
       path: ./access.log
-      file_mode: "640"
+      mode: "640"
 `)
 		c, err := LoadConfig([]string{f})
 		require.NoError(t, err)
 
-		require.Equal(t, FileMode(0640), c.Config.AccessLogs.Output.File.FileMode)
+		require.Equal(t, FileMode(0640), c.Config.AccessLogs.Output.File.Mode)
 	})
 
 	t.Run("verify file mode is parsed correctly with leading zero", func(t *testing.T) {
@@ -1329,12 +1329,12 @@ access_logs:
     file:
       enabled: true
       path: ./access.log
-      file_mode: "0640"
+      mode: "0640"
 `)
 		c, err := LoadConfig([]string{f})
 		require.NoError(t, err)
 
-		require.Equal(t, FileMode(0640), c.Config.AccessLogs.Output.File.FileMode)
+		require.Equal(t, FileMode(0640), c.Config.AccessLogs.Output.File.Mode)
 	})
 
 	t.Run("verify file mode throws an error when pattern is not matched", func(t *testing.T) {
@@ -1401,7 +1401,7 @@ access_logs:
     file:
       enabled: true
       path: ./access.log
-      file_mode: "`+pattern+`"
+      mode: "`+pattern+`"
 `)
 			_, err := LoadConfig([]string{f})
 			require.Error(t, err, "Pattern '%s' should be invalid but was accepted", pattern)
@@ -1450,11 +1450,11 @@ access_logs:
     file:
       enabled: true
       path: ./access.log
-      file_mode: "`+tc.pattern+`"
+      mode: "`+tc.pattern+`"
 `)
 			c, err := LoadConfig([]string{f})
 			require.NoError(t, err, "Pattern '%s' should be valid but was rejected", tc.pattern)
-			require.Equal(t, tc.mode, c.Config.AccessLogs.Output.File.FileMode, "Pattern '%s' should parse to mode %o but got %o", tc.pattern, tc.mode, c.Config.AccessLogs.Output.File.FileMode)
+			require.Equal(t, tc.mode, c.Config.AccessLogs.Output.File.Mode, "Pattern '%s' should parse to mode %o but got %o", tc.pattern, tc.mode, c.Config.AccessLogs.Output.File.Mode)
 		}
 	})
 }
diff --git a/router/pkg/config/testdata/config_defaults.json b/router/pkg/config/testdata/config_defaults.json
@@ -193,7 +193,7 @@
       "File": {
         "Enabled": false,
         "Path": "access.log",
-        "FileMode": 416
+        "Mode": 416
       }
     },
     "Router": {
diff --git a/router/pkg/config/testdata/config_full.json b/router/pkg/config/testdata/config_full.json
@@ -390,7 +390,7 @@
       "File": {
         "Enabled": false,
         "Path": "access.log",
-        "FileMode": 416
+        "Mode": 416
       }
     },
     "Router": {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func newRouter(ctx context.Context, params RouterResources, additionalOptions ..`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`if cfg.AccessLogs.Output.File.Enabled {`
`76`		`- f, err := logging.NewLogFile(cfg.AccessLogs.Output.File.Path, os.FileMode(cfg.AccessLogs.Output.File.FileMode))`
	`76`	`+ f, err := logging.NewLogFile(cfg.AccessLogs.Output.File.Path, os.FileMode(cfg.AccessLogs.Output.File.Mode))`
`77`	`77`	`if err != nil {`
`78`	`78`	`return nil, fmt.Errorf("could not create log file: %w", err)`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -881,9 +881,9 @@ type AccessLogsStdOutOutputConfig struct {`
`881`	`881`	`}`
`882`	`882`
`883`	`883`	`type AccessLogsFileOutputConfig struct {`
`884`		- Enabled bool `yaml:"enabled" env:"ACCESS_LOGS_OUTPUT_FILE_ENABLED" envDefault:"false"`
`885`		- Path string `yaml:"path" env:"ACCESS_LOGS_FILE_OUTPUT_PATH" envDefault:"access.log"`
`886`		- FileMode FileMode `yaml:"file_mode" env:"ACCESS_LOGS_FILE_OUTPUT_FILE_MODE" envDefault:"0640"`
	`884`	+ Enabled bool `yaml:"enabled" env:"ACCESS_LOGS_OUTPUT_FILE_ENABLED" envDefault:"false"`
	`885`	+ Path string `yaml:"path" env:"ACCESS_LOGS_FILE_OUTPUT_PATH" envDefault:"access.log"`
	`886`	+ Mode FileMode `yaml:"mode" env:"ACCESS_LOGS_FILE_OUTPUT_MODE" envDefault:"0640"`
`887`	`887`	`}`
`888`	`888`
`889`	`889`	`type AccessLogsRouterConfig struct {`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@`
`193`	`193`	`"File": {`
`194`	`194`	`"Enabled": false,`
`195`	`195`	`"Path": "access.log",`
`196`		`- "FileMode": 416`
	`196`	`+ "Mode": 416`
`197`	`197`	`}`
`198`	`198`	`},`
`199`	`199`	`"Router": {`
Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@`
`390`	`390`	`"File": {`
`391`	`391`	`"Enabled": false,`
`392`	`392`	`"Path": "access.log",`
`393`		`- "FileMode": 416`
	`393`	`+ "Mode": 416`
`394`	`394`	`}`
`395`	`395`	`},`
`396`	`396`	`"Router": {`