Skip to content

update message on empty tsh ls results #28095

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
stevenGravy merged 4 commits into from
Jun 21, 2023
Merged

update message on empty tsh ls results #28095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42a5381
update message on empty tsh ls results
stevenGravy Jun 21, 2023
a735662
Update message to have no docs
stevenGravy Jun 21, 2023
008ed00
update verbiage
stevenGravy Jun 21, 2023
ed165a2
Merge branch 'master' into stevenGravy/tshlsempty
stevenGravy Jun 21, 2023
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
8 changes: 4 additions & 4 deletions tool/tsh/common/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ EXAMPLES:
For passwordless authentication use:
$ tsh login --auth=passwordless`

// missingPrincipalsFooter is printed at the bottom of `tsh ls` when no results are returned.
missingPrincipalsFooter = `
Not seeing nodes? Your user may be missing Linux principals. If trying Teleport for the first time, follow this guide:
// emptyNodesFooter is printed at the bottom of `tsh ls` when no results are returned for nodes.
emptyNodesFooter = `
Not seeing nodes? Either no nodes are available or your user's roles do not match the labels of at least one node.

https://goteleport.com/docs/getting-started/linux-server/#step-46-create-a-teleport-user-and-set-up-two-factor-authentication
Check with your Teleport cluster administrator that your user's roles should have nodes available.
`
)
4 changes: 2 additions & 2 deletions tool/tsh/common/tsh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2268,7 +2268,7 @@ func listNodesAllClusters(cf *CLIConf) error {

// Sometimes a user won't see any nodes because they're missing principals.
if len(listings) == 0 {
if _, err := fmt.Fprintln(cf.Stderr(), missingPrincipalsFooter); err != nil {
if _, err := fmt.Fprintln(cf.Stderr(), emptyNodesFooter); err != nil {
return trace.Wrap(err)
}
}
Expand Down Expand Up @@ -2466,7 +2466,7 @@ func printNodes(nodes []types.Server, conf *CLIConf) error {

// Sometimes a user won't see any nodes because they're missing principals.
if len(nodes) == 0 {
if _, err := fmt.Fprintln(conf.Stderr(), missingPrincipalsFooter); err != nil {
if _, err := fmt.Fprintln(conf.Stderr(), emptyNodesFooter); err != nil {
return trace.Wrap(err)
}
}
Expand Down