fix update cg command to take cg uuid, etc (#238)

* fix update cg command to take cg uuid, etc * fix usage comments * fix code
uber-archive · Jun 29, 2017 · ab5f959 · ab5f959
1 parent 59bfb01
commit ab5f959
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 25 deletions.
diff --git a/cmd/tools/admin/main.go b/cmd/tools/admin/main.go
@@ -141,8 +141,8 @@ func main() {
 						},
 						cli.IntFlag{
 							Name:  "skip_older_messages_in_seconds, k",
-							Value: 7200,
-							Usage: "Skip messages older than this duration in seconds.",
+							Value: 0,
+							Usage: "Skip messages older than this duration in seconds ('0' to skip none).",
 						},
 						cli.IntFlag{
 							Name:  "delay_seonds, d",
@@ -330,7 +330,7 @@ func main() {
 				{
 					Name:    "consumergroup",
 					Aliases: []string{"c", "cg"},
-					Usage:   "update consumergroup <destination_path> <consumer_group_name>",
+					Usage:   "update consumergroup (<consumer_group_uuid> | <destination_path> <consumer_group_name>)",
 					Flags: []cli.Flag{
 						cli.StringFlag{
 							Name:  "status, s",

diff --git a/cmd/tools/cli/main.go b/cmd/tools/cli/main.go
@@ -34,8 +34,8 @@ const (
 
 	strMaxDeliveryCount = "Maximum number of times a message is delivered\n\tbefore it is sent to the dead-letter queue (DLQ)"
 
-	strSkipOlderMessagesInSeconds = `Skip messages older than this duration in seconds.`
-	intSkipOlderMessagesInSeconds = 999999999 // More than 30 years
+	strSkipOlderMessagesInSeconds = `Skip messages older than this duration in seconds ('0' to skip none)`
+	intSkipOlderMessagesInSeconds = 0 // 0 -> skip none
 
 	strDelaySeconds = `Delay to introduce to all messages, in seconds.`
 	intDelaySeconds = 0 // zero delay, by default
@@ -93,7 +93,7 @@ func main() {
 			Subcommands: []cli.Command{
 				{
 					Name:    "destination",
-					Aliases: []string{"d", "dst"},
+					Aliases: []string{"d", "dst", "dest"},
 					Usage:   "create destination <path> [options]",
 					Flags: []cli.Flag{
 						cli.StringFlag{
@@ -191,13 +191,12 @@ func main() {
 			Subcommands: []cli.Command{
 				{
 					Name:    "destination",
-					Aliases: []string{"d", "dst"},
+					Aliases: []string{"d", "dst", "dest"},
 					Usage:   "show destination <name>",
 					Flags: []cli.Flag{
-						cli.StringFlag{
-							Name:  "showcg, sc",
-							Value: "false",
-							Usage: "show consumer group(false, true), default to false",
+						cli.BoolFlag{
+							Name:  "show_cg, cg",
+							Usage: "show consumer groups for the destination",
 						},
 					},
 					Action: func(c *cli.Context) {
@@ -245,7 +244,7 @@ func main() {
 			Subcommands: []cli.Command{
 				{
 					Name:    "destination",
-					Aliases: []string{"d", "dst"},
+					Aliases: []string{"d", "dst", "dest"},
 					Usage:   "update destination <name>",
 					Flags: []cli.Flag{
 						cli.StringFlag{
@@ -285,7 +284,7 @@ func main() {
 				{
 					Name:    "consumergroup",
 					Aliases: []string{"c", "cg"},
-					Usage:   "update consumergroup <destination_path> <consumer_group_name>",
+					Usage:   "update consumergroup (<consumer_group_uuid> | <destination_path> <consumer_group_name>)",
 					Flags: []cli.Flag{
 						cli.StringFlag{
 							Name:  "status, s",
@@ -340,7 +339,7 @@ func main() {
 			Subcommands: []cli.Command{
 				{
 					Name:    "destination",
-					Aliases: []string{"d", "dst"},
+					Aliases: []string{"d", "dst", "dest"},
 					Usage:   "delete destination <name>",
 					Action: func(c *cli.Context) {
 						lib.DeleteDestination(c)
@@ -365,7 +364,7 @@ func main() {
 			Subcommands: []cli.Command{
 				{
 					Name:    "destination",
-					Aliases: []string{"d", "dst"},
+					Aliases: []string{"d", "dst", "dest"},
 					Usage:   "list destination [options]",
 					Flags: []cli.Flag{
 						cli.StringFlag{

diff --git a/tools/admin/lib.go b/tools/admin/lib.go
@@ -529,7 +529,7 @@ func ReadCgQueue(c *cli.Context) {
 			toolscommon.ExitIfError(err)
 
 			for _, cgExtent := range mResp.GetExtents() {
-				// if --status option not provide, show all the extent queue
+				// if -status option not provide, show all the extent queue
 				status := cgExtent.GetStatus()
 				if len(extentStatus) == 0 || matchExtentStatus(extentStatus, status) {
 					printCgExtent(cgExtent, mClient)
@@ -726,7 +726,7 @@ func ListAllDestinations(c *cli.Context) {
 				}
 			}
 
-			// if --status option not provide, show all the destination path
+			// if -status option not provide, show all the destination path
 			status := desc.GetStatus()
 			if len(destStatus) == 0 || matchDestAllStatus(destStatus, status) {
 				outputDest := &destAllJSONOutputFields{

diff --git a/tools/common/lib.go b/tools/common/lib.go
@@ -103,9 +103,9 @@ const (
 )
 
 const (
-	strNotEnoughArgs                  = "Not enough arguments. Try \"--help\""
-	strTooManyArgs                    = "Too many arguments. Try \"--help\""
-	strNoChange                       = "Update must update something. Try \"--help\""
+	strNotEnoughArgs                  = "Not enough arguments. Try \"-help\""
+	strTooManyArgs                    = "Too many arguments. Try \"-help\""
+	strNoChange                       = "Update must update something. Try \"-help\""
 	strCGSpecIncorrectArgs            = "Incorrect consumer group specification. Use \"<cg_uuid>\" or \"<dest_path> <cg_name>\""
 	strDestStatus                     = "Destination status must be \"enabled\", \"disabled\", \"sendonly\", or \"recvonly\""
 	strCGStatus                       = "Consumer group status must be \"enabled\", or \"disabled\""
@@ -131,7 +131,7 @@ var uuidRegex, _ = regexp.Compile(`^[[:xdigit:]]{8}-[[:xdigit:]]{4}-[[:xdigit:]]
 // ExitIfError exit while err is not nil and print the calling stack also
 func ExitIfError(err error) {
 	const stacksEnv = `CHERAMI_SHOW_STACKS`
-	envReminder := "\n--env=staging is now the default. Did you mean '--env=prod' ?\n"
+	envReminder := "\n-env=staging is now the default. Did you mean '-env=prod' ?\n"
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
 		fmt.Fprintln(os.Stderr, envReminder)
@@ -518,12 +518,30 @@ func getCgZoneConfigs(c *cli.Context, mClient mcli.Client, cliHelper common.CliH
 
 // UpdateConsumerGroup update the consumer group based on cli.Context
 func UpdateConsumerGroup(c *cli.Context, cClient ccli.Client, mClient mcli.Client, cliHelper common.CliHelper) {
-	if len(c.Args()) < 2 {
+
+	var path, name string
+
+	switch {
+	case len(c.Args()) < 1:
 		ExitIfError(errors.New(strNotEnoughArgs))
+
+	case len(c.Args()) == 1: // assume the arg is a uuid
+
+		respCG, err := mClient.ReadConsumerGroupByUUID(&shared.ReadConsumerGroupRequest{
+			ConsumerGroupUUID: &c.Args()[0],
+		})
+		ExitIfError(err)
+
+		respDest, err := mClient.ReadDestination(&shared.ReadDestinationRequest{
+			DestinationUUID: respCG.DestinationUUID,
+		})
+
+		path, name = respDest.GetPath(), respCG.GetConsumerGroupName()
+
+	default:
+		path, name = c.Args()[0], c.Args()[1]
 	}
 
-	path := c.Args()[0]
-	name := c.Args()[1]
 	status := cherami.ConsumerGroupStatus_ENABLED
 	if c.String("status") == "disabled" {
 		status = cherami.ConsumerGroupStatus_DISABLED
@@ -1245,7 +1263,7 @@ func ListDestinations(c *cli.Context, mClient mcli.Client) {
 				}
 			}
 
-			// if --status option not provide, show all the destination path
+			// if -status option not provide, show all the destination path
 			status := desc.GetStatus()
 			if len(destStatus) == 0 || matchDestStatus(destStatus, status) {
 				outputDest := &destJSONOutputFields{