diff --git a/pkg/connection/connection_test.go b/pkg/connection/connection_test.go index 13362e5cc..85b54e3eb 100644 --- a/pkg/connection/connection_test.go +++ b/pkg/connection/connection_test.go @@ -104,7 +104,7 @@ func TestGetPluginInfo(t *testing.T) { in := &csi.GetPluginInfoRequest{} out := test.output - var injectedErr error = nil + var injectedErr error if test.injectError { injectedErr = fmt.Errorf("mock error") } @@ -214,7 +214,7 @@ func TestSupportsControllerCreateSnapshot(t *testing.T) { in := &csi.ControllerGetCapabilitiesRequest{} out := test.output - var injectedErr error = nil + var injectedErr error if test.injectError { injectedErr = fmt.Errorf("mock error") } @@ -354,7 +354,7 @@ func TestSupportsControllerListSnapshots(t *testing.T) { in := &csi.ControllerGetCapabilitiesRequest{} out := test.output - var injectedErr error = nil + var injectedErr error if test.injectError { injectedErr = fmt.Errorf("mock error") } @@ -524,7 +524,7 @@ func TestCreateSnapshot(t *testing.T) { for _, test := range tests { in := test.input out := test.output - var injectedErr error = nil + var injectedErr error if test.injectError != codes.OK { injectedErr = status.Error(test.injectError, fmt.Sprintf("Injecting error %d", test.injectError)) } @@ -632,7 +632,7 @@ func TestDeleteSnapshot(t *testing.T) { for _, test := range tests { in := test.input out := test.output - var injectedErr error = nil + var injectedErr error if test.injectError != codes.OK { injectedErr = status.Error(test.injectError, fmt.Sprintf("Injecting error %d", test.injectError)) } @@ -730,7 +730,7 @@ func TestGetSnapshotStatus(t *testing.T) { for _, test := range tests { in := test.input out := test.output - var injectedErr error = nil + var injectedErr error if test.injectError != codes.OK { injectedErr = status.Error(test.injectError, fmt.Sprintf("Injecting error %d", test.injectError)) } diff --git a/pkg/controller/framework_test.go b/pkg/controller/framework_test.go index 5e5959df2..08292af5e 100644 --- a/pkg/controller/framework_test.go +++ b/pkg/controller/framework_test.go @@ -119,7 +119,7 @@ type testCall func(ctrl *csiSnapshotController, reactor *snapshotReactor, test c const testNamespace = "default" const mockDriverName = "csi-mock-plugin" -var versionConflictError = errors.New("VersionError") +var errVersionConflict = errors.New("VersionError") var nocontents []*crdv1.VolumeSnapshotContent var nosnapshots []*crdv1.VolumeSnapshot var noevents = []string{} @@ -228,7 +228,7 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O storedVer, _ := strconv.Atoi(storedVolume.ResourceVersion) requestedVer, _ := strconv.Atoi(content.ResourceVersion) if storedVer != requestedVer { - return true, obj, versionConflictError + return true, obj, errVersionConflict } // Don't modify the existing object content = content.DeepCopy() @@ -254,7 +254,7 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O storedVer, _ := strconv.Atoi(storedSnapshot.ResourceVersion) requestedVer, _ := strconv.Atoi(snapshot.ResourceVersion) if storedVer != requestedVer { - return true, obj, versionConflictError + return true, obj, errVersionConflict } // Don't modify the existing object snapshot = snapshot.DeepCopy() @@ -276,10 +276,9 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O if found { glog.V(4).Infof("GetVolume: found %s", content.Name) return true, content, nil - } else { - glog.V(4).Infof("GetVolume: content %s not found", name) - return true, nil, fmt.Errorf("cannot find content %s", name) } + glog.V(4).Infof("GetVolume: content %s not found", name) + return true, nil, fmt.Errorf("cannot find content %s", name) case action.Matches("get", "volumesnapshots"): name := action.(core.GetAction).GetName() @@ -287,10 +286,9 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O if found { glog.V(4).Infof("GetSnapshot: found %s", snapshot.Name) return true, snapshot, nil - } else { - glog.V(4).Infof("GetSnapshot: content %s not found", name) - return true, nil, fmt.Errorf("cannot find snapshot %s", name) } + glog.V(4).Infof("GetSnapshot: content %s not found", name) + return true, nil, fmt.Errorf("cannot find snapshot %s", name) case action.Matches("delete", "volumesnapshotcontents"): name := action.(core.DeleteAction).GetName() @@ -300,9 +298,8 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O delete(r.contents, name) r.changedSinceLastSync++ return true, nil, nil - } else { - return true, nil, fmt.Errorf("cannot delete content %s: not found", name) } + return true, nil, fmt.Errorf("cannot delete content %s: not found", name) case action.Matches("delete", "volumesnapshots"): name := action.(core.DeleteAction).GetName() @@ -312,9 +309,8 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O delete(r.snapshots, name) r.changedSinceLastSync++ return true, nil, nil - } else { - return true, nil, fmt.Errorf("cannot delete snapshot %s: not found", name) } + return true, nil, fmt.Errorf("cannot delete snapshot %s: not found", name) case action.Matches("get", "persistentvolumes"): name := action.(core.GetAction).GetName() @@ -322,10 +318,9 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O if found { glog.V(4).Infof("GetVolume: found %s", volume.Name) return true, volume, nil - } else { - glog.V(4).Infof("GetVolume: volume %s not found", name) - return true, nil, fmt.Errorf("cannot find volume %s", name) } + glog.V(4).Infof("GetVolume: volume %s not found", name) + return true, nil, fmt.Errorf("cannot find volume %s", name) case action.Matches("get", "persistentvolumeclaims"): name := action.(core.GetAction).GetName() @@ -333,10 +328,9 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O if found { glog.V(4).Infof("GetClaim: found %s", claim.Name) return true, claim, nil - } else { - glog.V(4).Infof("GetClaim: claim %s not found", name) - return true, nil, fmt.Errorf("cannot find claim %s", name) } + glog.V(4).Infof("GetClaim: claim %s not found", name) + return true, nil, fmt.Errorf("cannot find claim %s", name) case action.Matches("get", "storageclasses"): name := action.(core.GetAction).GetName() @@ -344,10 +338,9 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O if found { glog.V(4).Infof("GetStorageClass: found %s", storageClass.Name) return true, storageClass, nil - } else { - glog.V(4).Infof("GetStorageClass: storageClass %s not found", name) - return true, nil, fmt.Errorf("cannot find storageClass %s", name) } + glog.V(4).Infof("GetStorageClass: storageClass %s not found", name) + return true, nil, fmt.Errorf("cannot find storageClass %s", name) case action.Matches("get", "secrets"): name := action.(core.GetAction).GetName() @@ -355,10 +348,10 @@ func (r *snapshotReactor) React(action core.Action) (handled bool, ret runtime.O if found { glog.V(4).Infof("GetSecret: found %s", secret.Name) return true, secret, nil - } else { - glog.V(4).Infof("GetSecret: secret %s not found", name) - return true, nil, fmt.Errorf("cannot find secret %s", name) } + glog.V(4).Infof("GetSecret: secret %s not found", name) + return true, nil, fmt.Errorf("cannot find secret %s", name) + } return false, nil, nil @@ -966,16 +959,16 @@ func testSyncContent(ctrl *csiSnapshotController, reactor *snapshotReactor, test } var ( - classEmpty string = "" - classGold string = "gold" - classSilver string = "silver" - classNonExisting string = "non-existing" - defaultClass string = "default-class" - emptySecretClass string = "empty-secret-class" - invalidSecretClass string = "invalid-secret-class" - validSecretClass string = "valid-secret-class" - sameDriver string = "sameDriver" - diffDriver string = "diffDriver" + classEmpty string + classGold = "gold" + classSilver = "silver" + classNonExisting = "non-existing" + defaultClass = "default-class" + emptySecretClass = "empty-secret-class" + invalidSecretClass = "invalid-secret-class" + validSecretClass = "valid-secret-class" + sameDriver = "sameDriver" + diffDriver = "diffDriver" ) // wrapTestWithInjectedOperation returns a testCall that: diff --git a/pkg/controller/snapshot_controller.go b/pkg/controller/snapshot_controller.go index d462a555e..874853f14 100644 --- a/pkg/controller/snapshot_controller.go +++ b/pkg/controller/snapshot_controller.go @@ -194,9 +194,9 @@ func (ctrl *csiSnapshotController) syncSnapshot(snapshot *crdv1.VolumeSnapshot) if !snapshot.Status.ReadyToUse { return ctrl.syncUnreadySnapshot(snapshot) - } else { - return ctrl.syncReadySnapshot(snapshot) } + return ctrl.syncReadySnapshot(snapshot) + } // syncReadySnapshot checks the snapshot which has been bound to snapshot content successfully before. @@ -556,9 +556,9 @@ func (ctrl *csiSnapshotController) getCreateSnapshotInput(snapshot *crdv1.Volume func (ctrl *csiSnapshotController) checkandUpdateBoundSnapshotStatusOperation(snapshot *crdv1.VolumeSnapshot, content *crdv1.VolumeSnapshotContent) (*crdv1.VolumeSnapshot, error) { var err error - var timestamp int64 = 0 - var size int64 = 0 - var readyToUse bool = false + var timestamp int64 + var size int64 + var readyToUse = false class, volume, _, snapshotterCredentials, err := ctrl.getCreateSnapshotInput(snapshot) if err != nil { return nil, fmt.Errorf("failed to get input parameters to create snapshot %s: %q", snapshot.Name, err) @@ -567,9 +567,8 @@ func (ctrl *csiSnapshotController) checkandUpdateBoundSnapshotStatusOperation(sn if err != nil { glog.Errorf("checkandUpdateBoundSnapshotStatusOperation: failed to call create snapshot to check whether the snapshot is ready to use %q", err) return nil, err - } else { - glog.V(5).Infof("checkandUpdateBoundSnapshotStatusOperation: driver %s, snapshotId %s, timestamp %d, size %d, readyToUse %t", driverName, snapshotID, timestamp, size, readyToUse) } + glog.V(5).Infof("checkandUpdateBoundSnapshotStatusOperation: driver %s, snapshotId %s, timestamp %d, size %d, readyToUse %t", driverName, snapshotID, timestamp, size, readyToUse) if timestamp == 0 { timestamp = time.Now().UnixNano() @@ -820,9 +819,9 @@ func (ctrl *csiSnapshotController) updateSnapshotStatus(snapshot *crdv1.VolumeSn newSnapshotObj, err := ctrl.clientset.VolumesnapshotV1alpha1().VolumeSnapshots(snapshotClone.Namespace).Update(snapshotClone) if err != nil { return nil, newControllerUpdateError(snapshotKey(snapshot), err.Error()) - } else { - return newSnapshotObj, nil } + return newSnapshotObj, nil + } return snapshot, nil } diff --git a/pkg/controller/util.go b/pkg/controller/util.go index 570099c4b..a15613d40 100644 --- a/pkg/controller/util.go +++ b/pkg/controller/util.go @@ -168,21 +168,21 @@ func verifyAndGetSecretNameAndNamespaceTemplate(secret deprecatedSecretParamsMap numNamespace := 0 if t, ok := snapshotClassParams[secret.deprecatedSecretNameKey]; ok { nameTemplate = t - numName += 1 + numName++ glog.Warning(deprecationWarning(secret.deprecatedSecretNameKey, secret.secretNameKey, "")) } if t, ok := snapshotClassParams[secret.deprecatedSecretNamespaceKey]; ok { namespaceTemplate = t - numNamespace += 1 + numNamespace++ glog.Warning(deprecationWarning(secret.deprecatedSecretNamespaceKey, secret.secretNamespaceKey, "")) } if t, ok := snapshotClassParams[secret.secretNameKey]; ok { nameTemplate = t - numName += 1 + numName++ } if t, ok := snapshotClassParams[secret.secretNamespaceKey]; ok { namespaceTemplate = t - numNamespace += 1 + numNamespace++ } if numName > 1 || numNamespace > 1 { diff --git a/pkg/controller/util_test.go b/pkg/controller/util_test.go index bfb64e6be..4da945761 100644 --- a/pkg/controller/util_test.go +++ b/pkg/controller/util_test.go @@ -111,9 +111,9 @@ func TestGetSecretReference(t *testing.T) { if err != nil { if tc.expectErr { return - } else { - t.Fatalf("Did not expect error but got: %v", err) } + t.Fatalf("Did not expect error but got: %v", err) + } else { if tc.expectErr { t.Fatalf("Expected error but got none")