Skip to content

[v13] Capitalize Teleport in command/args #25544

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 1 commit into from
May 3, 2023
Merged

[v13] Capitalize Teleport in command/args #25544

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
2 changes: 1 addition & 1 deletion tool/tctl/common/auth_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func (a *AuthCommand) Initialize(app *kingpin.Application, config *servicecfg.Co
Default(fmt.Sprintf("%v", apidefaults.CertDuration)).
DurationVar(&a.genTTL)
a.authSign.Flag("compat", "OpenSSH compatibility flag").StringVar(&a.compatibility)
a.authSign.Flag("proxy", `Address of the teleport proxy. When --format is set to "kubernetes", this address will be set as cluster address in the generated kubeconfig file`).StringVar(&a.proxyAddr)
a.authSign.Flag("proxy", `Address of the Teleport proxy. When --format is set to "kubernetes", this address will be set as cluster address in the generated kubeconfig file`).StringVar(&a.proxyAddr)
a.authSign.Flag("overwrite", "Whether to overwrite existing destination files. When not set, user will be prompted before overwriting any existing file.").BoolVar(&a.signOverwrite)
// --kube-cluster was an unfortunately chosen flag name, before teleport
// supported kubernetes_service and registered kubernetes clusters that are
Expand Down
2 changes: 1 addition & 1 deletion tool/tctl/common/inventory_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func (c *InventoryCommand) Initialize(app *kingpin.Application, config *servicec
c.inventoryStatus = inventory.Command("status", "Show inventory status summary")
c.inventoryStatus.Flag("connected", "Show locally connected instances summary").BoolVar(&c.getConnected)

c.inventoryList = inventory.Command("list", "List teleport instance inventory").Alias("ls")
c.inventoryList = inventory.Command("list", "List Teleport instance inventory").Alias("ls")
c.inventoryList.Flag("version", "Filter output by version").StringVar(&c.version)
c.inventoryList.Flag("services", "Filter output by service (node,kube,proxy,etc)").StringVar(&c.services)
c.inventoryList.Flag("format", "Output format, 'text' or 'json'").Default(teleport.Text).StringVar(&c.format)
Expand Down
2 changes: 1 addition & 1 deletion tool/teleport/common/teleport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ func Run(options Options) (app *kingpin.Application, executedCommand string, con
dumpNodeConfigure.Flag("labels", "Comma-separated list of labels to add to newly created nodes ex) env=staging,cloud=aws.").StringVar(&dumpFlags.NodeLabels)
dumpNodeConfigure.Flag("ca-pin", "Comma-separated list of SKPI hashes for the CA used to verify the auth server.").StringVar(&dumpFlags.CAPin)
dumpNodeConfigure.Flag("join-method", "Method to use to join the cluster (token, iam, ec2, kubernetes)").Default("token").EnumVar(&dumpFlags.JoinMethod, "token", "iam", "ec2", "kubernetes", "azure")
dumpNodeConfigure.Flag("node-name", "Name for the teleport node.").StringVar(&dumpFlags.NodeName)
dumpNodeConfigure.Flag("node-name", "Name for the Teleport node.").StringVar(&dumpFlags.NodeName)

waitCmd := app.Command(teleport.WaitSubCommand, "Used internally by Teleport to onWait until a specific condition is reached.").Hidden()
waitNoResolveCmd := waitCmd.Command("no-resolve", "Used internally to onWait until a domain stops resolving IP addresses.")
Expand Down
2 changes: 1 addition & 1 deletion tool/tsh/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ EXAMPLES:

// 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:
Not seeing nodes? Your user may be missing Linux principals. 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
`
Expand Down
2 changes: 1 addition & 1 deletion tool/tsh/kube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ func newKubeCredentialsCommand(parent *kingpin.CmdClause) *kubeCredentialsComman
// tsh generates and never by users directly.
CmdClause: parent.Command("credentials", "Get credentials for kubectl access").Hidden(),
}
c.Flag("teleport-cluster", "Name of the teleport cluster to get credentials for.").Required().StringVar(&c.teleportCluster)
c.Flag("teleport-cluster", "Name of the Teleport cluster to get credentials for.").Required().StringVar(&c.teleportCluster)
c.Flag("kube-cluster", "Name of the Kubernetes cluster to get credentials for.").Required().StringVar(&c.kubeCluster)
return c
}
Expand Down