Revert "fix local-ssd update issue (#7327)" (#7760) (#5502)

This reverts commit 28fc8cef7abdb8e7e13ae8f640407be797904b51.

Signed-off-by: Modular Magician <[email protected]>
Co-authored-by: Edward Sun <[email protected]>

Author: modular-magician

.changelog/7760.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+compute: fixed can't update a instance with local ssd when stopping is needed on `google_compute_instance` (revert) 
+```

google-beta/resource_compute_instance.go

@@ -90,27 +90,6 @@ func forceNewIfNetworkIPNotUpdatableFunc(d TerraformResourceDiff) error {
 	return nil
 }
 
-// check if stopping_with_local_ssd_discard is the only updated field
-func onlyStoppingWithLocalSsdDiscardChanged(d *schema.ResourceData, resourceSchema map[string]*schema.Schema) bool {
-	if d.HasChange("stopping_with_local_ssd_discard") {
-		for field := range resourceSchema {
-			if field == "stopping_with_local_ssd_discard" {
-				continue
-			}
-			if d.HasChange(field) {
-				return false
-			}
-		}
-		return true
-	}
-	return false
-}
-
-func hasLocalSsd(d *schema.ResourceData, config *Config) bool {
-	n := d.Get("scratch_disk.#")
-	return n != nil && n.(int) > 0
-}
-
 func ResourceComputeInstance() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceComputeInstanceCreate,
@@ -958,13 +937,6 @@ be from 0 to 999,999,999 inclusive.`,
 					},
 				},
 			},
-			"stopping_with_local_ssd_discard": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				Default:  false,
-				Description: `Whether allow data on the local ssd to be discarded. The instance can not be stopped when a local ssd being attached to the instance.
-True to allow data to be discarded. Default is False. Setting true to allow the local ssd to be recreated. https://cloud.google.com/compute/docs/disks/local-ssd`,
-			},
 		},
 		CustomizeDiff: customdiff.All(
 			customdiff.If(
@@ -1252,13 +1224,6 @@ func resourceComputeInstanceRead(d *schema.ResourceData, meta interface{}) error
 		delete(md, "startup-script")
 	}
 
-	// Explicitly set virtual fields to default values if unset
-	if _, ok := d.GetOkExists("stopping_with_local_ssd_discard"); !ok {
-		if err := d.Set("stopping_with_local_ssd_discard", false); err != nil {
-			return fmt.Errorf("Error setting stopping_with_local_ssd_discard: %s", err)
-		}
-	}
-
 	if err = d.Set("metadata", md); err != nil {
 		return fmt.Errorf("Error setting metadata: %s", err)
 	}
@@ -1516,16 +1481,6 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 		return err
 	}
 
-	if onlyStoppingWithLocalSsdDiscardChanged(d, ResourceComputeInstance().Schema) {
-		if d.Get("stopping_with_local_ssd_discard") != nil {
-			if err := d.Set("stopping_with_local_ssd_discard", d.Get("stopping_with_local_ssd_discard")); err != nil {
-				return fmt.Errorf("Error reading/setting stopping_with_local_ssd_discard: %s", err)
-			}
-		}
-		// exit updating if stopping_with_local_ssd_discard, a vertual field, is the only field being updated
-		return nil
-	}
-
 	// Use beta api directly in order to read network_interface.fingerprint without having to put it in the schema.
 	// Change back to getInstance(config, d) once updating alias ips is GA.
 	instance, err := config.NewComputeClient(userAgent).Instances.Get(project, zone, d.Get("name").(string)).Do()
@@ -1961,13 +1916,6 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 
 	needToStopInstanceBeforeUpdating := scopesChange || d.HasChange("service_account.0.email") || d.HasChange("machine_type") || d.HasChange("min_cpu_platform") || d.HasChange("enable_display") || d.HasChange("shielded_instance_config") || len(updatesToNIWhileStopped) > 0 || bootRequiredSchedulingChange || d.HasChange("advanced_machine_features")
 
