Add Stateful ip field to instance group manager (#6695) (#13260)

* Add Stateful Ips field to Instance Group Manager and region instance group manager

Signed-off-by: Modular Magician <[email protected]>

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/6695.txt

@@ -0,0 +1,4 @@
+```release-note:enhancement
+Add Stateful IP fields to instance group manager
+
+```

google/resource_compute_instance_group_manager.go

@@ -425,7 +425,8 @@ func resourceComputeInstanceGroupManagerCreate(d *schema.ResourceData, meta inte
 		AutoHealingPolicies:         expandAutoHealingPolicies(d.Get("auto_healing_policies").([]interface{})),
 		Versions:                    expandVersions(d.Get("version").([]interface{})),
 		UpdatePolicy:                expandUpdatePolicy(d.Get("update_policy").([]interface{})),
-		StatefulPolicy:              expandStatefulPolicy(d.Get("stateful_disk").(*schema.Set).List()),
+		StatefulPolicy:              expandStatefulPolicy(d),
+
 		// Force send TargetSize to allow a value of 0.
 		ForceSendFields: []string{"TargetSize"},
 	}
@@ -701,7 +702,7 @@ func resourceComputeInstanceGroupManagerUpdate(d *schema.ResourceData, meta inte
 	}
 
 	if d.HasChange("stateful_disk") {
-		updatedManager.StatefulPolicy = expandStatefulPolicy(d.Get("stateful_disk").(*schema.Set).List())
+		updatedManager.StatefulPolicy = expandStatefulPolicy(d)
 		change = true
 	}
 
@@ -874,19 +875,22 @@ func expandAutoHealingPolicies(configured []interface{}) []*compute.InstanceGrou
 	return autoHealingPolicies
 }
 
