Do not return error in the case of an expired accessor #148
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
There was a problem hiding this comment.
Hi @jorgemarey ! Thanks for submitting this code, I appreciate it.
I've made a ton of changes so I was wondering if you could merge in master. With that, I'd be happy to approve and merge. My one comment is just a request, not a must.
| @@ -120,6 +120,10 @@ func approleAuthBackendLoginRead(d *schema.ResourceData, meta interface{}) error | |||
| log.Printf("[DEBUG] Reading token %q", d.Id()) | |||
| resp, err := client.Auth().Token().LookupAccessor(d.Id()) | |||
| if err != nil { | |||
| // If the token is not found (it has expired) we don't return an error | |||
| if strings.Contains(err.Error(), "invalid accessor") { // Not found | |||
There was a problem hiding this comment.
Since this check occurs twice with the same string, and twice with a different string, it would be great to zip it up into a function like isExpiredTokenErr(err error) bool, and have its internals just check for both strings.
There was a problem hiding this comment.
Yeah, you're right. I'll merge in master and add this change!
ghost
added
the
|
Hi @tyrannosaurus-becks . I made the requested changes. I hope it's ok. |
tyrannosaurus-becks
approved these changes
Sep 25, 2018
dandandy
pushed a commit
to dandandy/terraform-provider-vault
that referenced
this pull request
Jun 17, 2021
…ccesor Do not return error in the case of an expired accessor
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.
Hi,
This PR makes changes to
vault_approle_auth_backend_role_secret_idandvault_approle_auth_backend_login. It checks if the accessor has expired and in that case it doesn't return an error.I don't know if the implementation is the best (it checks the error message), but I didn't find another solution for this. Let me know if someone finds a better solution for this. I'll change the code.
Should fix #97