normalize function return, if block ends with a return statement, so …

…drop this else and outdent its block (#827)

pkg/csi/manila/driver.go

@@ -130,21 +130,21 @@ func NewDriver(nodeID, driverName, endpoint, fwdEndpoint, shareProto string, man
 
 	var supportsNodeStage bool
 
-	if nodeCapsMap, err := d.initProxiedDriver(); err != nil {
+	nodeCapsMap, err := d.initProxiedDriver()
+	if err != nil {
 		return nil, fmt.Errorf("failed to initialize proxied CSI driver: %v", err)
-	} else {
-		var nscaps []csi.NodeServiceCapability_RPC_Type
-		for c := range nodeCapsMap {
-			nscaps = append(nscaps, c)
-
-			if c == csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME {
-				supportsNodeStage = true
-			}
-		}
+	}
+	var nscaps []csi.NodeServiceCapability_RPC_Type
+	for c := range nodeCapsMap {
+		nscaps = append(nscaps, c)
 
-		d.addNodeServiceCapabilities(nscaps)
+		if c == csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME {
+			supportsNodeStage = true
+		}
 	}
 
+	d.addNodeServiceCapabilities(nscaps)
+
 	d.ids = &identityServer{d: d}
 	d.cs = &controllerServer{d: d}
 	d.ns = &nodeServer{d: d, supportsNodeStage: supportsNodeStage, nodeStageCache: make(map[volumeID]stageCacheEntry)}

pkg/flexvolume/flexvolume.go

@@ -264,14 +264,12 @@ func (d *FlexVolumeDriver) doRun(args []string) (map[string]interface{}, error)
 	if cmdInfo, found := commands[op]; found {
 		if cmdInfo.numArgs == nArgs {
 			return cmdInfo.run(d, args[1:])
-		} else {
-			return nil, fmt.Errorf("unexpected number of args %d (expected %d) for operation %q", nArgs, cmdInfo.numArgs, op)
 		}
-	} else {
-		return map[string]interface{}{
-			"status": "Not supported",
-		}, nil
+		return nil, fmt.Errorf("unexpected number of args %d (expected %d) for operation %q", nArgs, cmdInfo.numArgs, op)
 	}
+	return map[string]interface{}{
+		"status": "Not supported",
+	}, nil
 }
 
 func (d *FlexVolumeDriver) Run(args []string) string {

pkg/identity/keystone/authorizer.go

@@ -59,44 +59,40 @@ func getAllowed(definition string, str string) (sets.String, error) {
 		// "!namespace"
 		if definition[1:] == str || definition[1:] == "*" {
 			return nil, fmt.Errorf("")
-		} else {
-			allowed.Insert(str)
 		}
+		allowed.Insert(str)
 	} else if strings.Index(definition, "[") == 0 && strings.Index(definition, "]") == (len(definition)-1) {
 		// "['namespace1', 'namespace2']"
 		var items []string
 		if err := json.Unmarshal([]byte(strings.Replace(definition, "'", "\"", -1)), &items); err != nil {
 			klog.V(4).Infof("Skip the permission definition %s", definition)
 			return nil, fmt.Errorf("")
-		} else {
-			for _, val := range items {
-				if val == "*" {
-					allowed.Insert(str)
-					continue
-				}
-				allowed.Insert(val)
+		}
+		for _, val := range items {
+			if val == "*" {
+				allowed.Insert(str)
+				continue
 			}
+			allowed.Insert(val)
 		}
 	} else if strings.Index(definition, "!") == 0 && strings.Index(definition, "[") == 1 && strings.Index(definition, "]") == (len(definition)-1) {
 		// "!['namespace1', 'namespace2']"
 		var items []string
 		if err := json.Unmarshal([]byte(strings.Replace(definition[1:], "'", "\"", -1)), &items); err != nil {
 			klog.V(4).Infof("Skip the permission definition %s", definition)
 			return nil, fmt.Errorf("")
-		} else {
-			found := false
-			for _, val := range items {
-				if val == str || val == "*" {
-					found = true
-				}
+		}
+		found := false
+		for _, val := range items {
+			if val == str || val == "*" {
+				found = true
 			}
+		}
 
-			if found {
-				return nil, fmt.Errorf("")
-			} else {
-				allowed.Insert(str)
-			}
+		if found {
+			return nil, fmt.Errorf("")
 		}
+		allowed.Insert(str)
 	}
 
 	return allowed, nil

pkg/util/mount/mount_linux.go

@@ -494,16 +494,14 @@ func (mounter *SafeFormatAndMount) formatAndMount(source string, target string,
 			}
 			klog.Errorf("format of disk %q failed: type:(%q) target:(%q) options:(%q)error:(%v)", source, fstype, target, options, err)
 			return err
-		} else {
-			// Disk is already formatted and failed to mount
-			if len(fstype) == 0 || fstype == existingFormat {
-				// This is mount error
-				return mountErr
-			} else {
-				// Block device is formatted with unexpected filesystem, let the user know
-				return fmt.Errorf("failed to mount the volume as %q, it already contains %s. Mount error: %v", fstype, existingFormat, mountErr)
-			}
 		}
+		// Disk is already formatted and failed to mount
+		if len(fstype) == 0 || fstype == existingFormat {
+			// This is mount error
+			return mountErr
+		}
+		// Block device is formatted with unexpected filesystem, let the user know
+		return fmt.Errorf("failed to mount the volume as %q, it already contains %s. Mount error: %v", fstype, existingFormat, mountErr)
 	}
 	return mountErr
 }