Add headless proxy options to cmds

Pocket · Mar 7, 2024 · 9c7be78 · 9c7be78
1 parent ed91a5c
commit 9c7be78
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/cmd/scrape-server/main.go b/cmd/scrape-server/main.go
@@ -106,6 +106,7 @@ func init() {
 	flags.Init("", flag.ExitOnError)
 	flags.Usage = usage
 	dbFlags = cmd.AddDatabaseFlags("DB", &flags, false)
+	_ = cmd.AddProxyFlags("headless", &flags)
 	port = envflags.NewInt("PORT", DefaultPort)
 	port.AddTo(&flags, "port", "Port to run the server on")
 	ttl = envflags.NewDuration("TTL", resource.DefaultTTL)

diff --git a/cmd/scrape/main.go b/cmd/scrape/main.go
@@ -201,6 +201,10 @@ func init() {
 	noContent = envflags.NewBool("NOTEXT", false)
 	noContent.AddTo(&flags, "notext", "Skip text content")
 	dbFlags = cmd.AddDatabaseFlags("DB", &flags, true)
+
+	// TODO: Add headless support
+	_ = cmd.AddProxyFlags("headless", &flags)
+
 	csvPath = envflags.NewString("", "")
 	csvPath.AddTo(&flags, "csv", "CSV file path")
 	csvUrlIndex = envflags.NewInt("CSV_COLUMN", 1)

diff --git a/internal/cmd/proxy.go b/internal/cmd/proxy.go
@@ -21,19 +21,21 @@ type Proxy struct {
 func AddProxyFlags(proxyName string, flags *flag.FlagSet) *Proxy {
 	// TODO: prefix the env var and arg based on whether baseEnv is empty or not.
 	var baseEnv, baseArgName string
+	helpPrefix := "Default"
 	if proxyName != "" {
 		baseEnv = strings.ToUpper(proxyName) + "_"
 		baseArgName = strings.ToLower(proxyName) + "-"
+		helpPrefix = strings.ToUpper(string(proxyName[0])) + strings.ToLower(proxyName[1:])
 	}
 
 	proxy := &Proxy{
 		proxyURL: envflags.NewString(baseEnv+"PROXY", ""),
 		username: envflags.NewString(baseEnv+"PROXY_USERNAME", ""),
 		password: envflags.NewString(baseEnv+"PROXY_PASSWORD", ""),
 	}
-	flags.Var(proxy.proxyURL, baseArgName+"proxy", "Proxy URL")
-	flags.Var(proxy.username, baseArgName+"proxy-username", "Proxy username")
-	flags.Var(proxy.password, baseArgName+"proxy-password", "Proxy password")
+	proxy.proxyURL.AddTo(flags, baseArgName+"proxy", helpPrefix+" proxy URL")
+	proxy.username.AddTo(flags, baseArgName+"proxy-username", helpPrefix+" proxy username")
+	proxy.password.AddTo(flags, baseArgName+"proxy-password", helpPrefix+" proxy password")
 	return proxy
 }