Revert "Placement policy support for Compute Instance (#3217)" (#3250) (#1852)

This reverts commit d7d347f224561e053231452081bbff2ce4c877f2.

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

Author: modular-magician

.changelog/3250.txt

@@ -0,0 +1,3 @@
+```release-note:none
+
+```

google-beta/resource_compute_instance.go

@@ -593,15 +593,6 @@ func resourceComputeInstance() *schema.Resource {
 				Optional: true,
 				ForceNew: true,
 			},
-
-			"resource_policies": {
-				Type:             schema.TypeList,
-				Elem:             &schema.Schema{Type: schema.TypeString},
-				DiffSuppressFunc: compareSelfLinkRelativePaths,
-				Optional:         true,
-				ForceNew:         true,
-				MaxItems:         1,
-			},
 		},
 		CustomizeDiff: customdiff.All(
 			customdiff.If(
@@ -729,7 +720,6 @@ func expandComputeInstance(project string, d *schema.ResourceData, config *Confi
 		ForceSendFields:    []string{"CanIpForward", "DeletionProtection"},
 		ShieldedVmConfig:   expandShieldedVmConfigs(d),
 		DisplayDevice:      expandDisplayDevice(d),
-		ResourcePolicies:   convertStringArr(d.Get("resource_policies").([]interface{})),
 	}, nil
 }
 
@@ -993,9 +983,6 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
 			}
 		}
 	}
-
-	d.Set("resource_policies", instance.ResourcePolicies)
-
 	// Remove nils from map in case there were disks in the config that were not present on read;
 	// i.e. a disk was detached out of band
 	ads := []map[string]interface{}{}

google-beta/resource_compute_instance_test.go

@@ -1784,24 +1784,6 @@ func TestAccComputeInstance_updateTerminated_desiredStatusRunning_notAllowStoppi
 	})
 }
 
-func TestAccComputeInstance_resourcePolicyCollocate(t *testing.T) {
-	t.Parallel()
-
-	instanceName := fmt.Sprintf("terraform-test-%s", acctest.RandString(10))
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckComputeInstanceDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccComputeInstance_resourcePolicyCollocate(instanceName),
-			},
-			computeInstanceImportStep("us-central1-a", instanceName, []string{"allow_stopping_for_update"}),
-		},
-	})
-}
-
 func testAccCheckComputeInstanceUpdateMachineType(n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -4536,49 +4518,3 @@ resource "google_compute_instance" "foobar" {
 }
 `, instance)
 }
-
-func testAccComputeInstance_resourcePolicyCollocate(instance string) string {
-	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
-
-resource "google_compute_instance" "foobar" {
-  name           = "%s"
-  machine_type   = "c2-standard-4"
-  zone           = "us-central1-f"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  //deletion_protection = false is implicit in this config due to default value
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  scheduling {
-    # Instances with resource policies do not support live migration.
-    on_host_maintenance = "TERMINATE"
-  }
-
-  resource_policies = [google_compute_resource_policy.foo.self_link]
-}
-
-resource "google_compute_resource_policy" "foo" {
-  name   = "tf-test-policy-%s"
-  region = "us-central1"
-  group_placement_policy {
-    vm_count = 2
-    collocation = "COLLOCATED"
-  }
-}
-
-`, instance, acctest.RandString(10))
-}

google-beta/resource_compute_resource_policy.go

