Move predicate err check earlier, inside RetryWithRelogin (#13368)

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.
gravitational · Jun 22, 2022 · 71bc57c · 71bc57c
1 parent 5a452f1
commit 71bc57c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/lib/client/api.go b/lib/client/api.go
@@ -721,6 +721,10 @@ func RetryWithRelogin(ctx context.Context, tc *TeleportClient, fn func() error)
 		return nil
 	}
 
+	if utils.IsPredicateError(err) {
+		return trace.Wrap(utils.PredicateError{Err: err})
+	}
+
 	if !IsErrorResolvableWithRelogin(err) {
 		return trace.Wrap(err)
 	}

diff --git a/tool/tsh/db.go b/tool/tsh/db.go
@@ -57,9 +57,6 @@ func onListDatabases(cf *CLIConf) error {
 		return trace.Wrap(err)
 	})
 	if err != nil {
-		if utils.IsPredicateError(err) {
-			return trace.Wrap(utils.PredicateError{Err: err})
-		}
 		return trace.Wrap(err)
 	}
 

diff --git a/tool/tsh/kube.go b/tool/tsh/kube.go
@@ -963,9 +963,6 @@ func fetchKubeClusters(ctx context.Context, tc *client.TeleportClient) (teleport
 				}
 				return nil
 			}
-			if utils.IsPredicateError(err) {
-				return trace.Wrap(utils.PredicateError{Err: err})
-			}
 			return trace.Wrap(err)
 		}
 

diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go
@@ -1646,9 +1646,6 @@ func onListNodes(cf *CLIConf) error {
 		return err
 	})
 	if err != nil {
-		if utils.IsPredicateError(err) {
-			return trace.Wrap(utils.PredicateError{Err: err})
-		}
 		return trace.Wrap(err)
 	}
 	sort.Slice(nodes, func(i, j int) bool {
@@ -3528,9 +3525,6 @@ func onApps(cf *CLIConf) error {
 		return err
 	})
 	if err != nil {
-		if utils.IsPredicateError(err) {
-			return trace.Wrap(utils.PredicateError{Err: err})
-		}
 		return trace.Wrap(err)
 	}