Skip to content

fix: fix command aliases #1263

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: fix command aliases #1263

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
1 change: 0 additions & 1 deletion pkg/bkctl/autorecovery/autorecovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
resourceCmd := cmdutils.NewResourceCmd(
"auto-recovery",
"Operations about auto recovering",
"",
"")

commands := []func(*cmdutils.VerbCmd){
Expand Down
1 change: 0 additions & 1 deletion pkg/bkctl/autorecovery/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ func testAutoRecoveryCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string
resourceCmd := cmdutils.NewResourceCmd(
"auto-recovery",
"Operations about auto recovering",
"",
"")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
Expand Down
1 change: 0 additions & 1 deletion pkg/bkctl/bookie/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ func testBookieCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string) (out
resourceCmd := cmdutils.NewResourceCmd(
"bookie",
"Operations about bookie(s)",
"",
"")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
Expand Down
1 change: 0 additions & 1 deletion pkg/bkctl/ledger/ledger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
resourceCmd := cmdutils.NewResourceCmd(
"ledger",
"Operations about ledger",
"",
"")

commands := []func(*cmdutils.VerbCmd){
Expand Down
1 change: 0 additions & 1 deletion pkg/bkctl/ledger/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ func testLedgerCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string) (out
resourceCmd := cmdutils.NewResourceCmd(
"ledger",
"Operations about bookie(s)",
"",
"")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
Expand Down
2 changes: 1 addition & 1 deletion pkg/ctl/brokers/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestBrokersCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string) (ou
"brokers",
"Operations about broker(s)",
"",
"brokers")
"broker")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/brokerstats/broker_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
resourceCmd := cmdutils.NewResourceCmd(
"broker-stats",
"Operations to collect broker statistics",
"",
"broker-stats")
"")

cmdutils.AddVerbCmd(flagGrouping, resourceCmd, dumpMonitoringMetrics)
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, dumpMBeans)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/brokerstats/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ func TestBrokerStatsCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string)
resourceCmd := cmdutils.NewResourceCmd(
"broker-stats",
"Operations to collect broker statistics",
"",
"broker-stats")
"")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
1 change: 0 additions & 1 deletion pkg/ctl/cluster/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ func ListClustersCmd(vc *cmdutils.VerbCmd) {
"List the available pulsar clusters",
"This command is used for listing the list of available pulsar clusters.",
desc.ExampleToString(),
"",
)

// set the run function
Expand Down
2 changes: 1 addition & 1 deletion pkg/ctl/functions/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestFunctionsCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string) (
"functions",
"Operations about Pulsar Functions",
"",
"functions")
"pf")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
2 changes: 1 addition & 1 deletion pkg/ctl/functionsworker/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestFunctionsWorkerCmd(newVerb func(cmd *cmdutils.VerbCmd), args []string)
"functions-worker",
"Operations to collect function-worker statistics",
"",
"functions-worker")
"pfw")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/nsisolationpolicy/ns_isolation_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
resourceCmd := cmdutils.NewResourceCmd(
"ns-isolation-policy",
"Operations about namespace isolation policy",
"",
"ns-isolation-policy")
"")

cmdutils.AddVerbCmd(flagGrouping, resourceCmd, getNsIsolationPolicy)
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, getNsIsolationPolicies)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/nsisolationpolicy/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ func TestNsIsolationPolicyCommands(newVerb func(cmd *cmdutils.VerbCmd), args []s
resourceCmd := cmdutils.NewResourceCmd(
"ns-isolation-policy",
"Operations about namespace isolation policy",
"",
"ns-isolation-policy")
"")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/packages/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ func TestPackagesCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string) (o
resourceCmd := cmdutils.NewResourceCmd(
"packages",
"Operations about packages",
"",
"packages")
"")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
6 changes: 5 additions & 1 deletion pkg/ctl/plugin/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ func testPluginCommands(newVerb func(*cmdutils.VerbCmd), args []string) (out *by
rootCmd.SetArgs(append([]string{"plugin"}, args...))
flagGrouping := cmdutils.NewGrouping()
rootCmd.AddCommand(Command(flagGrouping))
resourceCmd := cmdutils.NewResourceCmd("plugin", "", "")
resourceCmd := cmdutils.NewResourceCmd(
"plugin",
"Operations about plugins",
"",
"plugins")
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
err = rootCmd.Execute()
return
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/resourcequotas/resource_quotas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
resourceCmd := cmdutils.NewResourceCmd(
"resource-quotas",
"Operations about resource quotas",
"",
"resource-quotas")
"")

cmdutils.AddVerbCmd(flagGrouping, resourceCmd, getResourceQuota)
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, setResourceQuota)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/resourcequotas/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ func TestResourceQuotaCommands(newVerb func(cmd *cmdutils.VerbCmd), args []strin
resourceCmd := cmdutils.NewResourceCmd(
"resource-quota",
"Operations about resource quotas",
"",
"resource-quota")
"")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
4 changes: 1 addition & 3 deletions pkg/ctl/schemas/schemas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
resourceCmd := cmdutils.NewResourceCmd(
"schemas",
"Operations related to Schemas associated with Pulsar topics",
"",
"schemas",
)
"")

