change update to require both name and desc

Author: anthony-gomez-fastly

pkg/commands/apisecurity/tags/tags_test.go

@@ -359,22 +359,27 @@ func TestTagsUpdate(t *testing.T) {
 	scenarios := []testutil.CLIScenario{
 		{
 			Name:      "validate missing --service-id flag",
-			Args:      fmt.Sprintf("--tag-id %s --name %s", tagID, updatedTagName),
+			Args:      fmt.Sprintf("--tag-id %s --name %s --description %s", tagID, updatedTagName, updatedTagDesc),
 			WantError: "error reading service: no service ID found",
 		},
 		{
 			Name:      "validate missing --tag-id flag",
-			Args:      fmt.Sprintf("--service-id %s --name %s", serviceID, updatedTagName),
+			Args:      fmt.Sprintf("--service-id %s --name %s --description %s", serviceID, updatedTagName, updatedTagDesc),
 			WantError: "error parsing arguments: required flag --tag-id not provided",
 		},
 		{
-			Name:      "validate missing update fields",
-			Args:      fmt.Sprintf("--service-id %s --tag-id %s", serviceID, tagID),
-			WantError: "at least one of --name or --description must be provided",
+			Name:      "validate missing --name flag",
+			Args:      fmt.Sprintf("--service-id %s --tag-id %s --description %s", serviceID, tagID, updatedTagDesc),
+			WantError: "error parsing arguments: required flag --name not provided",
+		},
+		{
+			Name:      "validate missing --description flag",
+			Args:      fmt.Sprintf("--service-id %s --tag-id %s --name %s", serviceID, tagID, updatedTagName),
+			WantError: "error parsing arguments: required flag --description not provided",
 		},
 		{
 			Name: "validate bad request",
-			Args: fmt.Sprintf("--service-id %s --tag-id %s --name %s", serviceID, tagID, updatedTagName),
+			Args: fmt.Sprintf("--service-id %s --tag-id %s --name %s --description %s", serviceID, tagID, updatedTagName, updatedTagDesc),
 			Client: &http.Client{
 				Transport: &testutil.MockRoundTripper{
 					Response: &http.Response{
@@ -392,35 +397,7 @@ func TestTagsUpdate(t *testing.T) {
 			WantError: "400 - Bad Request",
 		},
 		{
-			Name: "validate API success (update name only)",
-			Args: fmt.Sprintf("--service-id %s --tag-id %s --name %s", serviceID, tagID, updatedTagName),
-			Client: &http.Client{
-				Transport: &testutil.MockRoundTripper{
-					Response: &http.Response{
-						StatusCode: http.StatusOK,
-						Status:     http.StatusText(http.StatusOK),
-						Body:       io.NopCloser(bytes.NewReader(testutil.GenJSON(updatedTag))),
-					},
-				},
-			},
-			WantOutput: fstfmt.Success("Updated operation tag '%s' (id: %s)", updatedTagName, tagID),
-		},
-		{
-			Name: "validate API success (update description only)",
-			Args: fmt.Sprintf("--service-id %s --tag-id %s --description %s", serviceID, tagID, updatedTagDesc),
-			Client: &http.Client{
-				Transport: &testutil.MockRoundTripper{
-					Response: &http.Response{
-						StatusCode: http.StatusOK,
-						Status:     http.StatusText(http.StatusOK),
-						Body:       io.NopCloser(bytes.NewReader(testutil.GenJSON(updatedTag))),
-					},
-				},
-			},
-			WantOutput: fstfmt.Success("Updated operation tag '%s' (id: %s)", updatedTagName, tagID),
-		},
-		{
-			Name: "validate API success (update both)",
+			Name: "validate API success",
 			Args: fmt.Sprintf("--service-id %s --tag-id %s --name %s --description %s", serviceID, tagID, updatedTagName, updatedTagDesc),
 			Client: &http.Client{
 				Transport: &testutil.MockRoundTripper{
@@ -435,7 +412,7 @@ func TestTagsUpdate(t *testing.T) {
 		},
 		{
 			Name: "validate optional --json flag",
-			Args: fmt.Sprintf("--service-id %s --tag-id %s --name %s --json", serviceID, tagID, updatedTagName),
+			Args: fmt.Sprintf("--service-id %s --tag-id %s --name %s --description %s --json", serviceID, tagID, updatedTagName, updatedTagDesc),
 			Client: &http.Client{
 				Transport: &testutil.MockRoundTripper{
 					Response: &http.Response{

pkg/commands/apisecurity/tags/update.go

@@ -20,12 +20,11 @@ type UpdateCommand struct {
 	argparser.JSONOutput
 
 	// Required.
-	tagID string
-
+	tagID       string
+	name        string
+	description string
 	// Optional.
 	serviceName argparser.OptionalServiceNameID
-	name        argparser.OptionalString
-	description argparser.OptionalString
 }
 
 // NewUpdateCommand returns a usable command registered under the parent.
@@ -40,6 +39,8 @@ func NewUpdateCommand(parent argparser.Registerer, g *global.Data) *UpdateComman
 
 	// Required.
 	c.CmdClause.Flag("tag-id", "Tag ID").Required().StringVar(&c.tagID)
+	c.CmdClause.Flag("name", "Updated name of the operation tag").Required().StringVar(&c.name)
+	c.CmdClause.Flag("description", "Updated description of the operation tag").Required().StringVar(&c.description)
 
 	// Optional.
 	c.RegisterFlag(argparser.StringFlagOpts{
@@ -53,8 +54,7 @@ func NewUpdateCommand(parent argparser.Registerer, g *global.Data) *UpdateComman
 		Description: argparser.FlagServiceNameDesc,
 		Dst:         &c.serviceName.Value,
 	})
-	c.CmdClause.Flag("name", "Updated name of the operation tag").Action(c.name.Set).StringVar(&c.name.Value)
-	c.CmdClause.Flag("description", "Updated description of the operation tag").Action(c.description.Set).StringVar(&c.description.Value)
+
 	c.RegisterFlagBool(c.JSONFlag())
 
 	return &c
@@ -78,8 +78,12 @@ func (c *UpdateCommand) Exec(_ io.Reader, out io.Writer) error {
 		return errors.New("service-id is required")
 	}
 
-	if !c.name.WasSet && !c.description.WasSet {
-		return errors.New("at least one of --name or --description must be provided")
+	if c.name == "" {
+		return errors.New("--name is required")
+	}
+
+	if c.description == "" {
+		return errors.New("--description is required")
 	}
 
 	fc, ok := c.Globals.APIClient.(*fastly.Client)
@@ -88,15 +92,10 @@ func (c *UpdateCommand) Exec(_ io.Reader, out io.Writer) error {
 	}
 
 	input := &operations.UpdateTagInput{
-		ServiceID: &serviceID,
-		TagID:     &c.tagID,
-	}
-
-	if c.name.WasSet {
-		input.Name = &c.name.Value
-	}
-	if c.description.WasSet {
-		input.Description = &c.description.Value
+		Description: &c.description,
+		Name:        &c.name,
+		ServiceID:   &serviceID,
+		TagID:       &c.tagID,
 	}
 
 	tag, err := operations.UpdateTag(context.TODO(), fc, input)