-	if needToStopInstanceBeforeUpdating {
-		if hasLocalSsd(d, config) && !d.Get("stopping_with_local_ssd_discard").(bool) {
-			return fmt.Errorf("The instance has local SSD. Stopping insatnce will discard all data on the local SSD. " +
-				"Setting stopping_with_local_ssd_discard to true to allow the data on the local SSD to be discarded")
-		}
-	}
-
 	if d.HasChange("desired_status") && !needToStopInstanceBeforeUpdating {
 		desiredStatus := d.Get("desired_status").(string)
 
@@ -1980,17 +1928,9 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 					return errwrap.Wrapf("Error starting instance: {{err}}", err)
 				}
 			} else if desiredStatus == "TERMINATED" {
-				if d.Get("stopping_with_local_ssd_discard").(bool) {
-					op, err = config.NewComputeClient(userAgent).Instances.Stop(project, zone, instance.Name).DiscardLocalSsd(true).Do()
-					if err != nil {
-						return err
-					}
-				} else {
-					// DiscardLocalSsd could happen only when stopping_with_local_ssd_discard = true
-					op, err = config.NewComputeClient(userAgent).Instances.Stop(project, zone, instance.Name).Do()
-					if err != nil {
-						return err
-					}
+				op, err = config.NewComputeClient(userAgent).Instances.Stop(project, zone, instance.Name).Do()
+				if err != nil {
+					return err
 				}
 			}
 			opErr := ComputeOperationWaitTime(
@@ -2014,8 +1954,8 @@ func resourceComputeInstanceUpdate(d *schema.ResourceData, meta interface{}) err
 				"You can also stop it by setting desired_status = \"TERMINATED\", but the instance will not be restarted after the update.")
 		}
 
