propagate tctl verbose flag (#29870)

gravitational · Aug 2, 2023 · ab42702 · ab42702
1 parent fe39438
commit ab42702
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 89 deletions.
diff --git a/tool/tctl/common/app_command.go b/tool/tctl/common/app_command.go
@@ -104,11 +104,11 @@ func (c *AppsCommand) ListApps(ctx context.Context, clt auth.ClientI) error {
 		}
 	}
 
-	coll := &appServerCollection{servers: servers, verbose: c.verbose}
+	coll := &appServerCollection{servers: servers}
 
 	switch c.format {
 	case teleport.Text:
-		return trace.Wrap(coll.writeText(os.Stdout))
+		return trace.Wrap(coll.writeText(os.Stdout, c.verbose))
 	case teleport.JSON:
 		return trace.Wrap(coll.writeJSON(os.Stdout))
 	case teleport.YAML:

diff --git a/tool/tctl/common/auth_command.go b/tool/tctl/common/auth_command.go
@@ -414,11 +414,13 @@ func (a *AuthCommand) ListAuthServers(ctx context.Context, clusterAPI auth.Clien
 		return trace.Wrap(err)
 	}
 
-	sc := &serverCollection{servers, false}
+	sc := &serverCollection{servers}
 
 	switch a.format {
 	case teleport.Text:
-		return sc.writeText(os.Stdout)
+		// auth servers don't have labels.
+		verbose := false
+		return sc.writeText(os.Stdout, verbose)
 	case teleport.YAML:
 		return writeYAML(sc, os.Stdout)
 	case teleport.JSON: