From 7902ae32f172ca51eed944509869c96bb21302f1 Mon Sep 17 00:00:00 2001 From: lanfunoe Date: Mon, 13 Jul 2026 15:37:10 +0800 Subject: [PATCH 1/2] fix(urocketmq): correct command behavior --- products/urocketmq/internal/service/create.go | 6 ++---- products/urocketmq/internal/service/price.go | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/products/urocketmq/internal/service/create.go b/products/urocketmq/internal/service/create.go index f7bc6bceab..17dd796222 100644 --- a/products/urocketmq/internal/service/create.go +++ b/products/urocketmq/internal/service/create.go @@ -59,8 +59,8 @@ func newCreate(ctx *cli.Context) *cobra.Command { req.Edition = flags.String("edition", "Enterprise", "Required. Edition. Unique value: Enterprise") req.Mode = flags.String("mode", "PrivateNet", "Required. Network mode. Unique value: PrivateNet") req.Name = flags.String("name", "", "Required. Service name. Regex: ^[a-zA-Z0-9-_]{1,36}$") - req.PublicVersion = flags.String("public-version", "", "Required. Cluster version. Enum: v4, v5. Note: each region currently supports only one version, confirm with region") - req.Storage = flags.Int("storage-gb", 0, "Required. Message storage space in GB. Range depends on TPS") + req.PublicVersion = flags.String("public-version", "", "Cluster version. Options vary by region, see doc for supported values: https://github.com/UCloudDoc-Team/rocketmq/blob/master/price/index.md, e.g. v4, v5 (each region only support one version)") + req.Storage = flags.Int("storage-gb", 0, "Required. Storage space in GB. Check the doc first to determine available values: https://github.com/UCloudDoc-Team/rocketmq/blob/master/price/index.md") req.SubnetId = flags.String("subnet-id", "", "Required. Subnet ID. Default to current region's default subnet") req.Tps = flags.String("tps", "", "Required. Transactions per second. Enum: 10000, 20000, 50000, 100000, 200000. Note: v4 supports 20000, 50000, 100000, 200000; v5 currently supports only 10000, 20000.") req.VPCId = flags.String("vpc-id", "", "Required. VPC ID. Default to current region's default VPC") @@ -77,7 +77,6 @@ func newCreate(ctx *cli.Context) *cobra.Command { command.SetFlagValues(cmd, "charge-type", "Year", "Month", "Dynamic") command.SetFlagValues(cmd, "edition", "Enterprise") command.SetFlagValues(cmd, "mode", "PrivateNet") - command.SetFlagValues(cmd, "public-version", "v4", "v5") command.SetFlagValues(cmd, "tps", "10000", "20000", "50000", "100000", "200000") command.SetCompletion(cmd, "vpc-id", func() []string { @@ -91,7 +90,6 @@ func newCreate(ctx *cli.Context) *cobra.Command { cmd.MarkFlagRequired("edition") cmd.MarkFlagRequired("mode") cmd.MarkFlagRequired("name") - cmd.MarkFlagRequired("public-version") cmd.MarkFlagRequired("storage-gb") cmd.MarkFlagRequired("subnet-id") cmd.MarkFlagRequired("tps") diff --git a/products/urocketmq/internal/service/price.go b/products/urocketmq/internal/service/price.go index a6ec4150cd..fe42255451 100644 --- a/products/urocketmq/internal/service/price.go +++ b/products/urocketmq/internal/service/price.go @@ -58,9 +58,9 @@ func newPrice(ctx *cli.Context) *cobra.Command { req.ChargeType = flags.String("charge-type", "Month", "Required. Charge type. Enum: Year, Month, Dynamic") req.Edition = flags.String("edition", "Enterprise", "Required. Edition. Unique value: Enterprise") req.Mode = flags.String("mode", "PrivateNet", "Required. Network mode. Unique value: PrivateNet") - req.PublicVersion = flags.String("public-version", "", "Required. Cluster version. Enum: v4, v5. Note: each region currently supports only one version, confirm with region") + req.PublicVersion = flags.String("public-version", "", "Cluster version. Options vary by region, see doc for supported values: https://github.com/UCloudDoc-Team/rocketmq/blob/master/price/index.md, e.g. v4, v5 (each region only support one version)") req.Quantity = flags.Int("quantity", 1, "Optional. Purchase duration in months. Month: 1-9(month), 0=until end of current month; Dynamic: ignore; Year: use --quantity as years") - req.Storage = flags.Int("storage-gb", 0, "Required. Message storage space in GB") + req.Storage = flags.Int("storage-gb", 0, "Required. Storage space in GB. Check the doc first to determine available values: https://github.com/UCloudDoc-Team/rocketmq/blob/master/price/index.md") req.TPS = flags.Int("tps", 0, "Required. Transactions per second. Enum: 10000, 20000, 50000, 100000, 200000. Note: v4 supports 20000, 50000, 100000, 200000; v5 currently supports only 10000, 20000.") ctx.BindProjectID(cmd, req) @@ -69,13 +69,11 @@ func newPrice(ctx *cli.Context) *cobra.Command { command.SetFlagValues(cmd, "charge-type", "Year", "Month", "Dynamic") command.SetFlagValues(cmd, "edition", "Enterprise") command.SetFlagValues(cmd, "mode", "PrivateNet") - command.SetFlagValues(cmd, "public-version", "v4", "v5") command.SetFlagValues(cmd, "tps", "10000", "20000", "50000", "100000", "200000") cmd.MarkFlagRequired("charge-type") cmd.MarkFlagRequired("edition") cmd.MarkFlagRequired("mode") - cmd.MarkFlagRequired("public-version") cmd.MarkFlagRequired("storage-gb") cmd.MarkFlagRequired("tps") From 9e0542348e1e860a6dc46eacd3f57004db4f2cf8 Mon Sep 17 00:00:00 2001 From: lanfunoe Date: Tue, 14 Jul 2026 15:49:58 +0800 Subject: [PATCH 2/2] fix(urocketmq): correct command behavior --- products/urocketmq/testdata/cmdtree.golden | 4 ++-- products/urocketmq/testdata/completion.golden | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/products/urocketmq/testdata/cmdtree.golden b/products/urocketmq/testdata/cmdtree.golden index 88a8f813ec..0685cd2b99 100644 --- a/products/urocketmq/testdata/cmdtree.golden +++ b/products/urocketmq/testdata/cmdtree.golden @@ -49,7 +49,7 @@ ucloud urocketmq service create use=create short=Create a URocketMQ service inst flag=mode short= default=PrivateNet required=true flag=name short= default= required=true flag=project-id short= default= required= - flag=public-version short= default= required=true + flag=public-version short= default= required= flag=quantity short= default=1 required= flag=region short= default= required= flag=remark short= default= required= @@ -79,7 +79,7 @@ ucloud urocketmq service price use=price short=Get price of URocketMQ service in flag=edition short= default=Enterprise required=true flag=mode short= default=PrivateNet required=true flag=project-id short= default= required= - flag=public-version short= default= required=true + flag=public-version short= default= required= flag=quantity short= default=1 required= flag=region short= default= required= flag=storage-gb short= default=0 required=true diff --git a/products/urocketmq/testdata/completion.golden b/products/urocketmq/testdata/completion.golden index b720fa0fb3..76732fc573 100644 --- a/products/urocketmq/testdata/completion.golden +++ b/products/urocketmq/testdata/completion.golden @@ -25,7 +25,6 @@ ucloud urocketmq service create charge-type static Dynamic,Month,Year ucloud urocketmq service create edition static Enterprise ucloud urocketmq service create mode static PrivateNet ucloud urocketmq service create project-id dynamic -ucloud urocketmq service create public-version static v4,v5 ucloud urocketmq service create region dynamic ucloud urocketmq service create subnet-id dynamic ucloud urocketmq service create tps static 10000,100000,20000,200000,50000 @@ -44,7 +43,6 @@ ucloud urocketmq service price charge-type static Dynamic,Month,Year ucloud urocketmq service price edition static Enterprise ucloud urocketmq service price mode static PrivateNet ucloud urocketmq service price project-id dynamic -ucloud urocketmq service price public-version static v4,v5 ucloud urocketmq service price region dynamic ucloud urocketmq service price tps static 10000,100000,20000,200000,50000 ucloud urocketmq service update-name project-id dynamic