Add env vars defaults for http&https proxy

Signed-off-by: Marek Aufart <[email protected]>
konveyor · Jan 8, 2024 · 15b1570 · 15b1570
1 parent a89bdc4
commit 15b1570
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/cmd/analyze.go b/cmd/analyze.go
@@ -61,7 +61,8 @@ type analyzeCommand struct {
 	rules                 []string
 	jaegerEndpoint        string
 	enableDefaultRulesets bool
-	proxy                 string
+	httpProxy             string
+	httpsProxy            string
 	noProxy               string
 
 	// tempDirs list of temporary dirs created, used for cleanup
@@ -162,8 +163,9 @@ func NewAnalyzeCmd(log logr.Logger) *cobra.Command {
 	analyzeCommand.Flags().BoolVar(&analyzeCmd.overwrite, "overwrite", false, "overwrite output directory")
 	analyzeCommand.Flags().StringVar(&analyzeCmd.jaegerEndpoint, "jaeger-endpoint", "", "jaeger endpoint to collect traces")
 	analyzeCommand.Flags().BoolVar(&analyzeCmd.enableDefaultRulesets, "enable-default-rulesets", true, "run default rulesets with analysis")
-	analyzeCommand.Flags().StringVar(&analyzeCmd.proxy, "proxy", "", "HTTP&HTTPS proxy string URL")
-	analyzeCommand.Flags().StringVar(&analyzeCmd.noProxy, "no-proxy", "", "proxy excluded URLs (relevant only with `proxy`)")
+	analyzeCommand.Flags().StringVar(&analyzeCmd.httpProxy, "http-proxy", os.Getenv("http_proxy"), "HTTP proxy string URL")
+	analyzeCommand.Flags().StringVar(&analyzeCmd.httpsProxy, "https-proxy", os.Getenv("https_proxy"), "HTTPS proxy string URL")
+	analyzeCommand.Flags().StringVar(&analyzeCmd.noProxy, "no-proxy", os.Getenv("no_proxy"), "proxy excluded URLs (relevant only with proxy)")
 
 	return analyzeCommand
 }
@@ -464,10 +466,10 @@ func (a *analyzeCommand) getConfigVolumes() (map[string]string, error) {
 	}
 
 	// Set proxy to providers
-	if a.proxy != "" {
+	if a.httpProxy != "" || a.httpsProxy != "" {
 		proxy := provider.Proxy{
-			HTTPProxy: a.proxy,
-			HTTPSProxy: a.proxy,
+			HTTPProxy: a.httpProxy,
+			HTTPSProxy: a.httpsProxy,
 			NoProxy: a.noProxy,
 		}
 		for i := range provConfig {