Revert eraseWindowsVssSignature field and test

Author: c2thorn

.changelog/3959.txt

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

google-beta/resource_compute_disk.go

@@ -312,14 +312,6 @@ encryption key that protects this resource.`,
 					},
 				},
 			},
-			"erase_windows_vss_signature": {
-				Type:     schema.TypeBool,
-				Optional: true,
-				ForceNew: true,
-				Description: `Specifies whether the disk restored from a source snapshot
-should erase Windows specific VSS signature.`,
-				Default: false,
-			},
 			"image": {
 				Type:             schema.TypeString,
 				Optional:         true,
@@ -611,12 +603,6 @@ func resourceComputeDiskCreate(d *schema.ResourceData, meta interface{}) error {
 	} else if v, ok := d.GetOkExists("type"); !isEmptyValue(reflect.ValueOf(typeProp)) && (ok || !reflect.DeepEqual(v, typeProp)) {
 		obj["type"] = typeProp
 	}
-	eraseWindowsVssSignatureProp, err := expandComputeDiskEraseWindowsVssSignature(d.Get("erase_windows_vss_signature"), d, config)
-	if err != nil {
-		return err
-	} else if v, ok := d.GetOkExists("erase_windows_vss_signature"); !isEmptyValue(reflect.ValueOf(eraseWindowsVssSignatureProp)) && (ok || !reflect.DeepEqual(v, eraseWindowsVssSignatureProp)) {
-		obj["eraseWindowsVssSignature"] = eraseWindowsVssSignatureProp
-	}
 	sourceImageProp, err := expandComputeDiskImage(d.Get("image"), d, config)
 	if err != nil {
 		return err
@@ -786,9 +772,6 @@ func resourceComputeDiskRead(d *schema.ResourceData, meta interface{}) error {
 	if err := d.Set("type", flattenComputeDiskType(res["type"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Disk: %s", err)
 	}
-	if err := d.Set("erase_windows_vss_signature", flattenComputeDiskEraseWindowsVssSignature(res["eraseWindowsVssSignature"], d, config)); err != nil {
-		return fmt.Errorf("Error reading Disk: %s", err)
-	}
 	if err := d.Set("image", flattenComputeDiskImage(res["sourceImage"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Disk: %s", err)
 	}
@@ -1113,10 +1096,6 @@ func flattenComputeDiskType(v interface{}, d *schema.ResourceData, config *Confi
 	return NameFromSelfLinkStateFunc(v)
 }
 
-func flattenComputeDiskEraseWindowsVssSignature(v interface{}, d *schema.ResourceData, config *Config) interface{} {
-	return v
-}
-
 func flattenComputeDiskImage(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -1294,10 +1273,6 @@ func expandComputeDiskType(v interface{}, d TerraformResourceData, config *Confi
 	return f.RelativeLink(), nil
 }
 
-func expandComputeDiskEraseWindowsVssSignature(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	return v, nil
-}
-
 func expandComputeDiskImage(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	return v, nil
 }

google-beta/resource_compute_disk_test.go

@@ -453,30 +453,6 @@ func TestAccComputeDisk_resourcePolicies(t *testing.T) {
 	})
 }
 
-func TestAccComputeDisk_VSSWindows(t *testing.T) {
-	t.Parallel()
-
-	diskName := fmt.Sprintf("tf-test-%s", randString(t, 10))
-	firstDiskName := fmt.Sprintf("tf-test-%s", randString(t, 10))
-	snapshotName := fmt.Sprintf("tf-test-%s", randString(t, 10))
-	projectName := getTestProjectFromEnv()
-
-	vcrTest(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheck(t) },
-		Providers: testAccProviders,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccComputeDisk_WindowsVSS(firstDiskName, projectName, snapshotName, diskName),
-			},
-			{
-				ResourceName:      "google_compute_disk.foobar",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
 func testAccCheckComputeDiskExists(t *testing.T, n, p string, disk *compute.Disk) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -793,35 +769,3 @@ resource "google_compute_disk" "foobar" {
 }
 `, policyName, diskName)
 }
-
-func testAccComputeDisk_WindowsVSS(firstDiskName, projectName, snapshotName, diskName string) string {
-	return fmt.Sprintf(`
-resource "google_compute_disk" "sourcedisk" {
-  name    = "d1-%s"
-  image   = "windows-server-2019-dc-v20200813"
-  size    = 50
-  type    = "pd-ssd"
-  zone    = "us-central1-a"
-  project = "%s"
-}
-
-resource "google_compute_snapshot" "snapdisk" {
-  name        = "%s"
-  source_disk = google_compute_disk.sourcedisk.name
-  zone        = "us-central1-a"
-  project     = "%s"
-}
-
-resource "google_compute_disk" "foobar" {
-  name                        = "%s"
-  snapshot                    = google_compute_snapshot.snapdisk.self_link
-  size                        = 50
-  type                        = "pd-ssd"
-  zone                        = "us-central1-a"
-  erase_windows_vss_signature = true
-  timeouts {
-    create = "10m"
-  }
-}
-`, firstDiskName, projectName, snapshotName, projectName, diskName)
-}

website/docs/r/compute_disk.html.markdown

@@ -121,11 +121,6 @@ The following arguments are supported:
   URL of the disk type resource describing which disk type to use to
   create the disk. Provide this when creating the disk.
 
-* `erase_windows_vss_signature` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
-  Specifies whether the disk restored from a source snapshot
-  should erase Windows specific VSS signature.
-
 * `image` -
   (Optional)
   The image from which to initialize this disk. This can be