Removes redundant code and format

jozu-ai · Oct 15, 2024 · a7ff239 · a7ff239
1 parent 1b92604
commit a7ff239
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/pkg/cmd/options/network.go b/pkg/cmd/options/network.go
@@ -74,6 +74,5 @@ func DefaultNetworkOptions(configHome string) *NetworkOptions {
 		PlainHTTP:       false,
 		TLSVerify:       true,
 		CredentialsPath: constants.CredentialsPath(configHome),
-		Proxy:           constants.ProxyEnvVar(),
 	}
 }
diff --git a/pkg/lib/constants/consts.go b/pkg/lib/constants/consts.go
@@ -157,18 +157,3 @@ func TagIndexPathForRepo(storageBase, repo string) string {
 	indexFileName := fmt.Sprintf("%s-tags.json", repoEncoded)
 	return filepath.Join(storageBase, indexFileName)
 }
-
-func ProxyEnvVar() string {
-	var ProxyEnvVar string
-	if ProxyEnvVar = os.Getenv("HTTPS_PROXY"); ProxyEnvVar != "" {
-		return "HTTPS_PROXY"
-	} else if ProxyEnvVar = os.Getenv("https_proxy"); ProxyEnvVar != "" {
-		return "https_proxy"
-	} else if ProxyEnvVar = os.Getenv("HTTP_PROXY"); ProxyEnvVar != "" {
-		return "HTTP_PROXY"
-	} else if ProxyEnvVar = os.Getenv("http_proxy"); ProxyEnvVar != "" {
-		return "https_proxy"
-	}
-
-	return ProxyEnvVar
-}
diff --git a/pkg/lib/network/auth.go b/pkg/lib/network/auth.go
@@ -55,12 +55,12 @@ func DefaultClient(opts *options.NetworkOptions) (*auth.Client, error) {
 	transport := http.DefaultTransport.(*http.Transport).Clone()
 	transport.TLSClientConfig.InsecureSkipVerify = !opts.TLSVerify
 	if opts.Proxy != "" {
-        proxyURL, err := url.Parse(opts.Proxy)
-        if err != nil {
-            return nil, fmt.Errorf("invalid proxy URL: %w", err)
-        }
-        transport.Proxy = http.ProxyURL(proxyURL)
-    }
+		proxyURL, err := url.Parse(opts.Proxy)
+		if err != nil {
+			return nil, fmt.Errorf("invalid proxy URL: %w", err)
+		}
+		transport.Proxy = http.ProxyURL(proxyURL)
+	}
 	if opts.ClientCertKeyPath != "" && opts.ClientCertPath != "" {
 		cert, err := tls.LoadX509KeyPair(opts.ClientCertPath, opts.ClientCertKeyPath)
 		if err != nil {