Add subnet proxy config (minio#14225)

Will store the HTTP(S) proxy URL to use for connecting to SUBNET.
tsbkw · Feb 1, 2022 · 3882da6 · 3882da6
1 parent 77b780b
commit 3882da6
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/cmd/common-main.go b/cmd/common-main.go
@@ -213,6 +213,9 @@ func minioConfigToConsoleFeatures() {
 	if globalSubnetConfig.APIKey != "" {
 		os.Setenv("CONSOLE_SUBNET_API_KEY", globalSubnetConfig.APIKey)
 	}
+	if globalSubnetConfig.Proxy != "" {
+		os.Setenv("CONSOLE_SUBNET_PROXY", globalSubnetConfig.Proxy)
+	}
 }
 
 func initConsoleServer() (*restapi.Server, error) {

diff --git a/cmd/config-current.go b/cmd/config-current.go
@@ -361,6 +361,10 @@ func validateConfig(s config.Config) error {
 		return err
 	}
 
+	if _, err = subnet.LookupConfig(s[config.SubnetSubSys][config.Default]); err != nil {
+		return err
+	}
+
 	return notify.TestNotificationTargets(GlobalContext, s, NewGatewayHTTPTransport(), globalNotificationSys.ConfiguredTargetIDs())
 }
 

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -62,6 +62,7 @@ const (
 	SecretKey  = "secret_key"
 	License    = "license" // Deprecated Dec 2021
 	APIKey     = "api_key"
+	Proxy      = "proxy"
 )
 
 // Top level config constants.

diff --git a/internal/config/constants.go b/internal/config/constants.go
@@ -55,6 +55,7 @@ const (
 
 	EnvMinIOSubnetLicense      = "MINIO_SUBNET_LICENSE" // Deprecated Dec 2021
 	EnvMinIOSubnetAPIKey       = "MINIO_SUBNET_API_KEY"
+	EnvMinIOSubnetProxy        = "MINIO_SUBNET_PROXY"
 	EnvMinIOServerURL          = "MINIO_SERVER_URL"
 	EnvMinIOBrowserRedirectURL = "MINIO_BROWSER_REDIRECT_URL"
 	EnvRootDiskThresholdSize   = "MINIO_ROOTDISK_THRESHOLD_SIZE"

diff --git a/internal/config/subnet/api-key.go b/internal/config/subnet/api-key.go
@@ -18,6 +18,8 @@
 package subnet
 
 import (
+	"net/url"
+
 	"github.com/minio/minio/internal/config"
 	"github.com/minio/pkg/env"
 )
@@ -33,6 +35,10 @@ var (
 			Key:   config.APIKey,
 			Value: "",
 		},
+		config.KV{
+			Key:   config.Proxy,
+			Value: "",
+		},
 	}
 
 	// HelpSubnet - provides help for subnet api key config
@@ -49,6 +55,12 @@ var (
 			Description: "Subnet api key for the cluster",
 			Optional:    true,
 		},
+		config.HelpKV{
+			Key:         config.Proxy,
+			Type:        "string",
+			Description: "HTTP(S) proxy URL to use for connecting to SUBNET",
+			Optional:    true,
+		},
 	}
 )
 
@@ -59,6 +71,9 @@ type Config struct {
 
 	// The subnet api key
 	APIKey string `json:"api_key"`
+
+	// The HTTP(S) proxy URL to use for connecting to SUBNET
+	Proxy string `json:"proxy"`
 }
 
 // LookupConfig - lookup config and override with valid environment settings if any.
@@ -67,6 +82,12 @@ func LookupConfig(kvs config.KVS) (cfg Config, err error) {
 		return cfg, err
 	}
 
+	cfg.Proxy = env.Get(config.EnvMinIOSubnetProxy, kvs.Get(config.Proxy))
+	_, err = url.Parse(cfg.Proxy)
+	if err != nil {
+		return cfg, err
+	}
+
 	cfg.License = env.Get(config.EnvMinIOSubnetLicense, kvs.Get(config.License))
 	cfg.APIKey = env.Get(config.EnvMinIOSubnetAPIKey, kvs.Get(config.APIKey))