refactor(namespace): adjust flag handling in commands

Author: freeznet

pkg/ctl/brokerstats/load_report_test.go

@@ -37,6 +37,5 @@ func TestDumpLoadReport(t *testing.T) {
 		t.FailNow()
 	}
 	defaultBrokerData := utils.NewLocalBrokerData()
-	defaultBrokerData.LastStats = nil
 	assert.Equal(t, defaultBrokerData, getBrokerData)
 }

pkg/ctl/namespace/properties.go

@@ -223,7 +223,7 @@ func SetPropertyCmd(vc *cmdutils.VerbCmd) {
 	var examples []cmdutils.Example
 	examples = append(examples, cmdutils.Example{
 		Desc:    "Set a single property of a namespace",
-		Command: "pulsarctl namespaces set-property tenant/namespace -k key -v value",
+		Command: "pulsarctl namespaces set-property tenant/namespace -k key --value value",
 	})
 	desc.CommandExamples = examples
 	desc.CommandOutput = append(desc.CommandOutput, ArgError, NsNotExistError)
@@ -240,7 +240,7 @@ func SetPropertyCmd(vc *cmdutils.VerbCmd) {
 	var value string
 	vc.FlagSetGroup.InFlagSet("Properties", func(set *pflag.FlagSet) {
 		set.StringVarP(&key, "key", "k", "", "property key")
-		set.StringVarP(&value, "value", "v", "", "property value")
+		set.StringVar(&value, "value", "", "property value")
 		_ = cobra.MarkFlagRequired(set, "key")
 		_ = cobra.MarkFlagRequired(set, "value")
 	})

pkg/ctl/namespace/properties_test.go

@@ -53,7 +53,7 @@ func TestNamespacePropertiesCmd(t *testing.T) {
 	assert.Nil(t, execErr)
 	assert.Equal(t, "v1\n", getPropertyOut.String())
 
-	args = []string{"set-property", ns, "-k", "k3", "-v", "v3"}
+	args = []string{"set-property", ns, "-k", "k3", "--value", "v3"}
 	setPropertyOut, execErr, _, _ := TestNamespaceCommands(SetPropertyCmd, args)
 	assert.Nil(t, execErr)
 	assert.Equal(t, fmt.Sprintf("Set property %q successfully for [%s]\n", "k3", ns), setPropertyOut.String())

pkg/ctl/namespace/schema_compatibility_strategy_test.go

@@ -55,9 +55,9 @@ func TestSchemaCompatibilityStrategyCmd(t *testing.T) {
 		getOut.String())
 
 	args = []string{"set-schema-compatibility-strategy", ns}
-	_, execErr, _, _ = TestNamespaceCommands(SetSchemaCompatibilityStrategyCmd, args)
-	assert.NotNil(t, execErr)
-	assert.Contains(t, execErr.Error(), "required flag(s) \"compatibility\" not set")
+	_, _, _, err := TestNamespaceCommands(SetSchemaCompatibilityStrategyCmd, args)
+	assert.NotNil(t, err)
+	assert.Contains(t, err.Error(), "required flag(s) \"compatibility\" not set")
 
 	args = []string{"set-schema-compatibility-strategy", "--compatibility", "INVALID", ns}
 	_, execErr, _, _ = TestNamespaceCommands(SetSchemaCompatibilityStrategyCmd, args)

pkg/ctl/topicpolicies/data_policies.go

@@ -77,7 +77,7 @@ func SetRetentionCmd(vc *cmdutils.VerbCmd) {
 		if err != nil {
 			return err
 		}
-		retentionTimeInSeconds, err := ctlutils.ParseRelativeTimeInSeconds(timeStr)
+		retentionDuration, err := ctlutils.ParseRelativeTimeInSeconds(timeStr)
 		if err != nil {
 			return err
 		}
@@ -86,8 +86,8 @@ func SetRetentionCmd(vc *cmdutils.VerbCmd) {
 			return err
 		}
 		retentionTimeInMin := -1
-		if retentionTimeInSeconds != -1 {
-			retentionTimeInMin = int(retentionTimeInSeconds.Minutes())
+		if retentionDuration != -1 {
+			retentionTimeInMin = int(retentionDuration.Minutes())
 		}
 		retentionSizeInMB := -1
 		if sizeLimit != -1 {
@@ -297,18 +297,18 @@ func SetDelayedDeliveryCmd(vc *cmdutils.VerbCmd) {
 		if err != nil {
 			return err
 		}
-		tickTimeInSeconds, err := ctlutils.ParseRelativeTimeInSeconds(tickTime)
+		tickTimeDuration, err := ctlutils.ParseRelativeTimeInSeconds(tickTime)
 		if err != nil {
 			return err
 		}
-		maxDelayInSeconds, err := ctlutils.ParseRelativeTimeInSeconds(maxDelay)
+		maxDelayDuration, err := ctlutils.ParseRelativeTimeInSeconds(maxDelay)
 		if err != nil {
 			return err
 		}
 		data := util.NewDelayedDeliveryDataWithMaxDelay(
-			tickTimeInSeconds.Seconds()*1000,
+			tickTimeDuration.Seconds()*1000,
 			enable,
-			int64(maxDelayInSeconds.Seconds()*1000),
+			int64(maxDelayDuration.Seconds()*1000),
 		)
 		err = policies.SetDelayedDelivery(vc.Command.Context(), *topic, *data)
 		if err == nil {

pkg/ctl/topicpolicies/schema_compatibility_strategy.go

@@ -18,8 +18,6 @@
 package topicpolicies
 
 import (
-	"fmt"
-
 	"github.com/apache/pulsar-client-go/pulsaradmin/pkg/utils"
 	"github.com/spf13/pflag"
 	"github.com/streamnative/pulsarctl/pkg/cmdutils"
@@ -93,7 +91,3 @@ func RemoveSchemaCompatibilityStrategyCmd(vc *cmdutils.VerbCmd) {
 		return policies.RemoveSchemaCompatibilityStrategy(vc.Command.Context(), *topic)
 	})
 }
-
-func writePolicyOutputString(vc *cmdutils.VerbCmd, value string) error {
-	return writePolicyOutput(vc, value, fmt.Sprintf("%%s\n"), value)
-}

site/gen-pulsarctldocs/generators/v1_1/toc.yaml

@@ -25,6 +25,7 @@ categories:
   - completion
   - functions
   - namespaces
+  - topic-policies
   - schemas
   - sinks
   - sources