Skip to content

Allow empty network.proxy settings #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 14, 2020
Merged

Allow empty network.proxy settings #830

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Allow empty network.proxy settings 
This workaround must be here until viper can UnSet properties:
spf13/viper#519
  • Loading branch information
@cmaglie
cmaglie committed Jul 14, 2020
commit 876aa88995d707e876f60d8d3d00d95b8ada4d85
6 changes: 5 additions & 1 deletion httpclient/httpclient_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
}
Expand Down