Skip to content

Commit a7c6dec

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #81 from humblec/clean
Correct error variables and fix other golint errors.
2 parents 7d3b3ec + 546cafa commit a7c6dec

File tree

5 files changed

+48
-56
lines changed

5 files changed

+48
-56
lines changed

‎pkg/connection/connection_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func TestGetPluginInfo(t *testing.T) {
104104
in := &csi.GetPluginInfoRequest{}
105105

106106
out := test.output
107-
var injectedErr error = nil
107+
var injectedErr error
108108
if test.injectError {
109109
injectedErr = fmt.Errorf("mock error")
110110
}
@@ -214,7 +214,7 @@ func TestSupportsControllerCreateSnapshot(t *testing.T) {
214214
in := &csi.ControllerGetCapabilitiesRequest{}
215215

216216
out := test.output
217-
var injectedErr error = nil
217+
var injectedErr error
218218
if test.injectError {
219219
injectedErr = fmt.Errorf("mock error")
220220
}
@@ -354,7 +354,7 @@ func TestSupportsControllerListSnapshots(t *testing.T) {
354354
in := &csi.ControllerGetCapabilitiesRequest{}
355355

356356
out := test.output
357-
var injectedErr error = nil
357+
var injectedErr error
358358
if test.injectError {
359359
injectedErr = fmt.Errorf("mock error")
360360
}
@@ -524,7 +524,7 @@ func TestCreateSnapshot(t *testing.T) {
524524
for _, test := range tests {
525525
in := test.input
526526
out := test.output
527-
var injectedErr error = nil
527+
var injectedErr error
528528
if test.injectError != codes.OK {
529529
injectedErr = status.Error(test.injectError, fmt.Sprintf("Injecting error %d", test.injectError))
530530
}
@@ -632,7 +632,7 @@ func TestDeleteSnapshot(t *testing.T) {
632632
for _, test := range tests {
633633
in := test.input
634634
out := test.output
635-
var injectedErr error = nil
635+
var injectedErr error
636636
if test.injectError != codes.OK {
637637
injectedErr = status.Error(test.injectError, fmt.Sprintf("Injecting error %d", test.injectError))
638638
}
@@ -730,7 +730,7 @@ func TestGetSnapshotStatus(t *testing.T) {
730730
for _, test := range tests {
731731
in := test.input
732732
out := test.output
733-
var injectedErr error = nil
733+
var injectedErr error
734734
if test.injectError != codes.OK {
735735
injectedErr = status.Error(test.injectError, fmt.Sprintf("Injecting error %d", test.injectError))
736736
}

‎pkg/controller/framework_test.go

+28-35
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ type testCall func(ctrl *csiSnapshotController, reactor *snapshotReactor, test c
119119
const testNamespace = "default"
120120
const mockDriverName = "csi-mock-plugin"
121121

122-
var versionConflictError = errors.New("VersionError")
122+
var errVersionConflict = errors.New("VersionError")
123123
var nocontents []*crdv1.VolumeSnapshotContent
124124
var nosnapshots []*crdv1.VolumeSnapshot
125125
var noevents = []string{}
@@ -228,7 +228,7 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O
228228
storedVer, _ := strconv.Atoi(storedVolume.ResourceVersion)
229229
requestedVer, _ := strconv.Atoi(content.ResourceVersion)
230230
if storedVer != requestedVer {
231-
return true, obj, versionConflictError
231+
return true, obj, errVersionConflict
232232
}
233233
// Don't modify the existing object
234234
content = content.DeepCopy()
@@ -254,7 +254,7 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O
254254
storedVer, _ := strconv.Atoi(storedSnapshot.ResourceVersion)
255255
requestedVer, _ := strconv.Atoi(snapshot.ResourceVersion)
256256
if storedVer != requestedVer {
257-
return true, obj, versionConflictError
257+
return true, obj, errVersionConflict
258258
}
259259
// Don't modify the existing object
260260
snapshot = snapshot.DeepCopy()
@@ -276,21 +276,19 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O
276276
if found {
277277
glog.V(4).Infof("GetVolume: found %s", content.Name)
278278
return true, content, nil
279-
} else {
280-
glog.V(4).Infof("GetVolume: content %s not found", name)
281-
return true, nil, fmt.Errorf("cannot find content %s", name)
282279
}
280+
glog.V(4).Infof("GetVolume: content %s not found", name)
281+
return true, nil, fmt.Errorf("cannot find content %s", name)
283282

284283
case action.Matches("get", "volumesnapshots"):
285284
name := action.(core.GetAction).GetName()
286285
snapshot, found := r.snapshots[name]
287286
if found {
288287
glog.V(4).Infof("GetSnapshot: found %s", snapshot.Name)
289288
return true, snapshot, nil
290-
} else {
291-
glog.V(4).Infof("GetSnapshot: content %s not found", name)
292-
return true, nil, fmt.Errorf("cannot find snapshot %s", name)
293289
}
290+
glog.V(4).Infof("GetSnapshot: content %s not found", name)
291+
return true, nil, fmt.Errorf("cannot find snapshot %s", name)
294292

295293
case action.Matches("delete", "volumesnapshotcontents"):
296294
name := action.(core.DeleteAction).GetName()
@@ -300,9 +298,8 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O
300298
delete(r.contents, name)
301299
r.changedSinceLastSync++
302300
return true, nil, nil
303-
} else {
304-
return true, nil, fmt.Errorf("cannot delete content %s: not found", name)
305301
}
302+
return true, nil, fmt.Errorf("cannot delete content %s: not found", name)
306303

307304
case action.Matches("delete", "volumesnapshots"):
308305
name := action.(core.DeleteAction).GetName()
@@ -312,53 +309,49 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O
312309
delete(r.snapshots, name)
313310
r.changedSinceLastSync++
314311
return true, nil, nil
315-
} else {
316-
return true, nil, fmt.Errorf("cannot delete snapshot %s: not found", name)
317312
}
313+
return true, nil, fmt.Errorf("cannot delete snapshot %s: not found", name)
318314

319315
case action.Matches("get", "persistentvolumes"):
320316
name := action.(core.GetAction).GetName()
321317
volume, found := r.volumes[name]
322318
if found {
323319
glog.V(4).Infof("GetVolume: found %s", volume.Name)
324320
return true, volume, nil
325-
} else {
326-
glog.V(4).Infof("GetVolume: volume %s not found", name)
327-
return true, nil, fmt.Errorf("cannot find volume %s", name)
328321
}
322+
glog.V(4).Infof("GetVolume: volume %s not found", name)
323+
return true, nil, fmt.Errorf("cannot find volume %s", name)
329324

330325
case action.Matches("get", "persistentvolumeclaims"):
331326
name := action.(core.GetAction).GetName()
332327
claim, found := r.claims[name]
333328
if found {
334329
glog.V(4).Infof("GetClaim: found %s", claim.Name)
335330
return true, claim, nil
336-
} else {
337-
glog.V(4).Infof("GetClaim: claim %s not found", name)
338-
return true, nil, fmt.Errorf("cannot find claim %s", name)
339331
}
332+
glog.V(4).Infof("GetClaim: claim %s not found", name)
333+
return true, nil, fmt.Errorf("cannot find claim %s", name)
340334

341335
case action.Matches("get", "storageclasses"):
342336
name := action.(core.GetAction).GetName()
343337
storageClass, found := r.storageClasses[name]
344338
if found {
345339
glog.V(4).Infof("GetStorageClass: found %s", storageClass.Name)
346340
return true, storageClass, nil
347-
} else {
348-
glog.V(4).Infof("GetStorageClass: storageClass %s not found", name)
349-
return true, nil, fmt.Errorf("cannot find storageClass %s", name)
350341
}
342+
glog.V(4).Infof("GetStorageClass: storageClass %s not found", name)
343+
return true, nil, fmt.Errorf("cannot find storageClass %s", name)
351344

352345
case action.Matches("get", "secrets"):
353346
name := action.(core.GetAction).GetName()
354347
secret, found := r.secrets[name]
355348
if found {
356349
glog.V(4).Infof("GetSecret: found %s", secret.Name)
357350
return true, secret, nil
358-
} else {
359-
glog.V(4).Infof("GetSecret: secret %s not found", name)
360-
return true, nil, fmt.Errorf("cannot find secret %s", name)
361351
}
352+
glog.V(4).Infof("GetSecret: secret %s not found", name)
353+
return true, nil, fmt.Errorf("cannot find secret %s", name)
354+
362355
}
363356

364357
return false, nil, nil
@@ -966,16 +959,16 @@ func testSyncContent(ctrl *csiSnapshotController, reactor *snapshotReactor, test
966959
}
967960

968961
var (
969-
classEmpty string = ""
970-
classGold string = "gold"
971-
classSilver string = "silver"
972-
classNonExisting string = "non-existing"
973-
defaultClass string = "default-class"
974-
emptySecretClass string = "empty-secret-class"
975-
invalidSecretClass string = "invalid-secret-class"
976-
validSecretClass string = "valid-secret-class"
977-
sameDriver string = "sameDriver"
978-
diffDriver string = "diffDriver"
962+
classEmpty string
963+
classGold = "gold"
964+
classSilver = "silver"
965+
classNonExisting = "non-existing"
966+
defaultClass = "default-class"
967+
emptySecretClass = "empty-secret-class"
968+
invalidSecretClass = "invalid-secret-class"
969+
validSecretClass = "valid-secret-class"
970+
sameDriver = "sameDriver"
971+
diffDriver = "diffDriver"
979972
)
980973

981974
// wrapTestWithInjectedOperation returns a testCall that:

‎pkg/controller/snapshot_controller.go

+8-9
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ func (ctrl *csiSnapshotController) syncSnapshot(snapshot *crdv1.VolumeSnapshot)
194194

195195
if !snapshot.Status.ReadyToUse {
196196
return ctrl.syncUnreadySnapshot(snapshot)
197-
} else {
198-
return ctrl.syncReadySnapshot(snapshot)
199197
}
198+
return ctrl.syncReadySnapshot(snapshot)
199+
200200
}
201201

202202
// syncReadySnapshot checks the snapshot which has been bound to snapshot content successfully before.
@@ -557,9 +557,9 @@ func (ctrl *csiSnapshotController) getCreateSnapshotInput(snapshot *crdv1.Volume
557557

558558
func (ctrl *csiSnapshotController) checkandUpdateBoundSnapshotStatusOperation(snapshot *crdv1.VolumeSnapshot, content *crdv1.VolumeSnapshotContent) (*crdv1.VolumeSnapshot, error) {
559559
var err error
560-
var timestamp int64 = 0
561-
var size int64 = 0
562-
var readyToUse bool = false
560+
var timestamp int64
561+
var size int64
562+
var readyToUse = false
563563
class, volume, _, snapshotterCredentials, err := ctrl.getCreateSnapshotInput(snapshot)
564564
if err != nil {
565565
return nil, fmt.Errorf("failed to get input parameters to create snapshot %s: %q", snapshot.Name, err)
@@ -568,9 +568,8 @@ func (ctrl *csiSnapshotController) checkandUpdateBoundSnapshotStatusOperation(sn
568568
if err != nil {
569569
glog.Errorf("checkandUpdateBoundSnapshotStatusOperation: failed to call create snapshot to check whether the snapshot is ready to use %q", err)
570570
return nil, err
571-
} else {
572-
glog.V(5).Infof("checkandUpdateBoundSnapshotStatusOperation: driver %s, snapshotId %s, timestamp %d, size %d, readyToUse %t", driverName, snapshotID, timestamp, size, readyToUse)
573571
}
572+
glog.V(5).Infof("checkandUpdateBoundSnapshotStatusOperation: driver %s, snapshotId %s, timestamp %d, size %d, readyToUse %t", driverName, snapshotID, timestamp, size, readyToUse)
574573

575574
if timestamp == 0 {
576575
timestamp = time.Now().UnixNano()
@@ -821,9 +820,9 @@ func (ctrl *csiSnapshotController) updateSnapshotStatus(snapshot *crdv1.VolumeSn
821820
newSnapshotObj, err := ctrl.clientset.VolumesnapshotV1alpha1().VolumeSnapshots(snapshotClone.Namespace).Update(snapshotClone)
822821
if err != nil {
823822
return nil, newControllerUpdateError(snapshotKey(snapshot), err.Error())
824-
} else {
825-
return newSnapshotObj, nil
826823
}
824+
return newSnapshotObj, nil
825+
827826
}
828827
return snapshot, nil
829828
}

‎pkg/controller/util.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -168,21 +168,21 @@ func verifyAndGetSecretNameAndNamespaceTemplate(secret deprecatedSecretParamsMap
168168
numNamespace := 0
169169
if t, ok := snapshotClassParams[secret.deprecatedSecretNameKey]; ok {
170170
nameTemplate = t
171-
numName += 1
171+
numName++
172172
glog.Warning(deprecationWarning(secret.deprecatedSecretNameKey, secret.secretNameKey, ""))
173173
}
174174
if t, ok := snapshotClassParams[secret.deprecatedSecretNamespaceKey]; ok {
175175
namespaceTemplate = t
176-
numNamespace += 1
176+
numNamespace++
177177
glog.Warning(deprecationWarning(secret.deprecatedSecretNamespaceKey, secret.secretNamespaceKey, ""))
178178
}
179179
if t, ok := snapshotClassParams[secret.secretNameKey]; ok {
180180
nameTemplate = t
181-
numName += 1
181+
numName++
182182
}
183183
if t, ok := snapshotClassParams[secret.secretNamespaceKey]; ok {
184184
namespaceTemplate = t
185-
numNamespace += 1
185+
numNamespace++
186186
}
187187

188188
if numName > 1 || numNamespace > 1 {

‎pkg/controller/util_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ func TestGetSecretReference(t *testing.T) {
111111
if err != nil {
112112
if tc.expectErr {
113113
return
114-
} else {
115-
t.Fatalf("Did not expect error but got: %v", err)
116114
}
115+
t.Fatalf("Did not expect error but got: %v", err)
116+
117117
} else {
118118
if tc.expectErr {
119119
t.Fatalf("Expected error but got none")

0 commit comments

Comments
 (0)