Revert "Add Erase Windows VSS support to compute disk (#3898) (#2434)"

This reverts commit 78e82be.

Author: megan07

.changelog/3898.txt

@@ -122,7 +122,7 @@ resource "google_compute_disk" "default" {
   name  = "tf-test-test-disk%{random_suffix}"
   type  = "pd-ssd"
   zone  = "us-central1-a"
-  image = "debian-9-stretch-v20200805"
+  image = "debian-8-jessie-v20170523"
   labels = {
     environment = "dev"
   }
@@ -145,7 +145,7 @@ resource "google_compute_disk" "default" {
   name  = "tf-test-test-disk%{random_suffix}"
   type  = "pd-ssd"
   zone  = "us-central1-a"
-  image = "debian-9-stretch-v20200805"
+  image = "debian-8-jessie-v20170523"
   labels = {
     environment = "dev"
   }
@@ -174,7 +174,7 @@ resource "google_compute_disk" "default" {
   name  = "tf-test-test-disk%{random_suffix}"
   type  = "pd-ssd"
   zone  = "us-central1-a"
-  image = "debian-9-stretch-v20200805"
+  image = "debian-8-jessie-v20170523"
   labels = {
     environment = "dev"
   }
@@ -199,7 +199,7 @@ resource "google_compute_disk" "default" {
   name  = "tf-test-test-disk%{random_suffix}"
   type  = "pd-ssd"
   zone  = "us-central1-a"
-  image = "debian-9-stretch-v20200805"
+  image = "debian-8-jessie-v20170523"
   labels = {
     environment = "dev"
   }
@@ -222,7 +222,7 @@ resource "google_compute_disk" "default" {
   name  = "tf-test-test-disk%{random_suffix}"
   type  = "pd-ssd"
   zone  = "us-central1-a"
-  image = "debian-9-stretch-v20200805"
+  image = "debian-8-jessie-v20170523"
   labels = {
     environment = "dev"
   }

google-beta/iam_compute_disk_generated_test.go

@@ -287,13 +287,6 @@ in the cloud console. Your project's Compute Engine System service account
 ('service-{{PROJECT_NUMBER}}@compute-system.iam.gserviceaccount.com') must have
 'roles/cloudkms.cryptoKeyEncrypterDecrypter' to use this feature.
 See https://cloud.google.com/compute/docs/disks/customer-managed-encryption#encrypt_a_new_persistent_disk_with_your_own_keys`,
-						},
-						"kms_key_service_account": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ForceNew: true,
-							Description: `The service account used for the encryption request for the given KMS key. 
-If absent, the Compute Engine Service Agent service account is used.`,
 						},
 						"raw_key": {
 							Type:     schema.TypeString,
@@ -312,14 +305,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,
@@ -416,13 +401,6 @@ in the cloud console. Your project's Compute Engine System service account
 ('service-{{PROJECT_NUMBER}}@compute-system.iam.gserviceaccount.com') must have
 'roles/cloudkms.cryptoKeyEncrypterDecrypter' to use this feature.
 See https://cloud.google.com/compute/docs/disks/customer-managed-encryption#encrypt_a_new_persistent_disk_with_your_own_keys`,
-						},
-						"kms_key_service_account": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ForceNew: true,
-							Description: `The service account used for the encryption request for the given KMS key. 
-If absent, the Compute Engine Service Agent service account is used.`,
 						},
 						"raw_key": {
 							Type:     schema.TypeString,
@@ -460,13 +438,6 @@ in the cloud console. Your project's Compute Engine System service account
 ('service-{{PROJECT_NUMBER}}@compute-system.iam.gserviceaccount.com') must have
 'roles/cloudkms.cryptoKeyEncrypterDecrypter' to use this feature.
 See https://cloud.google.com/compute/docs/disks/customer-managed-encryption#encrypt_a_new_persistent_disk_with_your_own_keys`,
-						},
-						"kms_key_service_account": {
-							Type:     schema.TypeString,
-							Optional: true,
-							ForceNew: true,
-							Description: `The service account used for the encryption request for the given KMS key. 
-If absent, the Compute Engine Service Agent service account is used.`,
 						},
 						"raw_key": {
 							Type:     schema.TypeString,
@@ -611,12 +582,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 +751,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 +1075,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
 }
@@ -1150,8 +1108,6 @@ func flattenComputeDiskSourceImageEncryptionKey(v interface{}, d *schema.Resourc
 		flattenComputeDiskSourceImageEncryptionKeySha256(original["sha256"], d, config)
 	transformed["kms_key_self_link"] =
 		flattenComputeDiskSourceImageEncryptionKeyKmsKeySelfLink(original["kmsKeyName"], d, config)
-	transformed["kms_key_service_account"] =
-		flattenComputeDiskSourceImageEncryptionKeyKmsKeyServiceAccount(original["kmsKeyServiceAccount"], d, config)
 	return []interface{}{transformed}
 }
 func flattenComputeDiskSourceImageEncryptionKeyRawKey(v interface{}, d *schema.ResourceData, config *Config) interface{} {
@@ -1166,10 +1122,6 @@ func flattenComputeDiskSourceImageEncryptionKeyKmsKeySelfLink(v interface{}, d *
 	return v
 }
 
-func flattenComputeDiskSourceImageEncryptionKeyKmsKeyServiceAccount(v interface{}, d *schema.ResourceData, config *Config) interface{} {
-	return v
-}
-
 func flattenComputeDiskSourceImageId(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -1189,8 +1141,6 @@ func flattenComputeDiskDiskEncryptionKey(v interface{}, d *schema.ResourceData,
 		flattenComputeDiskDiskEncryptionKeySha256(original["sha256"], d, config)
 	transformed["kms_key_self_link"] =
 		flattenComputeDiskDiskEncryptionKeyKmsKeySelfLink(original["kmsKeyName"], d, config)
-	transformed["kms_key_service_account"] =
-		flattenComputeDiskDiskEncryptionKeyKmsKeyServiceAccount(original["kmsKeyServiceAccount"], d, config)
 	return []interface{}{transformed}
 }
 func flattenComputeDiskDiskEncryptionKeyRawKey(v interface{}, d *schema.ResourceData, config *Config) interface{} {
@@ -1205,10 +1155,6 @@ func flattenComputeDiskDiskEncryptionKeyKmsKeySelfLink(v interface{}, d *schema.
 	return v
 }
 
-func flattenComputeDiskDiskEncryptionKeyKmsKeyServiceAccount(v interface{}, d *schema.ResourceData, config *Config) interface{} {
-	return v
-}
-
 func flattenComputeDiskSnapshot(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	if v == nil {
 		return v
@@ -1231,8 +1177,6 @@ func flattenComputeDiskSourceSnapshotEncryptionKey(v interface{}, d *schema.Reso
 		flattenComputeDiskSourceSnapshotEncryptionKeyKmsKeySelfLink(original["kmsKeyName"], d, config)
 	transformed["sha256"] =
 		flattenComputeDiskSourceSnapshotEncryptionKeySha256(original["sha256"], d, config)
-	transformed["kms_key_service_account"] =
-		flattenComputeDiskSourceSnapshotEncryptionKeyKmsKeyServiceAccount(original["kmsKeyServiceAccount"], d, config)
 	return []interface{}{transformed}
 }
 func flattenComputeDiskSourceSnapshotEncryptionKeyRawKey(v interface{}, d *schema.ResourceData, config *Config) interface{} {
@@ -1247,10 +1191,6 @@ func flattenComputeDiskSourceSnapshotEncryptionKeySha256(v interface{}, d *schem
 	return v
 }
 
-func flattenComputeDiskSourceSnapshotEncryptionKeyKmsKeyServiceAccount(v interface{}, d *schema.ResourceData, config *Config) interface{} {
-	return v
-}
-
 func flattenComputeDiskSourceSnapshotId(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -1294,10 +1234,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
 }
@@ -1356,13 +1292,6 @@ func expandComputeDiskSourceImageEncryptionKey(v interface{}, d TerraformResourc
 		transformed["kmsKeyName"] = transformedKmsKeySelfLink
 	}
 
-	transformedKmsKeyServiceAccount, err := expandComputeDiskSourceImageEncryptionKeyKmsKeyServiceAccount(original["kms_key_service_account"], d, config)
-	if err != nil {
-		return nil, err
-	} else if val := reflect.ValueOf(transformedKmsKeyServiceAccount); val.IsValid() && !isEmptyValue(val) {
-		transformed["kmsKeyServiceAccount"] = transformedKmsKeyServiceAccount
-	}
-
 	return transformed, nil
 }
 
@@ -1378,10 +1307,6 @@ func expandComputeDiskSourceImageEncryptionKeyKmsKeySelfLink(v interface{}, d Te
 	return v, nil
 }
 
-func expandComputeDiskSourceImageEncryptionKeyKmsKeyServiceAccount(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	return v, nil
-}
-
 func expandComputeDiskDiskEncryptionKey(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	l := v.([]interface{})
 	if len(l) == 0 || l[0] == nil {
@@ -1412,13 +1337,6 @@ func expandComputeDiskDiskEncryptionKey(v interface{}, d TerraformResourceData,
 		transformed["kmsKeyName"] = transformedKmsKeySelfLink
 	}
 
-	transformedKmsKeyServiceAccount, err := expandComputeDiskDiskEncryptionKeyKmsKeyServiceAccount(original["kms_key_service_account"], d, config)
-	if err != nil {
-		return nil, err
-	} else if val := reflect.ValueOf(transformedKmsKeyServiceAccount); val.IsValid() && !isEmptyValue(val) {
-		transformed["kmsKeyServiceAccount"] = transformedKmsKeyServiceAccount
-	}
-
 	return transformed, nil
 }
 
@@ -1434,10 +1352,6 @@ func expandComputeDiskDiskEncryptionKeyKmsKeySelfLink(v interface{}, d Terraform
 	return v, nil
 }
 
-func expandComputeDiskDiskEncryptionKeyKmsKeyServiceAccount(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	return v, nil
-}
-
 func expandComputeDiskSnapshot(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	f, err := parseGlobalFieldValue("snapshots", v.(string), "project", d, config, true)
 	if err != nil {
@@ -1476,13 +1390,6 @@ func expandComputeDiskSourceSnapshotEncryptionKey(v interface{}, d TerraformReso
 		transformed["sha256"] = transformedSha256
 	}
 
-	transformedKmsKeyServiceAccount, err := expandComputeDiskSourceSnapshotEncryptionKeyKmsKeyServiceAccount(original["kms_key_service_account"], d, config)
-	if err != nil {
-		return nil, err
-	} else if val := reflect.ValueOf(transformedKmsKeyServiceAccount); val.IsValid() && !isEmptyValue(val) {
-		transformed["kmsKeyServiceAccount"] = transformedKmsKeyServiceAccount
-	}
-
 	return transformed, nil
 }
 
@@ -1498,10 +1405,6 @@ func expandComputeDiskSourceSnapshotEncryptionKeySha256(v interface{}, d Terrafo
 	return v, nil
 }
 
-func expandComputeDiskSourceSnapshotEncryptionKeyKmsKeyServiceAccount(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
-	return v, nil
-}
-
 func resourceComputeDiskEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {
 	config := meta.(*Config)
 

google-beta/resource_compute_disk.go

@@ -54,7 +54,7 @@ resource "google_compute_disk" "default" {
   name  = "tf-test-test-disk%{random_suffix}"
   type  = "pd-ssd"
   zone  = "us-central1-a"
-  image = "debian-9-stretch-v20200805"
+  image = "debian-8-jessie-v20170523"
   labels = {
     environment = "dev"
   }

google-beta/resource_compute_disk_generated_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)
-}