Adding option to set custom vault client timeout using env variable VAULT_CLIENT_TIMEOUT #3022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jefferai
reviewed
Jul 16, 2017
api/client.go
Outdated
| @@ -183,6 +184,13 @@ func (c *Config) ReadEnvironment() error { | |||
| if v := os.Getenv(EnvVaultClientKey); v != "" { | |||
| envClientKey = v | |||
| } | |||
| if t := os.Getenv(EnvVaultClientTimeout); t != "" { | |||
| clientTimeout, err := strconv.ParseUint(t, 10, 32) | |||
There was a problem hiding this comment.
This should use parseutil.ParseDurationSecond.
jefferai
reviewed
Jul 16, 2017
api/client.go
Outdated
| if err != nil { | ||
| return err | ||
| } | ||
| c.HttpClient.Timeout = time.Second * time.Duration(clientTimeout) |
There was a problem hiding this comment.
The HTTP client might be nil here, and this is not the right place to create one. You should create a timeout variable in the Config struct, and assign it here (and in the set function). Then move the actual logic to the request function so that the current value (e.g. if it's set with SetClientTimeout below) will be used for the current request.
jefferai
reviewed
Jul 17, 2017
api/client.go
Outdated
| @@ -215,6 +228,10 @@ func (c *Config) ReadEnvironment() error { | |||
| c.MaxRetries = int(*envMaxRetries) + 1 | |||
| } | |||
|
|
|||
| if envClientTimeout != time.Second*0 { | |||
jefferai
reviewed
Jul 17, 2017
api/client.go
Outdated
| @@ -362,6 +384,9 @@ func (c *Client) NewRequest(method, requestPath string) *Request { | |||
| } else { | |||
| req.WrapTTL = DefaultWrappingLookupFunc(method, lookupPath) | |||
| } | |||
| if c.config.Timeout != time.Second*0 { | |||
jefferai
approved these changes
Jul 18, 2017
|
Looks good, thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2956
Option to set the vault client timeout using env var VAULT_CLIENT_TIMEOUT has been added.
Added a new function SetClientTimeout which can set the client timeout through api config.