Merge pull request #7876 from rvanderp3/OCPBUGS-25841

openshift-merge-bot[bot] · web-flow · commit 43d0bd0b8eb9 · 2024-01-09T07:10:44.000Z
OCPBUGS-25841: preserve category name when trying to find tag category
diff --git a/pkg/destroy/vsphere/client.go b/pkg/destroy/vsphere/client.go
@@ -250,8 +250,8 @@ func (c *Client) DeleteTag(ctx context.Context, id string) error {
 	return err
 }
 
-// DeleteTagCategory deletes a Tag Category named `id`.
-func (c *Client) DeleteTagCategory(ctx context.Context, id string) error {
+// DeleteTagCategory deletes a Tag Category named `categoryName`.
+func (c *Client) DeleteTagCategory(ctx context.Context, categoryName string) error {
 	ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
 	defer cancel()
 
@@ -270,7 +270,7 @@ func (c *Client) DeleteTagCategory(ctx context.Context, id string) error {
 			}
 			continue
 		}
-		if category.Name == id {
+		if category.Name == categoryName {
 			if err = tagManager.DeleteCategory(ctx, category); err != nil {
 				return err
 			}

Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,8 @@ func (c *Client) DeleteTag(ctx context.Context, id string) error {`
`250`	`250`	`return err`
`251`	`251`	`}`
`252`	`252`
`253`		-// DeleteTagCategory deletes a Tag Category named `id`.
`254`		`-func (c *Client) DeleteTagCategory(ctx context.Context, id string) error {`
	`253`	+// DeleteTagCategory deletes a Tag Category named `categoryName`.
	`254`	`+func (c *Client) DeleteTagCategory(ctx context.Context, categoryName string) error {`
`255`	`255`	`ctx, cancel := context.WithTimeout(ctx, defaultTimeout)`
`256`	`256`	`defer cancel()`
`257`	`257`
`@@ -270,7 +270,7 @@ func (c *Client) DeleteTagCategory(ctx context.Context, id string) error {`
`270`	`270`	`}`
`271`	`271`	`continue`
`272`	`272`	`}`
`273`		`- if category.Name == id {`
	`273`	`+ if category.Name == categoryName {`
`274`	`274`	`if err = tagManager.DeleteCategory(ctx, category); err != nil {`
`275`	`275`	`return err`
`276`	`276`	`}`