luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Rather than use http.DefaultClient, which is simply &http.Client{},

Browse source 
create our own. This avoids some potential client race conditions when
they are setting values on the Vault API client while the default client
is being used elsewhere in other goroutines, as was seen in
consul-template.
This commit is contained in:
Jeff Mitchell 2015-09-03 13:47:20 -04:00
parent bc2d914905
commit 2002406155
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/client.go
View file

@ -13,6 +13,7 @@ import (
var (
errRedirect = errors.New("redirect")
defaultHTTPClientSetup sync.Once
defaultHTTPClient = &http.Client{}
)
// Config is used to configure the creation of the client.
@ -23,8 +24,8 @@ type Config struct {
// HttpClient.
Address string
// HttpClient is the HTTP client to use, which will currently always be
// http.DefaultClient. This is used to control redirect behavior.
// HttpClient is the HTTP client to use, which will currently always have the
// same values as http.DefaultClient. This is used to control redirect behavior.
HttpClient *http.Client
}
@ -36,7 +37,7 @@ type Config struct {
func DefaultConfig() *Config {
config := &Config{
Address: "https://127.0.0.1:8200",
HttpClient: http.DefaultClient,
HttpClient: defaultHTTPClient,
}
if addr := os.Getenv("VAULT_ADDR"); addr != "" {
@ -65,7 +66,7 @@ func NewClient(c *Config) (*Client, error) {
return nil, err
}
if c.HttpClient == http.DefaultClient {
if c.HttpClient == defaultHTTPClient {
defaultHTTPClientSetup.Do(func() {
// Ensure redirects are not automatically followed
c.HttpClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {