bind: remove newOSFileFlag

Reimplement file binding with plain anyflag.NewValueWithRedact[*os.File]()
saucelabs · Jul 9, 2024 · 28998dd · 28998dd
1 parent f46a716
commit 28998dd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 35 deletions.
diff --git a/bind/file.go b/bind/file.go
diff --git a/bind/flag.go b/bind/flag.go
@@ -382,8 +382,8 @@ func TLSServerConfig(fs *pflag.FlagSet, cfg *forwarder.TLSServerConfig, namePref
 }
 
 func LogConfig(fs *pflag.FlagSet, cfg *log.Config) {
-	fs.VarP(newOSFileFlag(anyflag.NewValue[*os.File](nil, &cfg.File,
-		forwarder.OpenFileParser(log.DefaultFileFlags, log.DefaultFileMode, log.DefaultDirMode)), &cfg.File),
+	fs.VarP(anyflag.NewValueWithRedact[*os.File](cfg.File, &cfg.File,
+		forwarder.OpenFileParser(log.DefaultFileFlags, log.DefaultFileMode, log.DefaultDirMode), DisplayFileName),
 		"log-file", "", "<path>"+
 			"Path to the log file, if empty, logs to stdout. "+
 			"The file is reopened on SIGHUP to allow log rotation using external tools. ")

diff --git a/bind/redact.go b/bind/redact.go
@@ -9,6 +9,7 @@ package bind
 import (
 	"fmt"
 	"net/url"
+	"os"
 	"strings"
 
 	"github.com/saucelabs/forwarder/header"
@@ -39,3 +40,10 @@ func RedactBase64(s string) string {
 
 	return s
 }
+
+func DisplayFileName(f *os.File) string {
+	if f == nil {
+		return ""
+	}
+	return f.Name()
+}