[v9] Move predicate err check earlier, inside RetryWithRelogin (#13368) #13747
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
Fixes a bug in tsh ls resources, where users were prompted to re-login when it was only a predicate query error. `RetryWithRelogin` now aborts the re-login attempt if the error is of type predicate.
github-actions
bot
added
the
tsh
ravicious
reviewed
Jun 22, 2022
lib/client/api.go
Outdated
Comment on lines
701
to
705
|
|
||
| if utils.IsPredicateError(err) { | ||
| return trace.Wrap(utils.PredicateError{Err: err}) | ||
| } | ||
|
|
There was a problem hiding this comment.
In v10, IsErrorResolvableWithRelogin replaced the check on line 698, so I think it'd be more correct to move this predicate error check before line 698 to make it work just the same way as in v10.
There was a problem hiding this comment.
thank you for catching that, that would've been a bug
ravicious
approved these changes
Jun 22, 2022
ibeckermayer
approved these changes
Jun 22, 2022
zmb3
approved these changes
Jun 24, 2022
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.
Backport #13368 to branch/v9