Add support for no_proxy (#1476)

* Adding proxy from environment fix
Azure · Aug 8, 2024 · 78a335b · 78a335b
1 parent b47e5fa
commit 78a335b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/common/types.go b/common/types.go
@@ -47,7 +47,7 @@ import (
 
 // Standard config default values
 const (
-	blobfuse2Version_ = "2.3.1"
+	blobfuse2Version_ = "2.3.2"
 
 	DefaultMaxLogFileSize = 512
 	DefaultLogFileCount   = 10

diff --git a/component/azstorage/config.go b/component/azstorage/config.go
@@ -138,8 +138,6 @@ const (
 	EnvAzStorageAadEndpoint            = "AZURE_STORAGE_AAD_ENDPOINT"
 	EnvAzStorageAuthType               = "AZURE_STORAGE_AUTH_TYPE"
 	EnvAzStorageBlobEndpoint           = "AZURE_STORAGE_BLOB_ENDPOINT"
-	EnvHttpProxy                       = "http_proxy"
-	EnvHttpsProxy                      = "https_proxy"
 	EnvAzStorageAccountContainer       = "AZURE_STORAGE_ACCOUNT_CONTAINER"
 	EnvAzAuthResource                  = "AZURE_STORAGE_AUTH_RESOURCE"
 	EnvAzStorageCpkEncryptionKey       = "AZURE_STORAGE_CPK_ENCRYPTION_KEY"
@@ -219,9 +217,6 @@ func RegisterEnvVariables() {
 
 	config.BindEnv("azstorage.mode", EnvAzStorageAuthType)
 
-	config.BindEnv("azstorage.http-proxy", EnvHttpProxy)
-	config.BindEnv("azstorage.https-proxy", EnvHttpsProxy)
-
 	config.BindEnv("azstorage.container", EnvAzStorageAccountContainer)
 
 	config.BindEnv("azstorage.auth-resource", EnvAzAuthResource)

diff --git a/component/azstorage/utils.go b/component/azstorage/utils.go
@@ -162,7 +162,7 @@ func setSDKLogListener() {
 func newBlobfuse2HttpClient(conf *AzStorageConfig) (*http.Client, error) {
 	var ProxyURL func(req *http.Request) (*url.URL, error)
 	if conf.proxyAddress == "" {
-		ProxyURL = nil
+		ProxyURL = http.ProxyFromEnvironment
 	} else {
 		u, err := url.Parse(conf.proxyAddress)
 		if err != nil {