luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Don't overwrite Transport's TLS config if it's been set

Browse source
This commit is contained in:
Kyle Havlovitz 2017-05-24 13:45:19 -07:00
parent 32068f7025
commit 6092d2c2cc
No known key found for this signature in database
GPG key ID: 8A5E6B173056AD6C
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
api/api.go
View file

@ -430,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
} }