shared-pd addressing comments and fixing e2e build error

Author: nikhilkathare

pkg/gce-cloud-provider/compute/cloud-disk.go

@@ -17,8 +17,8 @@ package gcecloudprovider
 import (
 	"strings"
 
-	computev1 "google.golang.org/api/compute/v1"
 	computealpha "google.golang.org/api/compute/v0.alpha"
+	computev1 "google.golang.org/api/compute/v1"
 )
 
 type CloudDisk struct {
@@ -133,6 +133,10 @@ func (d *CloudDisk) GetStatus() string {
 		return d.ZonalDisk.Status
 	case Regional:
 		return d.RegionalDisk.Status
+	case ZonalAlpha:
+		return d.ZonalAlphaDisk.Status
+	case RegionalAlpha:
+		return d.RegionalAlphaDisk.Status
 	default:
 		return "Unknown"
 	}
@@ -236,18 +240,26 @@ func (d *CloudDisk) GetSnapshotId() string {
 
 func (d *CloudDisk) GetKMSKeyName() string {
 	var dek *computev1.CustomerEncryptionKey
+	var dekAlpha *computealpha.CustomerEncryptionKey
 	switch d.Type() {
 	case Zonal:
 		dek = d.ZonalDisk.DiskEncryptionKey
 	case Regional:
 		dek = d.RegionalDisk.DiskEncryptionKey
+	case ZonalAlpha:
+		dekAlpha = d.ZonalAlphaDisk.DiskEncryptionKey
+	case RegionalAlpha:
+		dekAlpha = d.RegionalAlphaDisk.DiskEncryptionKey
 	default:
 		return ""
 	}
-	if dek == nil {
-		return ""
+
+	if dek != nil {
+		return dek.KmsKeyName
+	} else if dekAlpha != nil {
+		return dekAlpha.KmsKeyName
 	}
-	return dek.KmsKeyName
+	return ""
 }
 
 func (d *CloudDisk) GetMultiWriter() bool {

pkg/gce-cloud-provider/compute/gce-compute.go

@@ -291,11 +291,11 @@ func ValidateDiskParameters(disk *CloudDisk, params common.DiskParameters) error
 		return fmt.Errorf("actual pd type %s did not match the expected param %s", disk.GetPDType(), params.DiskType)
 	}
 
-	if params.ReplicationType == "none" && disk.Type() != Zonal {
+	if params.ReplicationType == "none" && disk.Type() != Zonal && disk.Type() != ZonalAlpha {
 		return fmt.Errorf("actual disk replication type %v did not match expected param %s", disk.Type(), params.ReplicationType)
 	}
 
-	if params.ReplicationType == "regional-pd" && disk.Type() != Regional {
+	if params.ReplicationType == "regional-pd" && disk.Type() != Regional && disk.Type() != RegionalAlpha {
 		return fmt.Errorf("actual disk replication type %v did not match expected param %s", disk.Type(), "regional-pd")
 	}
 
@@ -393,7 +393,7 @@ func (cloud *CloudProvider) insertRegionalDisk(ctx context.Context, volKey *meta
 	}
 	if err != nil {
 		if IsGCEError(err, "alreadyExists") {
-			disk, err := cloud.GetDisk(ctx, volKey, GCEAPIVersionV1)
+			disk, err := cloud.GetDisk(ctx, volKey, gceAPIVersion)
 			if err != nil {
 				return err
 			}
@@ -413,7 +413,7 @@ func (cloud *CloudProvider) insertRegionalDisk(ctx context.Context, volKey *meta
 	err = cloud.waitForRegionalOp(ctx, opName, volKey.Region)
 	if err != nil {
 		if IsGCEError(err, "alreadyExists") {
-			disk, err := cloud.GetDisk(ctx, volKey, GCEAPIVersionV1)
+			disk, err := cloud.GetDisk(ctx, volKey, gceAPIVersion)
 			if err != nil {
 				return err
 			}
@@ -723,16 +723,6 @@ func opIsDone(op *computev1.Operation) (bool, error) {
 	return true, nil
 }
 
-func alphaOpIsDone(op *computealpha.Operation) (bool, error) {
-	if op == nil || op.Status != operationStatusDone {
-		return false, nil
-	}
-	if op.Error != nil && len(op.Error.Errors) > 0 && op.Error.Errors[0] != nil {
-		return true, fmt.Errorf("operation %v failed (%v): %v", op.Name, op.Error.Errors[0].Code, op.Error.Errors[0].Message)
-	}
-	return true, nil
-}
-
 func (cloud *CloudProvider) GetInstanceOrError(ctx context.Context, instanceZone, instanceName string) (*computev1.Instance, error) {
 	klog.V(5).Infof("Getting instance %v from zone %v", instanceName, instanceZone)
 	svc := cloud.service

test/e2e/tests/single_zone_e2e_test.go

@@ -37,7 +37,6 @@ import (
 	"google.golang.org/api/iterator"
 	kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
 	fieldmask "google.golang.org/genproto/protobuf/field_mask"
-	testutils "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/e2e/utils"
 )
 
 const (