Allow empty network.proxy setting (#830)

cmaglie · web-flow · commit 72c9655f1772 · 2020-07-14T16:28:07.000+02:00
This workaround must be here until viper can UnSet properties: spf13/viper#519
diff --git a/httpclient/httpclient_config.go b/httpclient/httpclient_config.go
@@ -37,7 +37,11 @@ func DefaultConfig() (*Config, error) {
 	var err error
 	if viper.IsSet("network.proxy") {
 		proxyConfig := viper.GetString("network.proxy")
-		if proxy, err = url.Parse(proxyConfig); err != nil {
+		if proxyConfig == "" {
+			// empty configuration
+			// this workaround must be here until viper can UnSet properties:
+			// https://github.com/spf13/viper/pull/519
+		} else if proxy, err = url.Parse(proxyConfig); err != nil {
 			return nil, errors.New("Invalid network.proxy '" + proxyConfig + "': " + err.Error())
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,11 @@ func DefaultConfig() (*Config, error) {`
`37`	`37`	`var err error`
`38`	`38`	`if viper.IsSet("network.proxy") {`
`39`	`39`	`proxyConfig := viper.GetString("network.proxy")`
`40`		`- if proxy, err = url.Parse(proxyConfig); err != nil {`
	`40`	`+ if proxyConfig == "" {`
	`41`	`+ // empty configuration`
	`42`	`+ // this workaround must be here until viper can UnSet properties:`
	`43`	`+ // https://github.com/spf13/viper/pull/519`
	`44`	`+ } else if proxy, err = url.Parse(proxyConfig); err != nil {`
`41`	`45`	`return nil, errors.New("Invalid network.proxy '" + proxyConfig + "': " + err.Error())`
`42`	`46`	`}`
`43`	`47`	`}`