Skip to content

tsh kube login by name prefix, labels, and/or query #30252

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 2 commits into from
Aug 14, 2023
Merged

tsh kube login by name prefix, labels, and/or query #30252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d2a5a6
tsh kube login by prefix, query, labels
GavinFrazar Aug 14, 2023
c3d159a
Merge branch 'master' into gavinfrazar/tsh-resource-selection-ux-kube
GavinFrazar Aug 14, 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
13 changes: 10 additions & 3 deletions tool/tsh/common/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,7 +1586,8 @@ func formatAmbiguousDB(cf *CLIConf, selectors resourceSelectors, matchedDBs type
showDatabasesAsText(&sb, cf.SiteName, matchedDBs, activeDBs, checker, verbose)

listCommand := formatDatabaseListCommand(cf.SiteName)
return formatAmbiguityErrTemplate(cf, selectors, listCommand, sb.String())
fullNameExample := matchedDBs[0].GetName()
return formatAmbiguityErrTemplate(cf, selectors, listCommand, sb.String(), fullNameExample)
}

// resourceSelectors is a helper struct for gathering up the selectors for a
Expand Down Expand Up @@ -1616,15 +1617,21 @@ func (r resourceSelectors) String() string {
return strings.TrimSpace(out)
}

// IsEmpty returns whether the selectors (except kind) are empty.
func (r resourceSelectors) IsEmpty() bool {
return r.name == "" && r.labels == "" && r.query == ""
}

// formatAmbiguityErrTemplate is a helper func that formats an ambiguous
// resource error message.
func formatAmbiguityErrTemplate(cf *CLIConf, selectors resourceSelectors, listCommand, matchTable string) string {
func formatAmbiguityErrTemplate(cf *CLIConf, selectors resourceSelectors, listCommand, matchTable, fullNameExample string) string {
data := map[string]any{
"command": cf.CommandWithBinary(),
"selectors": strings.TrimSpace(selectors.String()),
"listCommand": strings.TrimSpace(listCommand),
"kind": strings.TrimSpace(selectors.kind),
"matchTable": strings.TrimSpace(matchTable),
"example": strings.TrimSpace(fullNameExample),
}
var sb strings.Builder
_ = ambiguityErrTemplate.Execute(&sb, data)
Expand Down Expand Up @@ -1692,7 +1699,7 @@ You can start a local proxy for database GUI clients:
{{ .matchTable }}

Hint: use '{{ .listCommand }} -v' or '{{ .listCommand }} --format=[json|yaml]' to list all {{ .kind }}s with full details.
Hint: try selecting the {{ .kind }} with a more specific name (ex: {{ .command }} full-{{ .kind }}-name).
Hint: try selecting the {{ .kind }} with a more specific name (ex: {{ .command }} {{ .example }}).
Hint: try selecting the {{ .kind }} with additional --labels or --query predicate.
`))
)
Loading