Skip to content

propagate tctl verbose flag #29839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GavinFrazar merged 1 commit into from
Aug 1, 2023
Merged

propagate tctl verbose flag #29839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tool/tctl/common/app_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions tool/tctl/common/auth_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading