Made nested query resources replace the whole resource instead of merging new over old (GoogleCloudPlatform#13234)

Author: melinath

mmv1/templates/terraform/nested_query.go.tmpl

@@ -140,11 +140,29 @@ func resource{{ $.ResourceName }}PatchUpdateEncoder(d *schema.ResourceData, meta
     return nil, fmt.Errorf("Unable to update {{ $.Name }} %q - not found in list", d.Id())
   }
 
-  // Merge new object into old.
-  for k, v := range obj {
-    item[k] = v
+  // Copy over values for immutable fields
+{{- range $prop := $.SettableProperties }}
+{{- if $prop.IsForceNew }}
+  obj["{{$prop.ApiName}}"] = item["{{$prop.ApiName}}"]
+{{- end }}
+{{- end }}
+  // Merge any fields in item that aren't managed by this resource into obj
+  // This is necessary because item might be managed by multiple resources.
+  settableFields := map[string]struct{}{
+{{- range $prop := $.SettableProperties }}
+{{- if not $prop.IsForceNew }}
+    "{{$prop.ApiName}}": struct{}{},
+{{- end }}
+{{- end }}
   }
-  items[idx] = item
+  for k, v := range item {
+    if _, ok := settableFields[k]; !ok {
+      obj[k] = v
+    }
+  }
+
+  // Override old object with new
+  items[idx] = obj
 
   // Return list with new item added
   res := map[string]interface{}{

mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go.tmpl

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/hashicorp/terraform-provider-google/google/acctest"
 	"github.com/hashicorp/terraform-provider-google/google/envvar"
@@ -84,6 +85,11 @@ func TestAccComputeRouterNat_update(t *testing.T) {
 			},
 			{
 				Config: testAccComputeRouterNatUpdated(routerName),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction("google_compute_router_nat.foobar", plancheck.ResourceActionUpdate),
+					},
+				},
 			},
 			{
 				ResourceName:      "google_compute_router_nat.foobar",
@@ -92,6 +98,11 @@ func TestAccComputeRouterNat_update(t *testing.T) {
 			},
 			{
 				Config: testAccComputeRouterNatUpdateToNatIPsId(routerName),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction("google_compute_router_nat.foobar", plancheck.ResourceActionNoop),
+					},
+				},
 			},
 			{
 				ResourceName:      "google_compute_router_nat.foobar",
@@ -100,6 +111,11 @@ func TestAccComputeRouterNat_update(t *testing.T) {
 			},
 			{
 				Config: testAccComputeRouterNatUpdateToNatIPsName(routerName),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction("google_compute_router_nat.foobar", plancheck.ResourceActionNoop),
+					},
+				},
 			},
 			{
 				ResourceName:      "google_compute_router_nat.foobar",
@@ -108,37 +124,11 @@ func TestAccComputeRouterNat_update(t *testing.T) {
 			},
 			{
 				Config: testAccComputeRouterNatBasicBeforeUpdate(routerName),
-			},
-			{
-				ResourceName:      "google_compute_router_nat.foobar",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func TestAccComputeRouterNat_removeLogConfig(t *testing.T) {
-	t.Parallel()
-
-	testId := acctest.RandString(t, 10)
-	routerName := fmt.Sprintf("tf-test-router-nat-%s", testId)
-
-	acctest.VcrTest(t, resource.TestCase{
-		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckComputeRouterNatDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccComputeRouterNatLogConfig(routerName),
-			},
-			{
-				ResourceName:      "google_compute_router_nat.foobar",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-			{
-				Config: testAccComputeRouterNatLogConfigRemoved(routerName),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction("google_compute_router_nat.foobar", plancheck.ResourceActionUpdate),
+					},
+				},
 			},
 			{
 				ResourceName:      "google_compute_router_nat.foobar",
@@ -1016,6 +1006,7 @@ resource "google_compute_router" "foobar" {
 
 resource "google_compute_network" "foobar" {
   name = "%s-net"
+  auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "foobar" {
@@ -1037,11 +1028,6 @@ resource "google_compute_router_nat" "foobar" {
   nat_ip_allocate_option             = "AUTO_ONLY"
   nat_ips                            = []
   source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_IP_RANGES"
-
-  log_config {
-    enable = true
-    filter = "ERRORS_ONLY"
-  }
 }
 `, routerName, routerName, routerName, routerName, routerName)
 }
@@ -1056,6 +1042,7 @@ resource "google_compute_router" "foobar" {
 
 resource "google_compute_network" "foobar" {
   name = "%s-net"
+  auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "foobar" {
@@ -1090,6 +1077,7 @@ resource "google_compute_router_nat" "foobar" {
   tcp_established_idle_timeout_sec = 1600
   tcp_transitory_idle_timeout_sec  = 60
   tcp_time_wait_timeout_sec        = 60
+  max_ports_per_vm                 = 128
 
   log_config {
     enable = true
@@ -1142,7 +1130,8 @@ network = google_compute_network.foobar.self_link
 }
 
 resource "google_compute_network" "foobar" {
-name = "%s-net"
+  name = "%s-net"
+  auto_create_subnetworks = false
 }
 resource "google_compute_subnetwork" "foobar" {
 name          = "%s-subnet"
@@ -1176,6 +1165,7 @@ resource "google_compute_router_nat" "foobar" {
   tcp_established_idle_timeout_sec = 1600
   tcp_transitory_idle_timeout_sec  = 60
   tcp_time_wait_timeout_sec        = 60
+  max_ports_per_vm                 = 128
 
   log_config {
     enable = true
@@ -1194,7 +1184,8 @@ network = google_compute_network.foobar.self_link
 }
 
 resource "google_compute_network" "foobar" {
-name = "%s-net"
+  name = "%s-net"
+  auto_create_subnetworks = false
 }
 resource "google_compute_subnetwork" "foobar" {
 name          = "%s-subnet"
@@ -1228,6 +1219,7 @@ resource "google_compute_router_nat" "foobar" {
   tcp_established_idle_timeout_sec = 1600
   tcp_transitory_idle_timeout_sec  = 60
   tcp_time_wait_timeout_sec        = 60
+  max_ports_per_vm                 = 128
 
   log_config {
     enable = true
@@ -1833,68 +1825,6 @@ resource "google_compute_router" "foobar" {
 `, routerName, routerName, routerName)
 }
 
-func testAccComputeRouterNatLogConfig(routerName string) string {
-	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name = "%s-net"
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "%s-subnet"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "%s"
-  region  = google_compute_subnetwork.foobar.region
-  network = google_compute_network.foobar.self_link
-}
-
-resource "google_compute_router_nat" "foobar" {
-  name                               = "%s"
-  router                             = google_compute_router.foobar.name
-  region                             = google_compute_router.foobar.region
-  nat_ip_allocate_option             = "AUTO_ONLY"
-  source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_IP_RANGES"
-  log_config {
-    enable = false
-    filter = "ALL"
-  }
-}
-`, routerName, routerName, routerName, routerName)
-}
-
-func testAccComputeRouterNatLogConfigRemoved(routerName string) string {
-	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name = "%s-net"
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "%s-subnet"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "%s"
-  region  = google_compute_subnetwork.foobar.region
-  network = google_compute_network.foobar.self_link
-}
-
-resource "google_compute_router_nat" "foobar" {
-  name                               = "%s"
-  router                             = google_compute_router.foobar.name
-  region                             = google_compute_router.foobar.region
-  nat_ip_allocate_option             = "AUTO_ONLY"
-  source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_IP_RANGES"
-}
-`, routerName, routerName, routerName, routerName)
-}
-
 func testAccComputeRouterNatBaseResourcesWithPrivateNatSubnetworks(routerName, hubName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {