Skip to content

Commit 50214a6

Browse files
julianKatzjulianKatz
committed
Remove variadic argument in test functions
1 parent 0ab0dad commit 50214a6

File tree

2 files changed

+27
-41
lines changed

2 files changed

+27
-41
lines changed

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ func TestCreateSnapshotArguments(t *testing.T) {
289289
for _, tc := range testCases {
290290
t.Logf("test case: %s", tc.name)
291291
// Setup new driver each time so no interference
292-
gceDriver := initGCEDriver(t, tc.seedDisks)
292+
gceDriver := initGCEDriver(t, tc.seedDisks, &GCEControllerServerArgs{})
293293

294294
// Start Test
295295
resp, err := gceDriver.cs.CreateSnapshot(context.Background(), tc.req)
@@ -336,7 +336,7 @@ func TestUnsupportedMultiZoneCreateSnapshot(t *testing.T) {
336336

337337
t.Logf("test case: %s", testCase.name)
338338

339-
gceDriver := initGCEDriver(t, nil)
339+
gceDriver := initGCEDriver(t, nil, &GCEControllerServerArgs{})
340340
gceDriver.cs.multiZoneVolumeHandleConfig = MultiZoneVolumeHandleConfig{
341341
Enable: true,
342342
}
@@ -371,7 +371,7 @@ func TestUnsupportedMultiZoneControllerExpandVolume(t *testing.T) {
371371

372372
t.Logf("test case: %s", testCase.name)
373373

374-
gceDriver := initGCEDriver(t, nil)
374+
gceDriver := initGCEDriver(t, nil, &GCEControllerServerArgs{})
375375
gceDriver.cs.multiZoneVolumeHandleConfig = MultiZoneVolumeHandleConfig{
376376
Enable: true,
377377
}
@@ -426,7 +426,7 @@ func TestDeleteSnapshot(t *testing.T) {
426426
for _, tc := range testCases {
427427
t.Logf("test case: %s", tc.name)
428428
// Setup new driver each time so no interference
429-
gceDriver := initGCEDriver(t, nil)
429+
gceDriver := initGCEDriver(t, nil, &GCEControllerServerArgs{})
430430

431431
_, err := gceDriver.cs.DeleteSnapshot(context.Background(), tc.req)
432432
if err != nil {
@@ -548,7 +548,7 @@ func TestListSnapshotsArguments(t *testing.T) {
548548
}
549549

550550
// Setup new driver each time so no interference
551-
gceDriver := initGCEDriver(t, disks)
551+
gceDriver := initGCEDriver(t, disks, &GCEControllerServerArgs{})
552552

553553
for i := 0; i < tc.numSnapshots; i++ {
554554
volumeID := fmt.Sprintf("%s%d", testVolumeID, i)
@@ -1821,7 +1821,7 @@ func TestMultiZoneVolumeCreation(t *testing.T) {
18211821
t.Fatalf("Failed to create fake cloud provider: %v", err)
18221822
}
18231823
// Setup new driver each time so no interference
1824-
gceDriver := initGCEDriverWithCloudProvider(t, fcp)
1824+
gceDriver := initGCEDriverWithCloudProvider(t, fcp, &GCEControllerServerArgs{})
18251825
gceDriver.cs.multiZoneVolumeHandleConfig.DiskTypes = []string{"hyperdisk-ml"}
18261826
gceDriver.cs.multiZoneVolumeHandleConfig.Enable = true
18271827
gceDriver.cs.fallbackRequisiteZones = tc.fallbackZones
@@ -2055,7 +2055,7 @@ func TestCreateVolumeMultiWriterOrAccessMode(t *testing.T) {
20552055
t.Fatalf("Failed to create fake cloud provider: %v", err)
20562056
}
20572057
// Setup new driver each time so no interference
2058-
gceDriver := initGCEDriverWithCloudProvider(t, fcp)
2058+
gceDriver := initGCEDriverWithCloudProvider(t, fcp, &GCEControllerServerArgs{})
20592059

20602060
// Start Test
20612061
resp, err := gceDriver.cs.CreateVolume(context.Background(), tc.req)
@@ -2252,7 +2252,7 @@ func TestMultiZoneVolumeCreationErrHandling(t *testing.T) {
22522252
t.Fatalf("Failed to create fake cloud provider: %v", err)
22532253
}
22542254
// Setup new driver each time so no interference
2255-
gceDriver := initGCEDriverWithCloudProvider(t, fcp)
2255+
gceDriver := initGCEDriverWithCloudProvider(t, fcp, &GCEControllerServerArgs{})
22562256
gceDriver.cs.multiZoneVolumeHandleConfig.DiskTypes = []string{"hyperdisk-ml"}
22572257
gceDriver.cs.multiZoneVolumeHandleConfig.Enable = true
22582258

@@ -2369,7 +2369,7 @@ func TestCreateVolumeWithVolumeAttributeClassParameters(t *testing.T) {
23692369
for _, tc := range testCases {
23702370
var d []*gce.CloudDisk
23712371
fcp, err := gce.CreateFakeCloudProvider(project, zone, d)
2372-
gceDriver := initGCEDriverWithCloudProvider(t, fcp)
2372+
gceDriver := initGCEDriverWithCloudProvider(t, fcp, &GCEControllerServerArgs{})
23732373

23742374
if err != nil {
23752375
t.Fatalf("Failed to create fake cloud provider: %v", err)
@@ -2478,7 +2478,7 @@ func TestVolumeModifyOperation(t *testing.T) {
24782478
t.Fatalf("Failed to create mock cloud provider: %v", err)
24792479
}
24802480

2481-
gceDriver := initGCEDriverWithCloudProvider(t, fcp)
2481+
gceDriver := initGCEDriverWithCloudProvider(t, fcp, &GCEControllerServerArgs{})
24822482
project, volKey, err := common.VolumeIDToKey(testVolumeID)
24832483
if err != nil {
24842484
t.Fatalf("Failed convert key: %v", err)
@@ -2640,7 +2640,7 @@ func TestVolumeModifyErrorHandling(t *testing.T) {
26402640
if err != nil {
26412641
t.Fatalf("Failed to create mock cloud provider")
26422642
}
2643-
gceDriver := initGCEDriverWithCloudProvider(t, fcp)
2643+
gceDriver := initGCEDriverWithCloudProvider(t, fcp, &GCEControllerServerArgs{})
26442644

26452645
for volKey, err := range tc.modifyVolumeErrors {
26462646
fcp.AddDiskForErr(volKey, err)
@@ -2726,7 +2726,7 @@ func TestListVolumePagination(t *testing.T) {
27262726
SelfLink: fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/project/zones/zone/disk/%s", name),
27272727
}))
27282728
}
2729-
gceDriver := initGCEDriver(t, d)
2729+
gceDriver := initGCEDriver(t, d, &GCEControllerServerArgs{})
27302730
tok := ""
27312731
for i, expectedEntry := range tc.expectedEntries {
27322732
lvr := &csi.ListVolumesRequest{
@@ -2813,7 +2813,7 @@ func TestListAttachedVolumePagination(t *testing.T) {
28132813
}
28142814
fakeCloudProvider.InsertInstance(&instance, zone, instanceName)
28152815
}
2816-
gceDriver := initGCEDriverWithCloudProvider(t, fakeCloudProvider)
2816+
gceDriver := initGCEDriverWithCloudProvider(t, fakeCloudProvider, &GCEControllerServerArgs{})
28172817
// Use attached disks (instances.list) API
28182818
gceDriver.cs.listVolumesConfig.UseInstancesAPIForPublishedNodes = true
28192819

@@ -2878,7 +2878,7 @@ func TestListVolumeArgs(t *testing.T) {
28782878
SelfLink: fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/project/zones/zone/disk/%s", name),
28792879
}))
28802880
}
2881-
gceDriver := initGCEDriver(t, d)
2881+
gceDriver := initGCEDriver(t, d, &GCEControllerServerArgs{})
28822882
lvr := &csi.ListVolumesRequest{
28832883
MaxEntries: tc.maxEntries,
28842884
}
@@ -3073,7 +3073,7 @@ func TestListVolumeResponse(t *testing.T) {
30733073
fakeCloudProvider.InsertInstance(&instance, instance.Zone, instance.Name)
30743074
}
30753075
// Setup new driver each time so no interference
3076-
gceDriver := initGCEDriverWithCloudProvider(t, fakeCloudProvider)
3076+
gceDriver := initGCEDriverWithCloudProvider(t, fakeCloudProvider, &GCEControllerServerArgs{})
30773077
gceDriver.cs.multiZoneVolumeHandleConfig = MultiZoneVolumeHandleConfig{
30783078
Enable: true,
30793079
}
@@ -3143,7 +3143,7 @@ func TestCreateVolumeWithVolumeSourceFromSnapshot(t *testing.T) {
31433143
for _, tc := range testCases {
31443144
t.Logf("test case: %s", tc.name)
31453145
// Setup new driver each time so no interference
3146-
gceDriver := initGCEDriver(t, nil)
3146+
gceDriver := initGCEDriver(t, nil, &GCEControllerServerArgs{})
31473147

31483148
snapshotParams, err := common.ExtractAndDefaultSnapshotParameters(nil, gceDriver.name, nil)
31493149
if err != nil {
@@ -3870,7 +3870,7 @@ func TestCreateVolumeWithVolumeSourceFromVolume(t *testing.T) {
38703870

38713871
for _, tc := range testCases {
38723872
t.Logf("test case: %s", tc.name)
3873-
gceDriver := initGCEDriver(t, nil)
3873+
gceDriver := initGCEDriver(t, nil, &GCEControllerServerArgs{})
38743874
gceDriver.cs.enableStoragePools = tc.enableStoragePools
38753875

38763876
req := &csi.CreateVolumeRequest{
@@ -3990,7 +3990,7 @@ func TestCreateVolumeRandomRequisiteTopology(t *testing.T) {
39903990
},
39913991
}
39923992

3993-
gceDriver := initGCEDriver(t, nil)
3993+
gceDriver := initGCEDriver(t, nil, &GCEControllerServerArgs{})
39943994

39953995
tZones := map[string]bool{}
39963996
// Start Test
@@ -4073,7 +4073,7 @@ func TestDeleteVolume(t *testing.T) {
40734073
for _, tc := range testCases {
40744074
t.Logf("test case: %s", tc.name)
40754075
// Setup new driver each time so no interference
4076-
gceDriver := initGCEDriver(t, tc.seedDisks)
4076+
gceDriver := initGCEDriver(t, tc.seedDisks, &GCEControllerServerArgs{})
40774077

40784078
_, err := gceDriver.cs.DeleteVolume(context.Background(), tc.req)
40794079
if err == nil && tc.expErr {
@@ -4125,7 +4125,7 @@ func TestMultiZoneDeleteVolume(t *testing.T) {
41254125
t.Fatalf("Failed to create fake cloud provider: %v", err)
41264126
}
41274127
// Setup new driver each time so no interference
4128-
gceDriver := initGCEDriverWithCloudProvider(t, fcp)
4128+
gceDriver := initGCEDriverWithCloudProvider(t, fcp, &GCEControllerServerArgs{})
41294129
gceDriver.cs.multiZoneVolumeHandleConfig.DiskTypes = []string{"hyperdisk-ml"}
41304130
gceDriver.cs.multiZoneVolumeHandleConfig.Enable = true
41314131
_, err = gceDriver.cs.DeleteVolume(context.Background(), tc.req)
@@ -5250,7 +5250,7 @@ func TestCreateVolumeDiskReady(t *testing.T) {
52505250
// Setup hook to create new disks with given status.
52515251
fcp.UpdateDiskStatus(tc.diskStatus)
52525252
// Setup new driver each time so no interference
5253-
gceDriver := initGCEDriverWithCloudProvider(t, fcp)
5253+
gceDriver := initGCEDriverWithCloudProvider(t, fcp, &GCEControllerServerArgs{})
52545254

52555255
// Start Test
52565256
resp, err := gceDriver.cs.CreateVolume(context.Background(), tc.req)
@@ -5771,7 +5771,7 @@ func TestCreateConfidentialVolume(t *testing.T) {
57715771
t.Fatalf("Failed to create fake cloud provider: %v", err)
57725772
}
57735773
// Setup new driver each time so no interference
5774-
gceDriver := initGCEDriverWithCloudProvider(t, fcp)
5774+
gceDriver := initGCEDriverWithCloudProvider(t, fcp, &GCEControllerServerArgs{})
57755775

57765776
if tc.req.VolumeContentSource.GetType() != nil {
57775777
snapshotParams, err := common.ExtractAndDefaultSnapshotParameters(nil, gceDriver.name, nil)

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

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import (
2121
gce "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/compute"
2222
)
2323

24-
func initGCEDriver(t *testing.T, cloudDisks []*gce.CloudDisk, args ...*GCEControllerServerArgs) *GCEDriver {
24+
func initGCEDriver(t *testing.T, cloudDisks []*gce.CloudDisk, args *GCEControllerServerArgs) *GCEDriver {
2525
fakeCloudProvider, err := gce.CreateFakeCloudProvider(project, zone, cloudDisks)
2626
if err != nil {
2727
t.Fatalf("Failed to create fake cloud provider: %v", err)
2828
}
29-
return initGCEDriverWithCloudProvider(t, fakeCloudProvider, args...)
29+
return initGCEDriverWithCloudProvider(t, fakeCloudProvider, args)
3030
}
3131

3232
func initBlockingGCEDriver(t *testing.T, cloudDisks []*gce.CloudDisk, readyToExecute chan chan gce.Signal) *GCEDriver {
@@ -38,7 +38,7 @@ func initBlockingGCEDriver(t *testing.T, cloudDisks []*gce.CloudDisk, readyToExe
3838
FakeCloudProvider: fakeCloudProvider,
3939
ReadyToExecute: readyToExecute,
4040
}
41-
return initGCEDriverWithCloudProvider(t, fakeBlockingBlockProvider)
41+
return initGCEDriverWithCloudProvider(t, fakeBlockingBlockProvider, &GCEControllerServerArgs{})
4242
}
4343

4444
func controllerServerForTest(cloudProvider gce.GCECompute, args *GCEControllerServerArgs) *GCEControllerServer {
@@ -57,25 +57,11 @@ func controllerServerForTest(cloudProvider gce.GCECompute, args *GCEControllerSe
5757
return NewControllerServer(gceDriver, cloudProvider, errorBackoffInitialDuration, errorBackoffMaxDuration, fallbackRequisiteZones, enableStoragePools, enableDataCache, multiZoneVolumeHandleConfig, listVolumesConfig, provisionableDisksConfig, true /* enableHdHA */, args)
5858
}
5959

60-
func initGCEDriverWithCloudProvider(t *testing.T, cloudProvider gce.GCECompute, args ...*GCEControllerServerArgs) *GCEDriver {
60+
func initGCEDriverWithCloudProvider(t *testing.T, cloudProvider gce.GCECompute, args *GCEControllerServerArgs) *GCEDriver {
6161
vendorVersion := "test-vendor"
6262
gceDriver := GetGCEDriver()
6363

64-
// Passing args as a variadic argument prevents updating many function
65-
// calls. We may want to update this in the future.
66-
var controllerArgs *GCEControllerServerArgs
67-
switch {
68-
case len(args) == 0:
69-
controllerArgs = &GCEControllerServerArgs{
70-
EnableDiskTopology: false,
71-
}
72-
case len(args) == 1:
73-
controllerArgs = args[0]
74-
default:
75-
t.Fatalf("Invalid number of arguments structs: %v", len(args))
76-
}
77-
78-
controllerServer := controllerServerForTest(cloudProvider, controllerArgs)
64+
controllerServer := controllerServerForTest(cloudProvider, args)
7965
err := gceDriver.SetupGCEDriver(driver, vendorVersion, nil, nil, nil, controllerServer, nil)
8066
if err != nil {
8167
t.Fatalf("Failed to setup GCE Driver: %v", err)

0 commit comments

Comments
 (0)