From 1eeeadfcbd3034fb7a765e3600ec7f54f5673396 Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Sun, 6 Jan 2019 14:39:10 +0530 Subject: [PATCH] Remove redundant `else` blocks Signed-off-by: Humble Chirammal --- pkg/controller/framework_test.go | 37 +++++++++++---------------- pkg/controller/snapshot_controller.go | 11 ++++---- pkg/controller/util_test.go | 4 +-- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/pkg/controller/framework_test.go b/pkg/controller/framework_test.go index d3c6680e1..08292af5e 100644 --- a/pkg/controller/framework_test.go +++ b/pkg/controller/framework_test.go @@ -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 diff --git a/pkg/controller/snapshot_controller.go b/pkg/controller/snapshot_controller.go index 93975e935..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. @@ -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_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")