From 42a5381862144cca024765479ef44d95930d3c2a Mon Sep 17 00:00:00 2001 From: Steven Martin Date: Wed, 21 Jun 2023 09:00:44 -0400 Subject: [PATCH 1/3] update message on empty tsh ls results --- tool/tsh/common/help.go | 8 ++++---- tool/tsh/common/tsh.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tool/tsh/common/help.go b/tool/tsh/common/help.go index 6ab22f0adc8fc..c64605040a9e6 100644 --- a/tool/tsh/common/help.go +++ b/tool/tsh/common/help.go @@ -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? Your user's roles may not have matching node labels. If trying Teleport for the first time, follow this guide: -https://goteleport.com/docs/getting-started/linux-server/#step-46-create-a-teleport-user-and-set-up-two-factor-authentication +https://goteleport.com/docs/server-access/getting-started ` ) diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go index 4369620e2003f..7ff575a5e2fbc 100644 --- a/tool/tsh/common/tsh.go +++ b/tool/tsh/common/tsh.go @@ -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) } } @@ -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) } } From a7356627f84dbea9558d674c1659320dcee6d3cb Mon Sep 17 00:00:00 2001 From: Steven Martin Date: Wed, 21 Jun 2023 16:46:23 -0400 Subject: [PATCH 2/3] Update message to have no docs --- tool/tsh/common/help.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tool/tsh/common/help.go b/tool/tsh/common/help.go index c64605040a9e6..d8be6ed056b35 100644 --- a/tool/tsh/common/help.go +++ b/tool/tsh/common/help.go @@ -42,8 +42,8 @@ EXAMPLES: // emptyNodesFooter is printed at the bottom of `tsh ls` when no results are returned for nodes. emptyNodesFooter = ` - Not seeing nodes? Your user's roles may not have matching node labels. If trying Teleport for the first time, follow this guide: + Not seeing nodes? Either no nodes are available or roles for your user do not match to node labels. -https://goteleport.com/docs/server-access/getting-started + Check with your Teleport cluster administrator that your user's roles should have nodes available. ` ) From 008ed00b87188b50b8b03ac5914acb22ea075af7 Mon Sep 17 00:00:00 2001 From: Steven Martin Date: Wed, 21 Jun 2023 16:57:38 -0400 Subject: [PATCH 3/3] update verbiage Co-authored-by: Paul Gottschling --- tool/tsh/common/help.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/tsh/common/help.go b/tool/tsh/common/help.go index d8be6ed056b35..3810edc053d3d 100644 --- a/tool/tsh/common/help.go +++ b/tool/tsh/common/help.go @@ -42,7 +42,7 @@ EXAMPLES: // 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 roles for your user do not match to node labels. + Not seeing nodes? Either no nodes are available or your user's roles do not match the labels of at least one node. Check with your Teleport cluster administrator that your user's roles should have nodes available. `