Skip to content

Commit 6343685

Browse files
julianKatzjulianKatz
committed
Fix some more broken references
1 parent 0b5bff8 commit 6343685

File tree

6 files changed

+46
-44
lines changed

6 files changed

+46
-44
lines changed

‎cmd/gce-pd-csi-driver/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929

3030
"k8s.io/klog/v2"
3131
"k8s.io/utils/strings/slices"
32-
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
3332
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/constants"
33+
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/convert"
3434
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/deviceutils"
3535
gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
3636
metadataservice "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/metadata"
@@ -181,15 +181,15 @@ func handle() {
181181
if len(*extraVolumeLabelsStr) > 0 && !*runControllerService {
182182
klog.Fatalf("Extra volume labels provided but not running controller")
183183
}
184-
extraVolumeLabels, err := common.ConvertLabelsStringToMap(*extraVolumeLabelsStr)
184+
extraVolumeLabels, err := convert.ConvertLabelsStringToMap(*extraVolumeLabelsStr)
185185
if err != nil {
186186
klog.Fatalf("Bad extra volume labels: %v", err.Error())
187187
}
188188

189189
if len(*extraTagsStr) > 0 && !*runControllerService {
190190
klog.Fatalf("Extra tags provided but not running controller")
191191
}
192-
extraTags, err := common.ConvertTagsStringToMap(*extraTagsStr)
192+
extraTags, err := convert.ConvertTagsStringToMap(*extraTagsStr)
193193
if err != nil {
194194
klog.Fatalf("Bad extra tags: %v", err.Error())
195195
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"google.golang.org/grpc/codes"
2424
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
2525
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/constants"
26+
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/parameters"
2627
)
2728

2829
func TestValidateDiskParameters(t *testing.T) {
@@ -87,7 +88,7 @@ func TestValidateDiskParameters(t *testing.T) {
8788
Kind: "compute#disk",
8889
})
8990

90-
storageClassParams := common.DiskParameters{
91+
storageClassParams := parameters.DiskParameters{
9192
DiskType: "pd-standard",
9293
ReplicationType: "none",
9394
DiskEncryptionKMSKey: tc.storageClassKMSKey,
@@ -242,7 +243,7 @@ func TestValidateExistingDisk(t *testing.T) {
242243
d.Zone = "zone"
243244

244245
// Bootstrap params. We don't care about these as they are already tested in previous unit test.
245-
params := common.DiskParameters{
246+
params := parameters.DiskParameters{
246247
DiskType: tc.diskType,
247248
}
248249

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"google.golang.org/grpc"
2626

2727
csi "github.com/container-storage-interface/spec/lib/go/csi"
28-
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
2928
gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
3029
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/metrics"
30+
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/parameters"
3131
)
3232

3333
func createSocketFile() (string, func(), error) {
@@ -104,7 +104,7 @@ func TestServerCreateVolumeMetric(t *testing.T) {
104104
CapacityRange: stdCapRange,
105105
VolumeCapabilities: stdVolCaps,
106106
Parameters: map[string]string{
107-
common.ParameterKeyType: "pd-balanced",
107+
parameters.ParameterKeyType: "pd-balanced",
108108
},
109109
}
110110
resp, err := controllerClient.CreateVolume(context.Background(), req)

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
csi "github.com/container-storage-interface/spec/lib/go/csi"
2727
"github.com/google/go-cmp/cmp"
28-
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
2928
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/constants"
3029
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/parameters"
3130
)
@@ -303,7 +302,7 @@ func TestValidateStoragePools(t *testing.T) {
303302
testCases := []struct {
304303
name string
305304
req *csi.CreateVolumeRequest
306-
params common.DiskParameters
305+
params parameters.DiskParameters
307306
project string
308307
expErr error
309308
enableHdHA bool
@@ -313,15 +312,15 @@ func TestValidateStoragePools(t *testing.T) {
313312
req: &csi.CreateVolumeRequest{
314313
Name: "test-name",
315314
},
316-
params: common.DiskParameters{
315+
params: parameters.DiskParameters{
317316
DiskType: "hyperdisk-balanced",
318317
},
319318
expErr: nil,
320319
},
321320
{
322321
name: "success with nil CreateVolumeReq",
323322
req: nil,
324-
params: common.DiskParameters{
323+
params: parameters.DiskParameters{
325324
DiskType: "hyperdisk-balanced",
326325
},
327326
expErr: nil,
@@ -331,7 +330,7 @@ func TestValidateStoragePools(t *testing.T) {
331330
req: &csi.CreateVolumeRequest{
332331
Name: "test-name",
333332
},
334-
params: common.DiskParameters{
333+
params: parameters.DiskParameters{
335334
DiskType: "hyperdisk-balanced",
336335
StoragePools: []parameters.StoragePool{
337336
{
@@ -357,7 +356,7 @@ func TestValidateStoragePools(t *testing.T) {
357356
req: &csi.CreateVolumeRequest{
358357
Name: "test-name",
359358
},
360-
params: common.DiskParameters{
359+
params: parameters.DiskParameters{
361360
DiskType: "pd-balanced",
362361
StoragePools: []parameters.StoragePool{
363362
{
@@ -382,7 +381,7 @@ func TestValidateStoragePools(t *testing.T) {
382381
req: &csi.CreateVolumeRequest{
383382
Name: "test-name",
384383
},
385-
params: common.DiskParameters{
384+
params: parameters.DiskParameters{
386385
DiskType: "hyperdisk-balanced",
387386
ReplicationType: "regional-pd",
388387
StoragePools: []parameters.StoragePool{
@@ -408,7 +407,7 @@ func TestValidateStoragePools(t *testing.T) {
408407
req: &csi.CreateVolumeRequest{
409408
Name: "test-name",
410409
},
411-
params: common.DiskParameters{
410+
params: parameters.DiskParameters{
412411
DiskType: "hyperdisk-balanced-high-availability",
413412
StoragePools: []parameters.StoragePool{
414413
{
@@ -434,7 +433,7 @@ func TestValidateStoragePools(t *testing.T) {
434433
req: &csi.CreateVolumeRequest{
435434
Name: "test-name",
436435
},
437-
params: common.DiskParameters{
436+
params: parameters.DiskParameters{
438437
DiskType: "hyperdisk-balanced-high-availability",
439438
StoragePools: []parameters.StoragePool{
440439
{
@@ -466,7 +465,7 @@ func TestValidateStoragePools(t *testing.T) {
466465
},
467466
},
468467
},
469-
params: common.DiskParameters{
468+
params: parameters.DiskParameters{
470469
DiskType: "hyperdisk-balanced",
471470
StoragePools: []parameters.StoragePool{
472471
{
@@ -506,7 +505,7 @@ func TestValidateStoragePools(t *testing.T) {
506505
},
507506
},
508507
},
509-
params: common.DiskParameters{
508+
params: parameters.DiskParameters{
510509
DiskType: "hyperdisk-balanced",
511510
StoragePools: []parameters.StoragePool{
512511
{
@@ -549,7 +548,7 @@ func TestValidateStoragePools(t *testing.T) {
549548
},
550549
},
551550
},
552-
params: common.DiskParameters{
551+
params: parameters.DiskParameters{
553552
DiskType: "hyperdisk-balanced",
554553
StoragePools: []parameters.StoragePool{
555554
{
@@ -592,7 +591,7 @@ func TestValidateStoragePools(t *testing.T) {
592591
},
593592
},
594593
},
595-
params: common.DiskParameters{
594+
params: parameters.DiskParameters{
596595
DiskType: "hyperdisk-balanced",
597596
StoragePools: []parameters.StoragePool{
598597
{

‎test/e2e/tests/multi_zone_e2e_test.go‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
3434
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/constants"
3535
gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
36+
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/parameters"
3637
testutils "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/e2e/utils"
3738
remote "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/remote"
3839
)
@@ -234,8 +235,8 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
234235

235236
// Create multi-zone Disk
236237
resp, err := controllerClient.CreateVolumeWithCaps(volName, map[string]string{
237-
common.ParameterKeyEnableMultiZoneProvisioning: "true",
238-
common.ParameterKeyType: "hyperdisk-ml",
238+
parameters.ParameterKeyEnableMultiZoneProvisioning: "true",
239+
parameters.ParameterKeyType: "hyperdisk-ml",
239240
}, defaultHdmlSizeGb,
240241
&csi.TopologyRequirement{
241242
Requisite: []*csi.Topology{
@@ -356,8 +357,8 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
356357
// Create multi-zone Disk
357358
volName := testNamePrefix + string(uuid.NewUUID())
358359
_, err = controllerClient.CreateVolumeWithCaps(volName, map[string]string{
359-
common.ParameterKeyEnableMultiZoneProvisioning: "true",
360-
common.ParameterKeyType: "hyperdisk-ml",
360+
parameters.ParameterKeyEnableMultiZoneProvisioning: "true",
361+
parameters.ParameterKeyType: "hyperdisk-ml",
361362
}, defaultHdmlSizeGb,
362363
&csi.TopologyRequirement{
363364
Requisite: []*csi.Topology{
@@ -504,8 +505,8 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
504505
// Create multi-zone Disk
505506
volName := testNamePrefix + string(uuid.NewUUID())
506507
_, err = controllerClient.CreateVolumeWithCaps(volName, map[string]string{
507-
common.ParameterKeyEnableMultiZoneProvisioning: "true",
508-
common.ParameterKeyType: "hyperdisk-ml",
508+
parameters.ParameterKeyEnableMultiZoneProvisioning: "true",
509+
parameters.ParameterKeyType: "hyperdisk-ml",
509510
}, defaultHdmlSizeGb,
510511
&csi.TopologyRequirement{},
511512
[]*csi.VolumeCapability{
@@ -648,8 +649,8 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
648649
volName := testNamePrefix + string(uuid.NewUUID())
649650

650651
_, err = controllerClient.CreateVolumeWithCaps(volName, map[string]string{
651-
common.ParameterKeyEnableMultiZoneProvisioning: "true",
652-
common.ParameterKeyType: "hyperdisk-ml",
652+
parameters.ParameterKeyEnableMultiZoneProvisioning: "true",
653+
parameters.ParameterKeyType: "hyperdisk-ml",
653654
}, defaultHdmlSizeGb,
654655
&csi.TopologyRequirement{
655656
Requisite: []*csi.Topology{
@@ -751,8 +752,8 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
751752
// Create Disk
752753
volName := testNamePrefix + string(uuid.NewUUID())
753754
_, err := controllerClient.CreateVolumeWithCaps(volName, map[string]string{
754-
common.ParameterKeyEnableMultiZoneProvisioning: "true",
755-
common.ParameterKeyType: "hyperdisk-ml",
755+
parameters.ParameterKeyEnableMultiZoneProvisioning: "true",
756+
parameters.ParameterKeyType: "hyperdisk-ml",
756757
}, defaultHdmlSizeGb,
757758
&csi.TopologyRequirement{
758759
Requisite: []*csi.Topology{
@@ -867,8 +868,8 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
867868
// Create Disk
868869
volName := testNamePrefix + string(uuid.NewUUID())
869870
_, err := controllerClient.CreateVolumeWithCaps(volName, map[string]string{
870-
common.ParameterKeyEnableMultiZoneProvisioning: "true",
871-
common.ParameterKeyType: "hyperdisk-ml",
871+
parameters.ParameterKeyEnableMultiZoneProvisioning: "true",
872+
parameters.ParameterKeyType: "hyperdisk-ml",
872873
}, defaultHdmlSizeGb,
873874
&csi.TopologyRequirement{
874875
Requisite: []*csi.Topology{
@@ -977,7 +978,7 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
977978
// Create Disk
978979
volName := testNamePrefix + string(uuid.NewUUID())
979980
_, err := controllerClient.CreateVolumeWithCaps(volName, map[string]string{
980-
common.ParameterKeyType: "hyperdisk-ml",
981+
parameters.ParameterKeyType: "hyperdisk-ml",
981982
}, defaultHdmlSizeGb,
982983
&csi.TopologyRequirement{
983984
Requisite: []*csi.Topology{
@@ -1067,7 +1068,7 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
10671068
// Create Disk
10681069
volName := testNamePrefix + string(uuid.NewUUID())
10691070
volume, err := controllerClient.CreateVolume(volName, map[string]string{
1070-
common.ParameterKeyReplicationType: "regional-pd",
1071+
parameters.ParameterKeyReplicationType: "regional-pd",
10711072
}, defaultRepdSizeGb, &csi.TopologyRequirement{
10721073
Requisite: []*csi.Topology{
10731074
{
@@ -1150,8 +1151,8 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
11501151
// Create Disk
11511152
volName := testNamePrefix + string(uuid.NewUUID())
11521153
volume, err := controllerClient.CreateVolume(volName, map[string]string{
1153-
common.ParameterKeyReplicationType: "regional-pd",
1154-
common.ParameterAvailabilityClass: common.ParameterRegionalHardFailoverClass,
1154+
parameters.ParameterKeyReplicationType: "regional-pd",
1155+
parameters.ParameterAvailabilityClass: parameters.ParameterRegionalHardFailoverClass,
11551156
}, defaultRepdSizeGb, &csi.TopologyRequirement{
11561157
Requisite: []*csi.Topology{
11571158
{
@@ -1268,9 +1269,9 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
12681269
volName := testNamePrefix + string(uuid.NewUUID())
12691270
wantIOPs, wantThroughput := int64(7000), int64(250)
12701271
volume, err := controllerClient.CreateVolume(volName, map[string]string{
1271-
common.ParameterKeyType: common.DiskTypeHdHA,
1272-
common.ParameterKeyProvisionedIOPSOnCreate: strconv.FormatInt(wantIOPs, 10),
1273-
common.ParameterKeyProvisionedThroughputOnCreate: strconv.FormatInt(wantThroughput, 10) + "Mi",
1272+
parameters.ParameterKeyType: parameters.DiskTypeHdHA,
1273+
parameters.ParameterKeyProvisionedIOPSOnCreate: strconv.FormatInt(wantIOPs, 10),
1274+
parameters.ParameterKeyProvisionedThroughputOnCreate: strconv.FormatInt(wantThroughput, 10) + "Mi",
12741275
}, defaultRepdSizeGb, &csi.TopologyRequirement{
12751276
Requisite: []*csi.Topology{
12761277
{
@@ -1351,8 +1352,8 @@ var _ = Describe("GCE PD CSI Driver Multi-Zone", func() {
13511352
// Create Disk
13521353
volName := testNamePrefix + string(uuid.NewUUID())
13531354
volume, err := controllerClient.CreateVolume(volName, map[string]string{
1354-
common.ParameterKeyType: common.DiskTypeHdHA,
1355-
common.ParameterAvailabilityClass: common.ParameterRegionalHardFailoverClass,
1355+
parameters.ParameterKeyType: parameters.DiskTypeHdHA,
1356+
parameters.ParameterAvailabilityClass: parameters.ParameterRegionalHardFailoverClass,
13561357
}, defaultRepdSizeGb, &csi.TopologyRequirement{
13571358
Requisite: []*csi.Topology{
13581359
{

‎test/sanity/sanity_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
driver "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-pd-csi-driver"
3636
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/linkcache"
3737
mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
38+
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/parameters"
3839
)
3940

4041
func TestSanity(t *testing.T) {
@@ -128,9 +129,9 @@ func TestSanity(t *testing.T) {
128129
IDGen: newPDIDGenerator(project, zone),
129130
TestVolumeSize: common.GbToBytes(200),
130131
TestVolumeParameters: map[string]string{
131-
common.ParameterKeyType: "hyperdisk-balanced",
132-
common.ParameterKeyProvisionedIOPSOnCreate: "3000",
133-
common.ParameterKeyProvisionedThroughputOnCreate: "150Mi",
132+
parameters.ParameterKeyType: "hyperdisk-balanced",
133+
parameters.ParameterKeyProvisionedIOPSOnCreate: "3000",
134+
parameters.ParameterKeyProvisionedThroughputOnCreate: "150Mi",
134135
},
135136
TestVolumeMutableParameters: map[string]string{"iops": "3013", "throughput": "151"},
136137
}

0 commit comments

Comments
 (0)