Fix some more broken references

Author: julianKatz

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

@@ -23,6 +23,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/constants"
+	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/parameters"
 )
 
 func TestValidateDiskParameters(t *testing.T) {
@@ -87,7 +88,7 @@ func TestValidateDiskParameters(t *testing.T) {
 			Kind:                   "compute#disk",
 		})
 
-		storageClassParams := common.DiskParameters{
+		storageClassParams := parameters.DiskParameters{
 			DiskType:             "pd-standard",
 			ReplicationType:      "none",
 			DiskEncryptionKMSKey: tc.storageClassKMSKey,
@@ -242,7 +243,7 @@ func TestValidateExistingDisk(t *testing.T) {
 			d.Zone = "zone"
 
 			// Bootstrap params. We don't care about these as they are already tested in previous unit test.
-			params := common.DiskParameters{
+			params := parameters.DiskParameters{
 				DiskType: tc.diskType,
 			}
 

pkg/gce-pd-csi-driver/server_test.go

@@ -25,9 +25,9 @@ import (
 	"google.golang.org/grpc"
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
-	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 	gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/metrics"
+	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/parameters"
 )
 
 func createSocketFile() (string, func(), error) {
@@ -104,7 +104,7 @@ func TestServerCreateVolumeMetric(t *testing.T) {
 		CapacityRange:      stdCapRange,
 		VolumeCapabilities: stdVolCaps,
 		Parameters: map[string]string{
-			common.ParameterKeyType: "pd-balanced",
+			parameters.ParameterKeyType: "pd-balanced",
 		},
 	}
 	resp, err := controllerClient.CreateVolume(context.Background(), req)

pkg/gce-pd-csi-driver/utils_test.go

@@ -25,7 +25,6 @@ import (
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/google/go-cmp/cmp"
-	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/constants"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/parameters"
 )
@@ -303,7 +302,7 @@ func TestValidateStoragePools(t *testing.T) {
 	testCases := []struct {
 		name       string
 		req        *csi.CreateVolumeRequest
-		params     common.DiskParameters
+		params     parameters.DiskParameters
 		project    string
 		expErr     error
 		enableHdHA bool
@@ -313,15 +312,15 @@ func TestValidateStoragePools(t *testing.T) {
 			req: &csi.CreateVolumeRequest{
 				Name: "test-name",
 			},
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType: "hyperdisk-balanced",
 			},
 			expErr: nil,
 		},
 		{
 			name: "success with nil CreateVolumeReq",
 			req:  nil,
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType: "hyperdisk-balanced",
 			},
 			expErr: nil,
@@ -331,7 +330,7 @@ func TestValidateStoragePools(t *testing.T) {
 			req: &csi.CreateVolumeRequest{
 				Name: "test-name",
 			},
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType: "hyperdisk-balanced",
 				StoragePools: []parameters.StoragePool{
 					{
@@ -357,7 +356,7 @@ func TestValidateStoragePools(t *testing.T) {
 			req: &csi.CreateVolumeRequest{
 				Name: "test-name",
 			},
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType: "pd-balanced",
 				StoragePools: []parameters.StoragePool{
 					{
@@ -382,7 +381,7 @@ func TestValidateStoragePools(t *testing.T) {
 			req: &csi.CreateVolumeRequest{
 				Name: "test-name",
 			},
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType:        "hyperdisk-balanced",
 				ReplicationType: "regional-pd",
 				StoragePools: []parameters.StoragePool{
@@ -408,7 +407,7 @@ func TestValidateStoragePools(t *testing.T) {
 			req: &csi.CreateVolumeRequest{
 				Name: "test-name",
 			},
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType: "hyperdisk-balanced-high-availability",
 				StoragePools: []parameters.StoragePool{
 					{
@@ -434,7 +433,7 @@ func TestValidateStoragePools(t *testing.T) {
 			req: &csi.CreateVolumeRequest{
 				Name: "test-name",
 			},
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType: "hyperdisk-balanced-high-availability",
 				StoragePools: []parameters.StoragePool{
 					{
@@ -466,7 +465,7 @@ func TestValidateStoragePools(t *testing.T) {
 					},
 				},
 			},
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType: "hyperdisk-balanced",
 				StoragePools: []parameters.StoragePool{
 					{
@@ -506,7 +505,7 @@ func TestValidateStoragePools(t *testing.T) {
 					},
 				},
 			},
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType: "hyperdisk-balanced",
 				StoragePools: []parameters.StoragePool{
 					{
@@ -549,7 +548,7 @@ func TestValidateStoragePools(t *testing.T) {
 					},
 				},
 			},
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType: "hyperdisk-balanced",
 				StoragePools: []parameters.StoragePool{
 					{
@@ -592,7 +591,7 @@ func TestValidateStoragePools(t *testing.T) {
 					},
 				},
 			},
-			params: common.DiskParameters{
+			params: parameters.DiskParameters{
 				DiskType: "hyperdisk-balanced",
 				StoragePools: []parameters.StoragePool{
 					{