add two fields to ForceSendFields (GoogleCloudPlatform#4580)

ericyz · Mar 11, 2021 · 65dfba4 · 65dfba4
1 parent 9975c35
commit 65dfba4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/mmv1/third_party/terraform/resources/resource_compute_network_peering.go b/mmv1/third_party/terraform/resources/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/mmv1/third_party/terraform/tests/resource_compute_network_peering_test.go b/mmv1/third_party/terraform/tests/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/mmv1/third_party/validator/bigtable_cluster.go b/mmv1/third_party/validator/bigtable_cluster.go
@@ -14,7 +14,7 @@ func GetBigtableClusterCaiObject(d TerraformResourceData, config *Config) ([]Ass
 
     assets := []Asset{}
 	for _, obj := range objs {
-		name, err := assetName(d, config, "//bigtable.googleapis.com/projects/{{.Provider.project}}/instances/{{name}}/clusters/{{cluster_id}}")
+		name, err := assetName(d, config, "//bigtable.googleapis.com/projects/{{project}}/instances/{{name}}/clusters/{{cluster_id}}")
 		if err != nil {
 			return []Asset{}, err
 		}