Fix force new on region disk for interface ENUM (#4799) (#3272)

* Fix force new on region disk for interface ENUM

* default if empty

* make same change to google_compute_disk

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

Author: modular-magician

.changelog/4799.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+compute: fixed issue where `google_compute_region_disk` and `google_compute_disk` would force recreation due to the addition of `interface` property
+```

google-beta/resource_compute_disk.go

@@ -1173,6 +1173,10 @@ func flattenComputeDiskPhysicalBlockSizeBytes(v interface{}, d *schema.ResourceD
 }
 
 func flattenComputeDiskInterface(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	if v == nil || isEmptyValue(reflect.ValueOf(v)) {
+		return "SCSI"
+	}
+
 	return v
 }
 

google-beta/resource_compute_region_disk.go

@@ -825,6 +825,10 @@ func flattenComputeRegionDiskType(v interface{}, d *schema.ResourceData, config
 }
 
 func flattenComputeRegionDiskInterface(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	if v == nil || isEmptyValue(reflect.ValueOf(v)) {
+		return "SCSI"
+	}
+
 	return v
 }
 

google-beta/resource_dataproc_cluster_test.go

@@ -13,9 +13,8 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
-	"google.golang.org/api/googleapi"
-
 	dataproc "google.golang.org/api/dataproc/v1beta2"
+	"google.golang.org/api/googleapi"
 )
 
 func TestDataprocExtractInitTimeout(t *testing.T) {