-		if statusBeforeUpdate != "TERMINATED" && d.Get("stopping_with_local_ssd_discard").(bool) {
-			op, err := config.NewComputeClient(userAgent).Instances.Stop(project, zone, instance.Name).DiscardLocalSsd(true).Do()
+		if statusBeforeUpdate != "TERMINATED" {
+			op, err := config.NewComputeClient(userAgent).Instances.Stop(project, zone, instance.Name).Do()
 			if err != nil {
 				return errwrap.Wrapf("Error stopping instance: {{err}}", err)
 			}

google-beta/resource_compute_instance_test.go

@@ -78,7 +78,7 @@ func computeInstanceImportStep(zone, instanceName string, additionalImportIgnore
 	// metadata is only read into state if set in the config
 	// importing doesn't know whether metadata.startup_script vs metadata_startup_script is set in the config,
 	// it always takes metadata.startup-script
-	ignores := []string{"metadata.%", "metadata.startup-script", "metadata_startup_script", "stopping_with_local_ssd_discard"}
+	ignores := []string{"metadata.%", "metadata.startup-script", "metadata_startup_script"}
 
 	return resource.TestStep{
 		ResourceName:            "google_compute_instance.foobar",
@@ -777,65 +777,6 @@ func TestAccComputeInstance_with18TbScratchDisk(t *testing.T) {
 	})
 }
 
-func TestAccComputeInstance_scratchDiskUpdate(t *testing.T) {
-	t.Parallel()
-
-	var instance compute.Instance
-	var instanceName = fmt.Sprintf("tf-test-%s", RandString(t, 10))
-
-	VcrTest(t, resource.TestCase{
-		ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
-		CheckDestroy:             testAccCheckComputeInstanceDestroyProducer(t),
-		Steps: []resource.TestStep{
-			{
-				Config: testAccComputeInstance_scratchDiskUpdate(instanceName, "n1-standard-2"),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckComputeInstanceExists(
-						t, "google_compute_instance.foobar", &instance),
-					testAccCheckComputeInstanceScratchDisk(&instance, []string{"NVME"}),
-				),
-			},
-			{
-				Config:      testAccComputeInstance_scratchDiskUpdate(instanceName, "n2-standard-4"),
-				ExpectError: regexp.MustCompile("Error: The instance has local SSD. Stopping insatnce will discard all data on the local SSD. Setting stopping_with_local_ssd_discard to true to allow the data on the local SSD to be discarded"),
-			},
-			{
-				Config: testAccComputeInstance_scratchDiskUpdate2(instanceName, "n1-standard-2", "false"),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckComputeInstanceExists(
-						t, "google_compute_instance.foobar", &instance),
-					testAccCheckComputeInstanceScratchDisk(&instance, []string{"NVME"}),
-				),
-			},
-			{
-				Config:      testAccComputeInstance_scratchDiskUpdate(instanceName, "n2-standard-4"),
-				ExpectError: regexp.MustCompile("Error: The instance has local SSD. Stopping insatnce will discard all data on the local SSD. Setting stopping_with_local_ssd_discard to true to allow the data on the local SSD to be discarded"),
-			},
-			{
-				Config: testAccComputeInstance_scratchDiskUpdate2(instanceName, "n2-standard-4", "true"),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckComputeInstanceExists(
-						t, "google_compute_instance.foobar", &instance),
-					testAccCheckComputeInstanceScratchDisk(&instance, []string{"NVME"}),
-				),
-			},
-			computeInstanceImportStep("us-central1-a", instanceName, []string{"allow_stopping_for_update"}),
-			{
-				Config: testAccComputeInstance_scratchDiskUpdate2(instanceName, "n1-standard-2", "true"),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckComputeInstanceExists(
-						t, "google_compute_instance.foobar", &instance),
-					testAccCheckComputeInstanceScratchDisk(&instance, []string{"NVME"}),
-				),
-			},
-			{
-				Config:      testAccComputeInstance_scratchDiskUpdate2(instanceName, "n2-standard-4", "false"),
-				ExpectError: regexp.MustCompile("Error: The instance has local SSD. Stopping insatnce will discard all data on the local SSD. Setting stopping_with_local_ssd_discard to true to allow the data on the local SSD to be discarded"),
-			},
-		},
-	})
-}
-
 func TestAccComputeInstance_forceNewAndChangeMetadata(t *testing.T) {
 	t.Parallel()
 
@@ -4680,70 +4621,6 @@ resource "google_compute_instance" "foobar" {
 }`, instance)
 }
 
-func testAccComputeInstance_scratchDiskUpdate(instance, machinetype string) string {
-	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-11"
-  project = "debian-cloud"
-}
-
-resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "%s"
-  zone         = "us-central1-a"
-  allow_stopping_for_update = true
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
-
-  scratch_disk {
-    interface = "NVME"
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-}
-`, instance, machinetype)
-}
-
-func testAccComputeInstance_scratchDiskUpdate2(instance, machinetype, discard string) string {
-	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-11"
-  project = "debian-cloud"
-}
-
-resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "%s"
-  zone         = "us-central1-a"
-  allow_stopping_for_update = true
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
-
-  scratch_disk {
-    interface = "NVME"
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  stopping_with_local_ssd_discard = "%s"
-
-}
-`, instance, machinetype, discard)
-}
-
 func testAccComputeInstance_serviceAccount(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {

website/docs/r/compute_instance.html.markdown

@@ -186,9 +186,6 @@ is desired, you will need to modify your state file manually using
     in `guest-os-features`, and `network_interface.0.nic-type` must be `GVNIC`
     in order for this setting to take effect.
 
-* `stopping_with_local_ssd_discard` - (Optional) Whether allow data on the local ssd to be discarded. The instance can not be stopped when a local ssd being attached to the instance.
-True to allow data to be discarded. Default is False. Setting true to allow the local ssd to be recreated. https://cloud.google.com/compute/docs/disks/local-ssd
-
 ---
 
 <a name="nested_boot_disk"></a>The `boot_disk` block supports: