Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions products/urocketmq/internal/service/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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 {
Expand All @@ -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")
Expand Down
6 changes: 2 additions & 4 deletions products/urocketmq/internal/service/price.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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")

Expand Down
4 changes: 2 additions & 2 deletions products/urocketmq/testdata/cmdtree.golden
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions products/urocketmq/testdata/completion.golden
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading