From eeb09e835531ca7f56e57f98c437a3081e049ae2 Mon Sep 17 00:00:00 2001 From: Steven Martin Date: Mon, 29 Jul 2024 06:45:56 -0400 Subject: [PATCH 1/2] update plugin command descriptions --- tool/tctl/common/plugin/okta.go | 2 +- tool/tctl/common/plugin/plugins_command.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tool/tctl/common/plugin/okta.go b/tool/tctl/common/plugin/okta.go index 75c5bcb2e7c7c..e63ee8a512610 100644 --- a/tool/tctl/common/plugin/okta.go +++ b/tool/tctl/common/plugin/okta.go @@ -34,7 +34,7 @@ import ( ) func (p *PluginsCommand) initInstallOkta(parent *kingpin.CmdClause) { - p.install.okta.cmd = parent.Command("okta", "Install an okta integration") + p.install.okta.cmd = parent.Command("okta", "Install an Okta integration.") p.install.okta.cmd. Flag("name", "Name of the plugin resource to create"). Default("okta"). diff --git a/tool/tctl/common/plugin/plugins_command.go b/tool/tctl/common/plugin/plugins_command.go index 56bebe1a655f9..7ce0c257c9241 100644 --- a/tool/tctl/common/plugin/plugins_command.go +++ b/tool/tctl/common/plugin/plugins_command.go @@ -86,7 +86,7 @@ func (p *PluginsCommand) Initialize(app *kingpin.Application, config *servicecfg pluginsCommand := app.Command("plugins", "Manage Teleport plugins.").Hidden() p.cleanupCmd = pluginsCommand.Command("cleanup", "Cleans up the given plugin type.") - p.cleanupCmd.Arg("type", "The type of plugin to cleanup. Only supports okta at present.").Required().EnumVar(&p.pluginType, string(types.PluginTypeOkta)) + p.cleanupCmd.Arg("type", "The type of plugin to cleanup. Only supports Okta at present.").Required().EnumVar(&p.pluginType, string(types.PluginTypeOkta)) p.cleanupCmd.Flag("dry-run", "Dry run the cleanup command. Dry run defaults to on.").Default("true").BoolVar(&p.dryRun) p.initInstall(pluginsCommand, config) @@ -101,7 +101,7 @@ func (p *PluginsCommand) initInstall(parent *kingpin.CmdClause, config *servicec } func (p *PluginsCommand) initInstallSCIM(parent *kingpin.CmdClause) { - p.install.scim.cmd = p.install.cmd.Command("scim", "Install a new SCIM integration") + p.install.scim.cmd = p.install.cmd.Command("scim", "Install a new SCIM integration.") p.install.scim.cmd. Flag("name", "The name of the SCIM plugin resource to create"). Default("scim"). @@ -130,7 +130,7 @@ func (p *PluginsCommand) initInstallSCIM(parent *kingpin.CmdClause) { } func (p *PluginsCommand) initDelete(parent *kingpin.CmdClause) { - p.delete.cmd = parent.Command("delete", "Remove a plugin instance") + p.delete.cmd = parent.Command("delete", "Remove a plugin instance.") p.delete.cmd. Arg("name", "The name of the SCIM plugin resource to delete"). StringVar(&p.delete.name) From 3d8495fac9ef7d018da893e4f4b864d0b4edf3d2 Mon Sep 17 00:00:00 2001 From: Steven Martin Date: Tue, 30 Jul 2024 10:04:15 -0400 Subject: [PATCH 2/2] verbiage update for logging plugin clean up Co-authored-by: Zac Bergquist --- tool/tctl/common/plugin/plugins_command.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/tctl/common/plugin/plugins_command.go b/tool/tctl/common/plugin/plugins_command.go index 7ce0c257c9241..ba6c92f7ae5a9 100644 --- a/tool/tctl/common/plugin/plugins_command.go +++ b/tool/tctl/common/plugin/plugins_command.go @@ -86,7 +86,7 @@ func (p *PluginsCommand) Initialize(app *kingpin.Application, config *servicecfg pluginsCommand := app.Command("plugins", "Manage Teleport plugins.").Hidden() p.cleanupCmd = pluginsCommand.Command("cleanup", "Cleans up the given plugin type.") - p.cleanupCmd.Arg("type", "The type of plugin to cleanup. Only supports Okta at present.").Required().EnumVar(&p.pluginType, string(types.PluginTypeOkta)) + p.cleanupCmd.Arg("type", "The type of plugin to clean up. Only supports Okta at present.").Required().EnumVar(&p.pluginType, string(types.PluginTypeOkta)) p.cleanupCmd.Flag("dry-run", "Dry run the cleanup command. Dry run defaults to on.").Default("true").BoolVar(&p.dryRun) p.initInstall(pluginsCommand, config)