@@ -53,41 +53,6 @@ first character must be a lowercase letter, and all following characters
 must be a dash, lowercase letter, or digit, except the last character,
 which cannot be a dash.`,
 			},
-			"group_placement_policy": {
-				Type:        schema.TypeList,
-				Optional:    true,
-				ForceNew:    true,
-				Description: `Policy for creating snapshots of persistent disks.`,
-				MaxItems:    1,
-				Elem: &schema.Resource{
-					Schema: map[string]*schema.Schema{
-						"availability_domain_count": {
-							Type:     schema.TypeInt,
-							Optional: true,
-							ForceNew: true,
-							Description: `The number of availability domains instances will be spread across. If two instances are in different
-availability domain, they will not be put in the same low latency network`,
-							AtLeastOneOf: []string{"group_placement_policy.0.vm_count", "group_placement_policy.0.availability_domain_count"},
-						},
-						"collocation": {
-							Type:         schema.TypeString,
-							Optional:     true,
-							ForceNew:     true,
-							ValidateFunc: validation.StringInSlice([]string{"COLLOCATED", ""}, false),
-							Description: `Collocation specifies whether to place VMs inside the same availability domain on the same low-latency network.
-Specify 'COLLOCATED' to enable collocation. Can only be specified with 'vm_count'.`,
-						},
-						"vm_count": {
-							Type:         schema.TypeInt,
-							Optional:     true,
-							ForceNew:     true,
-							Description:  `Number of vms in this placement group`,
-							AtLeastOneOf: []string{"group_placement_policy.0.vm_count", "group_placement_policy.0.availability_domain_count"},
-						},
-					},
-				},
-				ConflictsWith: []string{"snapshot_schedule_policy"},
-			},
 			"region": {
 				Type:             schema.TypeString,
 				Computed:         true,
@@ -260,7 +225,6 @@ Valid options are KEEP_AUTO_SNAPSHOTS and APPLY_RETENTION_POLICY`,
 						},
 					},
 				},
