[VAULT-3157] Add X-Vault-Index header functionality #1170
Conversation
vault/provider.go
Outdated
| @@ -705,6 +706,16 @@ func providerToken(d *schema.ResourceData) (string, error) { | |||
| return strings.TrimSpace(token), nil | |||
| } | |||
|
|
|||
| func RecordMultipleStates(lastStates ...string) func(*api.Response) { | |||
| return func(resp *api.Response) { | |||
| var m sync.Mutex | |||
There was a problem hiding this comment.
I think we need to move this variable declaration outside the anonymous function, otherwise all invocations of the function will have their own mutex variable and not actually synchronise.
There was a problem hiding this comment.
Good call! Updated and moved the declaration outside the anonymous function but still under RecordMultipleStates
| var m sync.Mutex | ||
| newState := resp.Header.Get("X-Vault-Index") | ||
| m.Lock() | ||
| lastStates = api.MergeStates(lastStates, newState) |
There was a problem hiding this comment.
I don't think this will actually update the lastStates slice in providerConfigure's scope. Maybe worth adding a test to verify either way.
There was a problem hiding this comment.
Yeah, lastState will not have the updated value outside of this func (RecordState accepts a string pointer which is why it works there).
There was a problem hiding this comment.
@calvn is there a way to make this work with a string slice? Or are string pointers our best bet here? (can we pass arrays by pointers in Go?)
There was a problem hiding this comment.
Though this is not common, we could have as the argument type *[]string and we pass in the pointer to the slice for lastStates whenever this is called.
| @@ -856,12 +871,19 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) { | |||
| // Set the token to the generated child token | |||
| client.SetToken(childToken) | |||
|
|
|||
| client = client.WithRequestCallbacks(api.RequireState(lastStates...)).WithResponseCallbacks() | |||
There was a problem hiding this comment.
Why is this chained like so in there? If this is necessary, can you leave a comment around this line?
|
Closing this branch because this work is incorporated in this PR that adds client control support in the form of a |
Community Note
Relates OR Closes #0000
https://hashicorp.atlassian.net/browse/VAULT-3157
Release note for CHANGELOG: