status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3072 from hashicorp/api-httpclient 

Tweaks to api's TLS logic in NewClient
This commit is contained in:
Kyle Havlovitz 2017-05-26 09:11:20 -07:00 committed by GitHub
parent 8d00db4836 4e44db87e3
commit c897d851aa
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/api.go
View File

@ -369,10 +369,6 @@ func NewClient(config *Config) (*Client, error) {
config.Transport = defConfig.Transport config.Transport = defConfig.Transport
} }
if config.HttpClient == nil {
config.HttpClient = defConfig.HttpClient
}
if config.TLSConfig.Address == "" { if config.TLSConfig.Address == "" {
config.TLSConfig.Address = defConfig.TLSConfig.Address config.TLSConfig.Address = defConfig.TLSConfig.Address
} }
@ -434,17 +430,20 @@ func NewClient(config *Config) (*Client, error) {
// NewHttpClient returns an http client configured with the given Transport and TLS // NewHttpClient returns an http client configured with the given Transport and TLS
// config. // config.
func NewHttpClient(transport *http.Transport, tlsConf TLSConfig) (*http.Client, error) { func NewHttpClient(transport *http.Transport, tlsConf TLSConfig) (*http.Client, error) {
tlsClientConfig, err := SetupTLSConfig(&tlsConf)
if err != nil {
return nil, err
}
transport.TLSClientConfig = tlsClientConfig
client := &http.Client{ client := &http.Client{
Transport: transport, Transport: transport,
} }
if transport.TLSClientConfig == nil {
tlsClientConfig, err := SetupTLSConfig(&tlsConf)
if err != nil {
return nil, err
}
transport.TLSClientConfig = tlsClientConfig
}
return client, nil return client, nil
} }