Skip to content

Commit 9e7eb61

Browse files
committed
go fmt fixes
1 parent abeb772 commit 9e7eb61

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require (
77
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534
88
github.com/container-storage-interface/spec v1.2.0
99
github.com/golang/protobuf v1.3.4
10-
github.com/google/btree v1.0.0 // indirect
1110
github.com/google/uuid v1.1.1
1211
github.com/hashicorp/go-multierror v1.0.0 // indirect
1312
github.com/kubernetes-csi/csi-proxy/client v0.0.0-20200330215040-9eff16441b2a

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@ func (cloud *CloudProvider) insertRegionalDisk(
372372
replicaZones []string,
373373
snapshotID string,
374374
description string,
375-
multiWriter bool) error {
376-
var (
375+
multiWriter bool) error {
376+
var (
377377
err error
378378
opName string
379379
gceAPIVersion = GCEAPIVersionV1
@@ -382,7 +382,7 @@ func (cloud *CloudProvider) insertRegionalDisk(
382382
if multiWriter {
383383
gceAPIVersion = GCEAPIVersionAlpha
384384
}
385-
385+
386386
diskToCreate := &computev1.Disk{
387387
Name: volKey.Name,
388388
SizeGb: common.BytesToGb(capBytes),
@@ -465,8 +465,8 @@ func (cloud *CloudProvider) insertZonalDisk(
465465
capacityRange *csi.CapacityRange,
466466
snapshotID string,
467467
description string,
468-
multiWriter bool) error {
469-
var (
468+
multiWriter bool) error {
469+
var (
470470
err error
471471
opName string
472472
gceAPIVersion = GCEAPIVersionV1

test/e2e/tests/single_zone_e2e_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
676676
err := testLifecycleWithVerify(volID, volName, instance, client, false /* readOnly */, false /* fs */, verifyVolumeStats, nil)
677677
Expect(err).To(BeNil(), "Failed to go through volume lifecycle")
678678
})
679-
679+
680680
// Pending while multi-writer feature is in Alpha
681681
PIt("Should create and delete multi-writer disk", func() {
682682
Expect(testContexts).ToNot(BeEmpty())
@@ -716,13 +716,13 @@ var _ = Describe("GCE PD CSI Driver", func() {
716716
defer func() {
717717
// Delete Disk
718718
err := client.DeleteVolume(volID)
719-
Expect(err).To(BeNil(), "DeleteVolume failed")
719+
Expect(err).To(BeNil(), "DeleteVolume failed")
720720

721721
// Validate Disk Deleted
722722
_, err = computeService.Disks.Get(p, z, volName).Do()
723723
Expect(gce.IsGCEError(err, "notFound")).To(BeTrue(), "Expected disk to not be found")
724-
}()
725-
724+
}()
725+
726726
// Attach Disk
727727
testFileContents := "test"
728728
writeFunc := func(a verifyArgs) error {
@@ -745,8 +745,8 @@ var _ = Describe("GCE PD CSI Driver", func() {
745745
err := testLifecycleWithVerify(volID, volName, instance, client, false /* readOnly */, true /* block */, writeFunc, verifyReadFunc)
746746
Expect(err).To(BeNil(), "Failed to go through volume lifecycle")
747747
})
748-
749-
It("Should successfully create disk with PVC/PV tags", func() {
748+
749+
It("Should successfully create disk with PVC/PV tags", func() {
750750
Expect(testContexts).ToNot(BeEmpty())
751751
testContext := getRandomTestContext()
752752

@@ -775,12 +775,12 @@ var _ = Describe("GCE PD CSI Driver", func() {
775775
defer func() {
776776
// Delete Disk
777777
controllerClient.DeleteVolume(volID)
778-
Expect(err).To(BeNil(), "DeleteVolume failed")
778+
Expect(err).To(BeNil(), "DeleteVolume failed")
779779

780780
// Validate Disk Deleted
781781
_, err = computeService.Disks.Get(p, z, volName).Do()
782782
Expect(gce.IsGCEError(err, "notFound")).To(BeTrue(), "Expected disk to not be found")
783-
}()
783+
}()
784784
})
785785
})
786786

0 commit comments

Comments
 (0)