add two fields to ForceSendFields (hashicorp#4580) (hashicorp#3045)

Signed-off-by: Modular Magician <[email protected]>
jcanseco · Mar 11, 2021 · 96d8770 · 96d8770
1 parent 5110e33
commit 96d8770
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.changelog/4580.txt b/.changelog/4580.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+container: Fixed updates on `export_custom_routes` and `import_custom_routes` in `google_compute_network_peering`
+```
diff --git a/google-beta/resource_compute_network_peering.go b/google-beta/resource_compute_network_peering.go
@@ -299,7 +299,7 @@ func expandNetworkPeering(d *schema.ResourceData) *compute.NetworkPeering {
 		ImportCustomRoutes:             d.Get("import_custom_routes").(bool),
 		ExportSubnetRoutesWithPublicIp: d.Get("export_subnet_routes_with_public_ip").(bool),
 		ImportSubnetRoutesWithPublicIp: d.Get("import_subnet_routes_with_public_ip").(bool),
-		ForceSendFields:                []string{"ExportSubnetRoutesWithPublicIp"},
+		ForceSendFields:                []string{"ExportSubnetRoutesWithPublicIp", "ImportCustomRoutes", "ExportCustomRoutes"},
 	}
 }
 

diff --git a/google-beta/resource_compute_network_peering_test.go b/google-beta/resource_compute_network_peering_test.go
@@ -90,6 +90,15 @@ func TestAccComputeNetworkPeering_customRoutesUpdate(t *testing.T) {
 				ImportStateVerify: true,
 				ImportStateId:     importId,
 			},
+			{
+				Config: testAccComputeNetworkPeeringDefaultCustomRoutes(primaryNetworkName, peeringName, suffix),
+			},
+			{
+				ResourceName:      "google_compute_network_peering.bar",
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateId:     importId,
+			},
 		},
 	})
 }

diff --git a/google-beta/resource_dataproc_cluster_test.go b/google-beta/resource_dataproc_cluster_test.go
@@ -13,9 +13,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"google.golang.org/api/googleapi"
-
 	dataproc "google.golang.org/api/dataproc/v1beta2"
+	"google.golang.org/api/googleapi"
 )
 
 func TestDataprocExtractInitTimeout(t *testing.T) {