-func expandStatefulPolicy(configured []interface{}) *compute.StatefulPolicy {
+func expandStatefulPolicy(d *schema.ResourceData) *compute.StatefulPolicy {
+	preservedState := &compute.StatefulPolicyPreservedState{}
+	stateful_disks := d.Get("stateful_disk").(*schema.Set).List()
 	disks := make(map[string]compute.StatefulPolicyPreservedStateDiskDevice)
-	for _, raw := range configured {
+	for _, raw := range stateful_disks {
 		data := raw.(map[string]interface{})
 		disk := compute.StatefulPolicyPreservedStateDiskDevice{
 			AutoDelete: data["delete_rule"].(string),
 		}
 		disks[data["device_name"].(string)] = disk
 	}
-	if len(disks) > 0 {
-		return &compute.StatefulPolicy{PreservedState: &compute.StatefulPolicyPreservedState{Disks: disks}}
-	}
-	return nil
+	preservedState.Disks = disks
+	statefulPolicy := &compute.StatefulPolicy{PreservedState: preservedState}
+	statefulPolicy.ForceSendFields = append(statefulPolicy.ForceSendFields, "PreservedState")
+
+	return statefulPolicy
 }
 
 func expandVersions(configured []interface{}) []*compute.InstanceGroupManagerVersion {
@@ -999,7 +1003,6 @@ func flattenStatefulPolicy(statefulPolicy *compute.StatefulPolicy) []map[string]
 	}
 	return result
 }
-
 func flattenUpdatePolicy(updatePolicy *compute.InstanceGroupManagerUpdatePolicy) []map[string]interface{} {
 	results := []map[string]interface{}{}
 	if updatePolicy != nil {

google/resource_compute_instance_group_manager_test.go

@@ -367,14 +367,15 @@ func TestAccInstanceGroupManager_stateful(t *testing.T) {
 	target := fmt.Sprintf("tf-test-igm-%s", randString(t, 10))
 	igm := fmt.Sprintf("tf-test-igm-%s", randString(t, 10))
 	hck := fmt.Sprintf("tf-test-igm-%s", randString(t, 10))
+	network := fmt.Sprintf("tf-test-igm-%s", randString(t, 10))
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckInstanceGroupManagerDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccInstanceGroupManager_stateful(template, target, igm, hck),
+				Config: testAccInstanceGroupManager_stateful(network, template, target, igm, hck),
 			},
 			{
 				ResourceName:            "google_compute_instance_group_manager.igm-basic",
@@ -383,7 +384,7 @@ func TestAccInstanceGroupManager_stateful(t *testing.T) {
 				ImportStateVerifyIgnore: []string{"status"},
 			},
 			{
-				Config: testAccInstanceGroupManager_statefulUpdated(template, target, igm, hck),
+				Config: testAccInstanceGroupManager_statefulUpdated(network, template, target, igm, hck),
 			},
 			{
 				ResourceName:            "google_compute_instance_group_manager.igm-basic",
@@ -1332,13 +1333,17 @@ resource "google_compute_instance_group_manager" "igm-basic" {
 `, primaryTemplate, canaryTemplate, igm)
 }
 
-func testAccInstanceGroupManager_stateful(template, target, igm, hck string) string {
+func testAccInstanceGroupManager_stateful(network, template, target, igm, hck string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "debian-11"
   project = "debian-cloud"
 }
 
+resource "google_compute_network" "igm-basic" {
+  name = "%s"
+}
+
 resource "google_compute_instance_template" "igm-basic" {
   name           = "%s"
   machine_type   = "e2-medium"
@@ -1367,6 +1372,10 @@ resource "google_compute_instance_template" "igm-basic" {
     network = "default"
   }
 
+  network_interface {
+    network = google_compute_network.igm-basic.self_link
+  }
+
   service_account {
     scopes = ["userinfo-email", "compute-ro", "storage-ro"]
   }
@@ -1401,16 +1410,20 @@ resource "google_compute_http_health_check" "zero" {
   check_interval_sec = 1
   timeout_sec        = 1
 }
-`, template, target, igm, hck)
+`, network, template, target, igm, hck)
 }
 
-func testAccInstanceGroupManager_statefulUpdated(template, target, igm, hck string) string {
+func testAccInstanceGroupManager_statefulUpdated(network, template, target, igm, hck string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "debian-11"
   project = "debian-cloud"
 }
 
+resource "google_compute_network" "igm-basic" {
+  name = "%s"
+}
+
 resource "google_compute_instance_template" "igm-basic" {
   name           = "%s"
   machine_type   = "e2-medium"
@@ -1439,6 +1452,10 @@ resource "google_compute_instance_template" "igm-basic" {
     network = "default"
   }
 
+  network_interface {
+    network = google_compute_network.igm-basic.self_link
+  }
+
   service_account {
     scopes = ["userinfo-email", "compute-ro", "storage-ro"]
   }
@@ -1466,10 +1483,6 @@ resource "google_compute_instance_group_manager" "igm-basic" {
     delete_rule = "NEVER"
   }
 
-  stateful_disk {
-    device_name = "my-stateful-disk2"
-    delete_rule = "ON_PERMANENT_INSTANCE_DELETION"
-  }
 }
 
 resource "google_compute_http_health_check" "zero" {
@@ -1478,7 +1491,7 @@ resource "google_compute_http_health_check" "zero" {
   check_interval_sec = 1
   timeout_sec        = 1
 }
-`, template, target, igm, hck)
+`, network, template, target, igm, hck)
 }
 
 func testAccInstanceGroupManager_waitForStatus(template, target, igm, perInstanceConfig string) string {

google/resource_compute_region_instance_group_manager.go

@@ -428,7 +428,7 @@ func resourceComputeRegionInstanceGroupManagerCreate(d *schema.ResourceData, met
 		Versions:                    expandVersions(d.Get("version").([]interface{})),
 		UpdatePolicy:                expandRegionUpdatePolicy(d.Get("update_policy").([]interface{})),
 		DistributionPolicy:          expandDistributionPolicy(d),
-		StatefulPolicy:              expandStatefulPolicy(d.Get("stateful_disk").(*schema.Set).List()),
+		StatefulPolicy:              expandStatefulPolicy(d),
 		// Force send TargetSize to allow size of 0.
 		ForceSendFields: []string{"TargetSize"},
 	}
@@ -610,7 +610,6 @@ func resourceComputeRegionInstanceGroupManagerRead(d *schema.ResourceData, meta
 	if err = d.Set("status", flattenStatus(manager.Status)); err != nil {
 		return fmt.Errorf("Error setting status in state: %s", err.Error())
 	}
-
 	// If unset in state set to default value
 	if d.Get("wait_for_instances_status").(string) == "" {
 		if err = d.Set("wait_for_instances_status", "STABLE"); err != nil {
@@ -667,7 +666,7 @@ func resourceComputeRegionInstanceGroupManagerUpdate(d *schema.ResourceData, met
 	}
 
 	if d.HasChange("stateful_disk") {
-		updatedManager.StatefulPolicy = expandStatefulPolicy(d.Get("stateful_disk").(*schema.Set).List())
+		updatedManager.StatefulPolicy = expandStatefulPolicy(d)
 		change = true
 	}
 

google/resource_compute_region_instance_group_manager_test.go

@@ -373,14 +373,15 @@ func TestAccRegionInstanceGroupManager_stateful(t *testing.T) {
 
 	template := fmt.Sprintf("tf-test-rigm-%s", randString(t, 10))
 	igm := fmt.Sprintf("tf-test-rigm-%s", randString(t, 10))
+	network := fmt.Sprintf("tf-test-igm-%s", randString(t, 10))
 
 	vcrTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckRegionInstanceGroupManagerDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccRegionInstanceGroupManager_stateful(template, igm),
+				Config: testAccRegionInstanceGroupManager_stateful(template, network, igm),
 			},
 			{
 				ResourceName:            "google_compute_region_instance_group_manager.igm-basic",
@@ -389,7 +390,7 @@ func TestAccRegionInstanceGroupManager_stateful(t *testing.T) {
 				ImportStateVerifyIgnore: []string{"status"},
 			},
 			{
-				Config: testAccRegionInstanceGroupManager_statefulUpdate(template, igm),
+				Config: testAccRegionInstanceGroupManager_statefulUpdate(template, network, igm),
 			},
 			{
 				ResourceName:            "google_compute_region_instance_group_manager.igm-basic",
@@ -1315,13 +1316,15 @@ resource "google_compute_region_instance_group_manager" "igm-rolling-update-poli
 `, igm)
 }
 
-func testAccRegionInstanceGroupManager_stateful(template, igm string) string {
+func testAccRegionInstanceGroupManager_stateful(network, template, igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "debian-11"
   project = "debian-cloud"
 }
-
+resource "google_compute_network" "igm-basic" {
+  name = "%s"
+}
 resource "google_compute_instance_template" "igm-basic" {
   name           = "%s"
   machine_type   = "e2-medium"
@@ -1341,6 +1344,9 @@ resource "google_compute_instance_template" "igm-basic" {
   network_interface {
     network = "default"
   }
+  network_interface {
+    network = google_compute_network.igm-basic.self_link
+  }
 }
 
 resource "google_compute_region_instance_group_manager" "igm-basic" {
@@ -1366,17 +1372,19 @@ resource "google_compute_region_instance_group_manager" "igm-basic" {
     device_name = "stateful-disk"
     delete_rule = "NEVER"
   }
-}
-`, template, igm)
+  }
+`, network, template, igm)
 }
 
-func testAccRegionInstanceGroupManager_statefulUpdate(template, igm string) string {
+func testAccRegionInstanceGroupManager_statefulUpdate(network, template, igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
   family  = "debian-11"
   project = "debian-cloud"
 }
-
+resource "google_compute_network" "igm-basic" {
+  name = "%s"
+}
 resource "google_compute_instance_template" "igm-basic" {
   name           = "%s"
   machine_type   = "e2-medium"
@@ -1396,6 +1404,9 @@ resource "google_compute_instance_template" "igm-basic" {
   network_interface {
     network = "default"
   }
+  network_interface {
+    network = google_compute_network.igm-basic.self_link
+  }
 }
 
 resource "google_compute_region_instance_group_manager" "igm-basic" {
@@ -1426,6 +1437,6 @@ resource "google_compute_region_instance_group_manager" "igm-basic" {
     device_name = "stateful-disk2"
     delete_rule = "ON_PERMANENT_INSTANCE_DELETION"
   }
-}
-`, template, igm)
+  }
+`, network, template, igm)
 }