Merge pull request #25772 from hashicorp/td-networkmanager-tidyup

service/Network Manager: Use `UpdateTagsWithContext`
hashicorp · Jul 11, 2022 · f79cc52 · f79cc52
2 parents 45d2c96 + 3de5301
commit f79cc52
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 27 deletions.
diff --git a/internal/service/networkmanager/connection.go b/internal/service/networkmanager/connection.go
@@ -210,7 +210,7 @@ func resourceConnectionUpdate(ctx context.Context, d *schema.ResourceData, meta
 	if d.HasChange("tags_all") {
 		o, n := d.GetChange("tags_all")
 
-		if err := UpdateTags(conn, d.Get("arn").(string), o, n); err != nil {
+		if err := UpdateTagsWithContext(ctx, conn, d.Get("arn").(string), o, n); err != nil {
 			return diag.Errorf("error updating Network Manager Connection (%s) tags: %s", d.Id(), err)
 		}
 	}

diff --git a/internal/service/networkmanager/device.go b/internal/service/networkmanager/device.go
@@ -304,7 +304,7 @@ func resourceDeviceUpdate(ctx context.Context, d *schema.ResourceData, meta inte
 	if d.HasChange("tags_all") {
 		o, n := d.GetChange("tags_all")
 
-		if err := UpdateTags(conn, d.Get("arn").(string), o, n); err != nil {
+		if err := UpdateTagsWithContext(ctx, conn, d.Get("arn").(string), o, n); err != nil {
 			return diag.Errorf("error updating Network Manager Device (%s) tags: %s", d.Id(), err)
 		}
 	}

diff --git a/internal/service/networkmanager/generate.go b/internal/service/networkmanager/generate.go
@@ -1,4 +1,4 @@
-//go:generate go run ../../generate/tags/main.go -ListTags -ListTagsOutTagsElem=TagList -ServiceTagsSlice -UpdateTags
+//go:generate go run ../../generate/tags/main.go -ServiceTagsSlice -UpdateTags
 // ONLY generate directives and package declaration! Do not add anything else to this file.
 
 package networkmanager
diff --git a/internal/service/networkmanager/global_network.go b/internal/service/networkmanager/global_network.go
@@ -142,7 +142,7 @@ func resourceGlobalNetworkUpdate(ctx context.Context, d *schema.ResourceData, me
 	if d.HasChange("tags_all") {
 		o, n := d.GetChange("tags_all")
 
-		if err := UpdateTags(conn, d.Get("arn").(string), o, n); err != nil {
+		if err := UpdateTagsWithContext(ctx, conn, d.Get("arn").(string), o, n); err != nil {
 			return diag.Errorf("error updating Network Manager Global Network (%s) tags: %s", d.Id(), err)
 		}
 	}

diff --git a/internal/service/networkmanager/link.go b/internal/service/networkmanager/link.go
@@ -236,7 +236,7 @@ func resourceLinkUpdate(ctx context.Context, d *schema.ResourceData, meta interf
 	if d.HasChange("tags_all") {
 		o, n := d.GetChange("tags_all")
 
-		if err := UpdateTags(conn, d.Get("arn").(string), o, n); err != nil {
+		if err := UpdateTagsWithContext(ctx, conn, d.Get("arn").(string), o, n); err != nil {
 			return diag.Errorf("error updating Network Manager Link (%s) tags: %s", d.Id(), err)
 		}
 	}

diff --git a/internal/service/networkmanager/site.go b/internal/service/networkmanager/site.go
@@ -214,7 +214,7 @@ func resourceSiteUpdate(ctx context.Context, d *schema.ResourceData, meta interf
 	if d.HasChange("tags_all") {
 		o, n := d.GetChange("tags_all")
 
-		if err := UpdateTags(conn, d.Get("arn").(string), o, n); err != nil {
+		if err := UpdateTagsWithContext(ctx, conn, d.Get("arn").(string), o, n); err != nil {
 			return diag.Errorf("error updating Network Manager Site (%s) tags: %s", d.Id(), err)
 		}
 	}

diff --git a/internal/service/networkmanager/tags_gen.go b/internal/service/networkmanager/tags_gen.go