cmdutils.AddVerbCmd(flagGrouping, resourceCmd, getSchema)
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, deleteSchema)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/schemas/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ func TestSchemasCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string) (ou
resourceCmd := cmdutils.NewResourceCmd(
"schemas",
"Operations about schemas",
"",
"schemas")
"")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
4 changes: 1 addition & 3 deletions pkg/ctl/sinks/sinks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
resourceCmd := cmdutils.NewResourceCmd(
"sinks",
"Interface for managing Pulsar IO sinks (egress data from Pulsar)",
"",
"sinks",
)
"")

cmdutils.AddVerbCmd(flagGrouping, resourceCmd, createSinksCmd)
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, updateSinksCmd)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/sinks/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ func TestSinksCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string) (out
resourceCmd := cmdutils.NewResourceCmd(
"sinks",
"Operations about Pulsar Sinks",
"",
"sinks")
"")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
4 changes: 1 addition & 3 deletions pkg/ctl/sources/sources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
resourceCmd := cmdutils.NewResourceCmd(
"sources",
"Interface for managing Pulsar IO Sources (ingress data into Pulsar)",
"",
"sources",
)
"")

cmdutils.AddVerbCmd(flagGrouping, resourceCmd, createSourcesCmd)
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, updateSourcesCmd)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/sources/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ func TestSourcesCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string) (ou
resourceCmd := cmdutils.NewResourceCmd(
"sources",
"Operations about Pulsar Sources",
"",
"sources")
"")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/status/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
statusCmd := cmdutils.NewResourceCmd(
"status",
"Check service(broker or proxy) status",
"",
"status")
"")
cmdutils.AddVerbCmd(flagGrouping, statusCmd, checkStatusCmd)

return statusCmd
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/status/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ func testStatusCommands(newVerb func(*cmdutils.VerbCmd), args []string) (out *by
resourceCmd := cmdutils.NewResourceCmd(
"status",
"Check service(broker or proxy) status",
"",
"status")
"")
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
err = rootCmd.Execute()
return
Expand Down
2 changes: 1 addition & 1 deletion pkg/ctl/subscription/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func TestSubCommands(newVerb func(cmd *cmdutils.VerbCmd), args []string) (out *b
"subscriptions",
"Operations about subscription(s)",
"",
"subscription")
"subscription", "subs", "sub")
flagGrouping := cmdutils.NewGrouping()
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
rootCmd.AddCommand(resourceCmd)
Expand Down
5 changes: 4 additions & 1 deletion pkg/ctl/token/test_help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ func testTokenCommands(newVerb func(*cmdutils.VerbCmd), args []string) (out *byt
rootCmd.SetArgs(append([]string{"token"}, args...))
flagGrouping := cmdutils.NewGrouping()
rootCmd.AddCommand(Command(flagGrouping))
resourceCmd := cmdutils.NewResourceCmd("token", "", "")
resourceCmd := cmdutils.NewResourceCmd(
"token",
"Operations of token",
"You can use this tool to generate secret key, private/public key, and token.")
cmdutils.AddVerbCmd(flagGrouping, resourceCmd, newVerb)
err = rootCmd.Execute()

Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/token/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ func Command(flagGrouping *cmdutils.FlagGrouping) *cobra.Command {
resourceCmd := cmdutils.NewResourceCmd(
"token",
"Operations of token",
"You can use this tool to generate secret key, private/public key, and token.",
"")
"You can use this tool to generate secret key, private/public key, and token.")

cmds := []func(*cmdutils.VerbCmd){
createKeyPair,
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/topic/bundle_range.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ func GetBundleRangeCmd(vc *cmdutils.VerbCmd) {
"bundle-range",
"Get the namespace bundle range of a topic",
desc.ToString(),
desc.ExampleToString(),
"")
desc.ExampleToString())

vc.SetRunFuncWithNameArg(func() error {
return doGetBundleRange(vc)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/topic/lookup_topic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ func LookUpTopicCmd(vc *cmdutils.VerbCmd) {
"lookup",
"Look up a topic",
desc.ToString(),
desc.ExampleToString(),
"")
desc.ExampleToString())

vc.SetRunFuncWithNameArg(func() error {
return doLookupTopic(vc)
Expand Down
3 changes: 1 addition & 2 deletions pkg/ctl/topic/stats_internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ func GetInternalStatsCmd(vc *cmdutils.VerbCmd) {
"internal-stats",
"Get the internal stats of the specified topic",
desc.ToString(),
desc.ExampleToString(),
"")
desc.ExampleToString())

var partition int

Expand Down