-				ConflictsWith: []string{"group_placement_policy"},
 			},
 			"project": {
 				Type:     schema.TypeString,
@@ -313,12 +277,6 @@ func resourceComputeResourcePolicyCreate(d *schema.ResourceData, meta interface{
 	} else if v, ok := d.GetOkExists("snapshot_schedule_policy"); !isEmptyValue(reflect.ValueOf(snapshotSchedulePolicyProp)) && (ok || !reflect.DeepEqual(v, snapshotSchedulePolicyProp)) {
 		obj["snapshotSchedulePolicy"] = snapshotSchedulePolicyProp
 	}
-	groupPlacementPolicyProp, err := expandComputeResourcePolicyGroupPlacementPolicy(d.Get("group_placement_policy"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("group_placement_policy"); !isEmptyValue(reflect.ValueOf(groupPlacementPolicyProp)) && (ok || !reflect.DeepEqual(v, groupPlacementPolicyProp)) {
-		obj["groupPlacementPolicy"] = groupPlacementPolicyProp
-	}
 	regionProp, err := expandComputeResourcePolicyRegion(d.Get("region"), d, config)
 	if err != nil {
 		return err
@@ -390,9 +348,6 @@ func resourceComputeResourcePolicyRead(d *schema.ResourceData, meta interface{})
 	if err := d.Set("snapshot_schedule_policy", flattenComputeResourcePolicySnapshotSchedulePolicy(res["snapshotSchedulePolicy"], d, config)); err != nil {
 		return fmt.Errorf("Error reading ResourcePolicy: %s", err)
 	}
-	if err := d.Set("group_placement_policy", flattenComputeResourcePolicyGroupPlacementPolicy(res["groupPlacementPolicy"], d, config)); err != nil {
-		return fmt.Errorf("Error reading ResourcePolicy: %s", err)
-	}
 	if err := d.Set("region", flattenComputeResourcePolicyRegion(res["region"], d, config)); err != nil {
 		return fmt.Errorf("Error reading ResourcePolicy: %s", err)
 	}
@@ -654,47 +609,6 @@ func flattenComputeResourcePolicySnapshotSchedulePolicySnapshotPropertiesGuestFl
 	return v
 }
 
-func flattenComputeResourcePolicyGroupPlacementPolicy(v interface{}, d *schema.ResourceData, config *Config) interface{} {
-	if v == nil {
-		return nil
-	}
-	original := v.(map[string]interface{})
-	if len(original) == 0 {
-		return nil
-	}
-	transformed := make(map[string]interface{})
-	transformed["vm_count"] =
-		flattenComputeResourcePolicyGroupPlacementPolicyVmCount(original["vmCount"], d, config)
-	transformed["availability_domain_count"] =
-		flattenComputeResourcePolicyGroupPlacementPolicyAvailabilityDomainCount(original["availabilityDomainCount"], d, config)
-	transformed["collocation"] =
-		flattenComputeResourcePolicyGroupPlacementPolicyCollocation(original["collocation"], d, config)
-	return []interface{}{transformed}
-}
-func flattenComputeResourcePolicyGroupPlacementPolicyVmCount(v interface{}, d *schema.ResourceData, config *Config) interface{} {
-	// Handles the string fixed64 format
-	if strVal, ok := v.(string); ok {
-		if intVal, err := strconv.ParseInt(strVal, 10, 64); err == nil {
-			return intVal
-		} // let terraform core handle it if we can't convert the string to an int.
-	}
-	return v
-}
-
-func flattenComputeResourcePolicyGroupPlacementPolicyAvailabilityDomainCount(v interface{}, d *schema.ResourceData, config *Config) interface{} {
-	// Handles the string fixed64 format
-	if strVal, ok := v.(string); ok {
-		if intVal, err := strconv.ParseInt(strVal, 10, 64); err == nil {
-			return intVal
-		} // let terraform core handle it if we can't convert the string to an int.
-	}
-	return v
-}
-
-func flattenComputeResourcePolicyGroupPlacementPolicyCollocation(v interface{}, d *schema.ResourceData, config *Config) interface{} {
-	return v
-}
-
 func flattenComputeResourcePolicyRegion(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	if v == nil {
 		return v
@@ -984,51 +898,6 @@ func expandComputeResourcePolicySnapshotSchedulePolicySnapshotPropertiesGuestFlu
 	return v, nil
 }
 
-func expandComputeResourcePolicyGroupPlacementPolicy(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	l := v.([]interface{})
-	if len(l) == 0 || l[0] == nil {
-		return nil, nil
-	}
-	raw := l[0]
-	original := raw.(map[string]interface{})
-	transformed := make(map[string]interface{})
-
-	transformedVmCount, err := expandComputeResourcePolicyGroupPlacementPolicyVmCount(original["vm_count"], d, config)
-	if err != nil {
-		return nil, err
-	} else if val := reflect.ValueOf(transformedVmCount); val.IsValid() && !isEmptyValue(val) {
-		transformed["vmCount"] = transformedVmCount
-	}
-
-	transformedAvailabilityDomainCount, err := expandComputeResourcePolicyGroupPlacementPolicyAvailabilityDomainCount(original["availability_domain_count"], d, config)
-	if err != nil {
-		return nil, err
-	} else if val := reflect.ValueOf(transformedAvailabilityDomainCount); val.IsValid() && !isEmptyValue(val) {
-		transformed["availabilityDomainCount"] = transformedAvailabilityDomainCount
-	}
-
-	transformedCollocation, err := expandComputeResourcePolicyGroupPlacementPolicyCollocation(original["collocation"], d, config)
-	if err != nil {
-		return nil, err
-	} else if val := reflect.ValueOf(transformedCollocation); val.IsValid() && !isEmptyValue(val) {
-		transformed["collocation"] = transformedCollocation
-	}
-
-	return transformed, nil
-}
-
-func expandComputeResourcePolicyGroupPlacementPolicyVmCount(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	return v, nil
-}
-
-func expandComputeResourcePolicyGroupPlacementPolicyAvailabilityDomainCount(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	return v, nil
-}
-
-func expandComputeResourcePolicyGroupPlacementPolicyCollocation(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	return v, nil
-}
-
 func expandComputeResourcePolicyRegion(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	f, err := parseGlobalFieldValue("regions", v.(string), "project", d, config, true)
 	if err != nil {

google-beta/resource_compute_resource_policy_generated_test.go

@@ -117,43 +117,6 @@ resource "google_compute_resource_policy" "bar" {
 `, context)
 }
 
-func TestAccComputeResourcePolicy_resourcePolicyPlacementPolicyExample(t *testing.T) {
-	t.Parallel()
-
-	context := map[string]interface{}{
-		"random_suffix": acctest.RandString(10),
-	}
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckComputeResourcePolicyDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccComputeResourcePolicy_resourcePolicyPlacementPolicyExample(context),
-			},
-			{
-				ResourceName:      "google_compute_resource_policy.baz",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
-func testAccComputeResourcePolicy_resourcePolicyPlacementPolicyExample(context map[string]interface{}) string {
-	return Nprintf(`
-resource "google_compute_resource_policy" "baz" {
-  name   = "policy%{random_suffix}"
-  region = "us-central1"
-  group_placement_policy {
-    vm_count = 2
-    collocation = "COLLOCATED"
-  }
-}
-`, context)
-}
-
 func testAccCheckComputeResourcePolicyDestroy(s *terraform.State) error {
 	for name, rs := range s.RootModule().Resources {
 		if rs.Type != "google_compute_resource_policy" {