Get Logic changes and Describe verbose suppress

Author: rcaril

pkg/commands/kvstoreentry/describe.go

@@ -25,6 +25,8 @@ func NewDescribeCommand(parent argparser.Registerer, g *global.Data) *DescribeCo
 	c := DescribeCommand{
 		Base: argparser.Base{
 			Globals: g,
+			// This argument suppresses the 'Fastly API' output from the global verbose command.
+			SuppressVerbose: true,
 		},
 	}
 	c.CmdClause = parent.Command("describe", "Get the associated attributes of a key")
@@ -64,11 +66,8 @@ func (c *DescribeCommand) Exec(_ io.Reader, out io.Writer) error {
 	}
 
 	if c.Globals.Flags.Verbose {
-		// Print the key attributes.
-		fmt.Fprintf(out, "Key: %s\n", c.Input.Key)
-		fmt.Fprintf(out, "Generation: %d\n", item.Generation)
-		fmt.Fprintf(out, "Metadata: %s\n", item.Metadata)
-		return nil
+		// We won't be supporting a --verbose flag here as there wouldn't be any additional output to provide.
+		return fmt.Errorf("the 'describe' command does not support the --verbose flag")
 	}
 
 	// IMPORTANT: Don't use `text` package as binary data can be messed up.

pkg/commands/kvstoreentry/get.go

@@ -67,13 +67,13 @@ func (c *GetCommand) Exec(_ io.Reader, out io.Writer) error {
 	// Check if the generation marker provided matches the API.
 	if c.Generation != "" {
 		inputGeneration, err := strconv.ParseUint(c.Generation, 10, 64)
-		if err != nil {
-			return fmt.Errorf("invalid generation value: %s", c.Generation)
-		}
-
 		if inputGeneration != result.Generation {
 			return fmt.Errorf("generation value does not match: expected %d, got %d", result.Generation, inputGeneration)
 		}
+
+		if err != nil {
+			return fmt.Errorf("invalid generation value: %s", c.Generation)
+		}
 	}
 
 	// Ensure we close the value reader.
@@ -93,7 +93,7 @@ func (c *GetCommand) Exec(_ io.Reader, out io.Writer) error {
 	}
 
 	if c.JSONOutput.Enabled {
-		// We are encoding the value of the key here to ensure safe
+		// We are encoding the value of the item here to ensure safe
 		// output for binary content along with other outputs.
 		encodedValue := base64.StdEncoding.EncodeToString([]byte(value))
 		text.Output(out, `{"%s": "%s"}`, c.Input.Key, encodedValue)