upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-28 04:10:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix panic when setting a client http client with no transport (#3437)

Browse source 
Fixes #3436
This commit is contained in:
Jeff Mitchell 2017-10-09 08:49:20 -04:00 committed by GitHub
parent f0348318e7
commit 42953d6482
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/client.go
View file

@ -267,6 +267,9 @@ func NewClient(c *Config) (*Client, error) {
if c.HttpClient == nil {
c.HttpClient = DefaultConfig().HttpClient
}
if c.HttpClient.Transport == nil {
c.HttpClient.Transport = cleanhttp.DefaultTransport()
}
tp := c.HttpClient.Transport.(*http.Transport)
if err := http2.ConfigureTransport(tp); err != nil {

9
api/client_test.go
View file

@ -37,6 +37,15 @@ func TestDefaultConfig_envvar(t *testing.T) {
}
}
func TestClientDefaultHttpClient(t *testing.T) {
_, err := NewClient(&Config{
HttpClient: http.DefaultClient,
})
if err != nil {
t.Fatal(err)
}
}
func TestClientNilConfig(t *testing.T) {
client, err := NewClient(nil)
if err != nil {