diff --git a/internal/cmd/commands/authmethodscmd/authmethods.gen.go b/internal/cmd/commands/authmethodscmd/authmethods.gen.go index 56a073502..fcf4d1660 100644 --- a/internal/cmd/commands/authmethodscmd/authmethods.gen.go +++ b/internal/cmd/commands/authmethodscmd/authmethods.gen.go @@ -55,7 +55,7 @@ func (c *Command) Synopsis() string { return extra } - synopsisStr := "auth method" + synopsisStr := "auth-method" return common.SynopsisFunc(c.Func, synopsisStr) } diff --git a/internal/cmd/commands/authmethodscmd/ldap_authmethods.gen.go b/internal/cmd/commands/authmethodscmd/ldap_authmethods.gen.go index 1a86659b9..a48c684cc 100644 --- a/internal/cmd/commands/authmethodscmd/ldap_authmethods.gen.go +++ b/internal/cmd/commands/authmethodscmd/ldap_authmethods.gen.go @@ -56,7 +56,7 @@ func (c *LdapCommand) Synopsis() string { return extra } - synopsisStr := "auth method" + synopsisStr := "auth-method" synopsisStr = fmt.Sprintf("%s %s", "ldap-type", synopsisStr) diff --git a/internal/cmd/commands/authmethodscmd/oidc_authmethods.gen.go b/internal/cmd/commands/authmethodscmd/oidc_authmethods.gen.go index 39e7bee1a..28b64e101 100644 --- a/internal/cmd/commands/authmethodscmd/oidc_authmethods.gen.go +++ b/internal/cmd/commands/authmethodscmd/oidc_authmethods.gen.go @@ -56,7 +56,7 @@ func (c *OidcCommand) Synopsis() string { return extra } - synopsisStr := "auth method" + synopsisStr := "auth-method" synopsisStr = fmt.Sprintf("%s %s", "oidc-type", synopsisStr) diff --git a/internal/cmd/commands/authmethodscmd/password_authmethods.gen.go b/internal/cmd/commands/authmethodscmd/password_authmethods.gen.go index 46ab08fbd..2aa9aac31 100644 --- a/internal/cmd/commands/authmethodscmd/password_authmethods.gen.go +++ b/internal/cmd/commands/authmethodscmd/password_authmethods.gen.go @@ -56,7 +56,7 @@ func (c *PasswordCommand) Synopsis() string { return extra } - synopsisStr := "auth method" + synopsisStr := "auth-method" synopsisStr = fmt.Sprintf("%s %s", "password-type", synopsisStr) diff --git a/internal/cmd/commands/authtokenscmd/authtokens.gen.go b/internal/cmd/commands/authtokenscmd/authtokens.gen.go index 9bc9f7d09..4b2a43af8 100644 --- a/internal/cmd/commands/authtokenscmd/authtokens.gen.go +++ b/internal/cmd/commands/authtokenscmd/authtokens.gen.go @@ -55,7 +55,7 @@ func (c *Command) Synopsis() string { return extra } - synopsisStr := "auth token" + synopsisStr := "auth-token" return common.SynopsisFunc(c.Func, synopsisStr) } diff --git a/internal/cmd/commands/credentiallibrariescmd/credentiallibraries.gen.go b/internal/cmd/commands/credentiallibrariescmd/credentiallibraries.gen.go index bb204ecdc..dcf711a9a 100644 --- a/internal/cmd/commands/credentiallibrariescmd/credentiallibraries.gen.go +++ b/internal/cmd/commands/credentiallibrariescmd/credentiallibraries.gen.go @@ -55,7 +55,7 @@ func (c *Command) Synopsis() string { return extra } - synopsisStr := "credential library" + synopsisStr := "credential-library" return common.SynopsisFunc(c.Func, synopsisStr) } diff --git a/internal/cmd/commands/credentiallibrariescmd/vault-generic_credentiallibraries.gen.go b/internal/cmd/commands/credentiallibrariescmd/vault-generic_credentiallibraries.gen.go index e154cd52e..4bfd5dce2 100644 --- a/internal/cmd/commands/credentiallibrariescmd/vault-generic_credentiallibraries.gen.go +++ b/internal/cmd/commands/credentiallibrariescmd/vault-generic_credentiallibraries.gen.go @@ -56,7 +56,7 @@ func (c *VaultGenericCommand) Synopsis() string { return extra } - synopsisStr := "credential library" + synopsisStr := "credential-library" synopsisStr = fmt.Sprintf("%s %s", "vault-generic-type", synopsisStr) diff --git a/internal/cmd/commands/credentiallibrariescmd/vault-ssh-certificate_credentiallibraries.gen.go b/internal/cmd/commands/credentiallibrariescmd/vault-ssh-certificate_credentiallibraries.gen.go index 862c60d2d..f26817633 100644 --- a/internal/cmd/commands/credentiallibrariescmd/vault-ssh-certificate_credentiallibraries.gen.go +++ b/internal/cmd/commands/credentiallibrariescmd/vault-ssh-certificate_credentiallibraries.gen.go @@ -56,7 +56,7 @@ func (c *VaultSshCertificateCommand) Synopsis() string { return extra } - synopsisStr := "credential library" + synopsisStr := "credential-library" synopsisStr = fmt.Sprintf("%s %s", "vault-ssh-certificate-type", synopsisStr) diff --git a/internal/cmd/commands/credentiallibrariescmd/vault_credentiallibraries.gen.go b/internal/cmd/commands/credentiallibrariescmd/vault_credentiallibraries.gen.go index b2e76a154..4fbccb079 100644 --- a/internal/cmd/commands/credentiallibrariescmd/vault_credentiallibraries.gen.go +++ b/internal/cmd/commands/credentiallibrariescmd/vault_credentiallibraries.gen.go @@ -56,7 +56,7 @@ func (c *VaultCommand) Synopsis() string { return extra } - synopsisStr := "credential library" + synopsisStr := "credential-library" synopsisStr = fmt.Sprintf("%s %s", "vault-type", synopsisStr) diff --git a/internal/cmd/commands/credentialstorescmd/credentialstores.gen.go b/internal/cmd/commands/credentialstorescmd/credentialstores.gen.go index a6555f23a..69051dfd4 100644 --- a/internal/cmd/commands/credentialstorescmd/credentialstores.gen.go +++ b/internal/cmd/commands/credentialstorescmd/credentialstores.gen.go @@ -55,7 +55,7 @@ func (c *Command) Synopsis() string { return extra } - synopsisStr := "credential store" + synopsisStr := "credential-store" return common.SynopsisFunc(c.Func, synopsisStr) } diff --git a/internal/cmd/commands/credentialstorescmd/static_credentialstores.gen.go b/internal/cmd/commands/credentialstorescmd/static_credentialstores.gen.go index 8736c5e2e..404246f07 100644 --- a/internal/cmd/commands/credentialstorescmd/static_credentialstores.gen.go +++ b/internal/cmd/commands/credentialstorescmd/static_credentialstores.gen.go @@ -54,7 +54,7 @@ func (c *StaticCommand) Synopsis() string { return extra } - synopsisStr := "credential store" + synopsisStr := "credential-store" synopsisStr = fmt.Sprintf("%s %s", "static-type", synopsisStr) diff --git a/internal/cmd/commands/credentialstorescmd/vault_credentialstores.gen.go b/internal/cmd/commands/credentialstorescmd/vault_credentialstores.gen.go index 8c4eb8cb6..0e1c3a5ca 100644 --- a/internal/cmd/commands/credentialstorescmd/vault_credentialstores.gen.go +++ b/internal/cmd/commands/credentialstorescmd/vault_credentialstores.gen.go @@ -56,7 +56,7 @@ func (c *VaultCommand) Synopsis() string { return extra } - synopsisStr := "credential store" + synopsisStr := "credential-store" synopsisStr = fmt.Sprintf("%s %s", "vault-type", synopsisStr) diff --git a/internal/cmd/commands/hostcatalogscmd/hostcatalogs.gen.go b/internal/cmd/commands/hostcatalogscmd/hostcatalogs.gen.go index 78c40e6da..1bb56a9c0 100644 --- a/internal/cmd/commands/hostcatalogscmd/hostcatalogs.gen.go +++ b/internal/cmd/commands/hostcatalogscmd/hostcatalogs.gen.go @@ -55,7 +55,7 @@ func (c *Command) Synopsis() string { return extra } - synopsisStr := "host catalog" + synopsisStr := "host-catalog" return common.SynopsisFunc(c.Func, synopsisStr) } diff --git a/internal/cmd/commands/hostcatalogscmd/plugin_hostcatalogs.gen.go b/internal/cmd/commands/hostcatalogscmd/plugin_hostcatalogs.gen.go index 9f67aec60..b79678e67 100644 --- a/internal/cmd/commands/hostcatalogscmd/plugin_hostcatalogs.gen.go +++ b/internal/cmd/commands/hostcatalogscmd/plugin_hostcatalogs.gen.go @@ -54,7 +54,7 @@ func (c *PluginCommand) Synopsis() string { return extra } - synopsisStr := "host catalog" + synopsisStr := "host-catalog" synopsisStr = fmt.Sprintf("%s %s", "plugin-type", synopsisStr) diff --git a/internal/cmd/commands/hostcatalogscmd/static_hostcatalogs.gen.go b/internal/cmd/commands/hostcatalogscmd/static_hostcatalogs.gen.go index 9fba63abd..bc8d6c75c 100644 --- a/internal/cmd/commands/hostcatalogscmd/static_hostcatalogs.gen.go +++ b/internal/cmd/commands/hostcatalogscmd/static_hostcatalogs.gen.go @@ -54,7 +54,7 @@ func (c *StaticCommand) Synopsis() string { return extra } - synopsisStr := "host catalog" + synopsisStr := "host-catalog" synopsisStr = fmt.Sprintf("%s %s", "static-type", synopsisStr) diff --git a/internal/cmd/commands/hostsetscmd/hostsets.gen.go b/internal/cmd/commands/hostsetscmd/hostsets.gen.go index 539ce9e58..f0cb20d99 100644 --- a/internal/cmd/commands/hostsetscmd/hostsets.gen.go +++ b/internal/cmd/commands/hostsetscmd/hostsets.gen.go @@ -57,7 +57,7 @@ func (c *Command) Synopsis() string { return extra } - synopsisStr := "host set" + synopsisStr := "host-set" return common.SynopsisFunc(c.Func, synopsisStr) } diff --git a/internal/cmd/commands/hostsetscmd/plugin_hostsets.gen.go b/internal/cmd/commands/hostsetscmd/plugin_hostsets.gen.go index 3bd6f0268..82ebf036a 100644 --- a/internal/cmd/commands/hostsetscmd/plugin_hostsets.gen.go +++ b/internal/cmd/commands/hostsetscmd/plugin_hostsets.gen.go @@ -56,7 +56,7 @@ func (c *PluginCommand) Synopsis() string { return extra } - synopsisStr := "host set" + synopsisStr := "host-set" synopsisStr = fmt.Sprintf("%s %s", "plugin-type", synopsisStr) diff --git a/internal/cmd/commands/hostsetscmd/static_hostsets.gen.go b/internal/cmd/commands/hostsetscmd/static_hostsets.gen.go index fddec896b..e9309e3fa 100644 --- a/internal/cmd/commands/hostsetscmd/static_hostsets.gen.go +++ b/internal/cmd/commands/hostsetscmd/static_hostsets.gen.go @@ -54,7 +54,7 @@ func (c *StaticCommand) Synopsis() string { return extra } - synopsisStr := "host set" + synopsisStr := "host-set" synopsisStr = fmt.Sprintf("%s %s", "static-type", synopsisStr) diff --git a/internal/cmd/commands/managedgroupscmd/ldap_managedgroups.gen.go b/internal/cmd/commands/managedgroupscmd/ldap_managedgroups.gen.go index 4ae135b95..af8709edb 100644 --- a/internal/cmd/commands/managedgroupscmd/ldap_managedgroups.gen.go +++ b/internal/cmd/commands/managedgroupscmd/ldap_managedgroups.gen.go @@ -56,7 +56,7 @@ func (c *LdapCommand) Synopsis() string { return extra } - synopsisStr := "managed group" + synopsisStr := "managed-group" synopsisStr = fmt.Sprintf("%s %s", "ldap-type", synopsisStr) diff --git a/internal/cmd/commands/managedgroupscmd/managedgroups.gen.go b/internal/cmd/commands/managedgroupscmd/managedgroups.gen.go index ca3a3918b..b9cb82209 100644 --- a/internal/cmd/commands/managedgroupscmd/managedgroups.gen.go +++ b/internal/cmd/commands/managedgroupscmd/managedgroups.gen.go @@ -55,7 +55,7 @@ func (c *Command) Synopsis() string { return extra } - synopsisStr := "managed group" + synopsisStr := "managed-group" return common.SynopsisFunc(c.Func, synopsisStr) } diff --git a/internal/cmd/commands/managedgroupscmd/oidc_managedgroups.gen.go b/internal/cmd/commands/managedgroupscmd/oidc_managedgroups.gen.go index 5b7ed8d3e..f04cc62e4 100644 --- a/internal/cmd/commands/managedgroupscmd/oidc_managedgroups.gen.go +++ b/internal/cmd/commands/managedgroupscmd/oidc_managedgroups.gen.go @@ -56,7 +56,7 @@ func (c *OidcCommand) Synopsis() string { return extra } - synopsisStr := "managed group" + synopsisStr := "managed-group" synopsisStr = fmt.Sprintf("%s %s", "oidc-type", synopsisStr) diff --git a/internal/cmd/commands/sessionrecordingscmd/sessionrecordings.gen.go b/internal/cmd/commands/sessionrecordingscmd/sessionrecordings.gen.go index ca5b08f1c..2a26bf849 100644 --- a/internal/cmd/commands/sessionrecordingscmd/sessionrecordings.gen.go +++ b/internal/cmd/commands/sessionrecordingscmd/sessionrecordings.gen.go @@ -57,7 +57,7 @@ func (c *Command) Synopsis() string { return extra } - synopsisStr := "session recording" + synopsisStr := "session-recording" return common.SynopsisFunc(c.Func, synopsisStr) } diff --git a/internal/cmd/commands/storagebucketscmd/storagebuckets.gen.go b/internal/cmd/commands/storagebucketscmd/storagebuckets.gen.go index 5dc0abda1..449435b78 100644 --- a/internal/cmd/commands/storagebucketscmd/storagebuckets.gen.go +++ b/internal/cmd/commands/storagebucketscmd/storagebuckets.gen.go @@ -57,7 +57,7 @@ func (c *Command) Synopsis() string { return extra } - synopsisStr := "storage bucket" + synopsisStr := "storage-bucket" return common.SynopsisFunc(c.Func, synopsisStr) } diff --git a/internal/cmd/common/help.go b/internal/cmd/common/help.go index 261ab749a..57fec9579 100644 --- a/internal/cmd/common/help.go +++ b/internal/cmd/common/help.go @@ -15,9 +15,10 @@ import ( func SynopsisFunc(inFunc, resType string) string { if inFunc == "" { - return wordwrap.WrapString(fmt.Sprintf("Manage Boundary %ss", resType), base.TermWidth) + pluralType := strings.ReplaceAll(resource.Map[resType].PluralString(), "-", " ") + return wordwrap.WrapString(fmt.Sprintf("Manage Boundary %s", pluralType), base.TermWidth) } - articleType := resType + articleType := strings.ReplaceAll(resType, "-", " ") switch resType[0] { case 'a', 'e', 'i', 'o': articleType = fmt.Sprintf("an %s", articleType) diff --git a/internal/cmd/gencli/templates.go b/internal/cmd/gencli/templates.go index 53306c786..1cecc6d56 100644 --- a/internal/cmd/gencli/templates.go +++ b/internal/cmd/gencli/templates.go @@ -143,7 +143,8 @@ func (c *{{ camelCase .SubActionPrefix }}Command) Synopsis() string { return extra } - synopsisStr := "{{ lowerSpaceCase .ResourceType }}" + synopsisStr := "{{ .ResourceType }}" + {{ if .SubActionPrefix }} synopsisStr = fmt.Sprintf("%s %s", "{{ kebabCase .SubActionPrefix }}-type", synopsisStr) {{ end }}