modify static check

fix format

Author: lala123912

pkg/volume/util/device_util_linux_test.go

@@ -258,33 +258,33 @@ func TestFindSlaveDevicesOnMultipath(t *testing.T) {
 func TestGetISCSIPortalHostMapForTarget(t *testing.T) {
 	mockDeviceUtil := NewDeviceHandler(&mockOsIOHandler{})
 	portalHostMap, err := mockDeviceUtil.GetISCSIPortalHostMapForTarget("target1")
-	if nil != err {
+	if err != nil {
 		t.Fatalf("error getting scsi hosts for target: %v", err)
 	}
-	if nil == portalHostMap {
+	if portalHostMap == nil {
 		t.Fatal("no portal host map returned")
 	}
-	if 1 != len(portalHostMap) {
+	if len(portalHostMap) != 1 {
 		t.Fatalf("wrong number of map entries in portal host map: %d", len(portalHostMap))
 	}
-	if 2 != portalHostMap["10.0.0.1:3260"] {
+	if portalHostMap["10.0.0.1:3260"] != 2 {
 		t.Fatalf("incorrect entry in portal host map: %v", portalHostMap)
 	}
 }
 
 func TestFindDevicesForISCSILun(t *testing.T) {
 	mockDeviceUtil := NewDeviceHandler(&mockOsIOHandler{})
 	devices, err := mockDeviceUtil.FindDevicesForISCSILun("target1", 1)
-	if nil != err {
+	if err != nil {
 		t.Fatalf("error getting devices for lun: %v", err)
 	}
-	if nil == devices {
+	if devices == nil {
 		t.Fatal("no devices returned")
 	}
-	if 1 != len(devices) {
+	if len(devices) != 1 {
 		t.Fatalf("wrong number of devices: %d", len(devices))
 	}
-	if "sda" != devices[0] {
+	if devices[0] != "sda" {
 		t.Fatalf("incorrect device %v", devices)
 	}
 }

pkg/volume/util/fsquota/common/quota_linux_common_impl.go

@@ -116,7 +116,7 @@ func getXFSQuotaCmd() (string, error) {
 		}
 	}
 	quotaCmdInitialized = true
-	return "", fmt.Errorf("No xfs_quota program found")
+	return "", fmt.Errorf("no xfs_quota program found")
 }
 
 func doRunXFSQuotaCommand(mountpoint string, mountsFile, command string) (string, error) {
@@ -145,15 +145,15 @@ func doRunXFSQuotaCommand(mountpoint string, mountsFile, command string) (string
 func runXFSQuotaCommand(mountpoint string, command string) (string, error) {
 	tmpMounts, err := ioutil.TempFile("", "mounts")
 	if err != nil {
-		return "", fmt.Errorf("Cannot create temporary mount file: %v", err)
+		return "", fmt.Errorf("cannot create temporary mount file: %v", err)
 	}
 	tmpMountsFileName := tmpMounts.Name()
 	defer tmpMounts.Close()
 	defer os.Remove(tmpMountsFileName)
 
 	mounts, err := os.Open(MountsFile)
 	if err != nil {
-		return "", fmt.Errorf("Cannot open mounts file %s: %v", MountsFile, err)
+		return "", fmt.Errorf("cannot open mounts file %s: %v", MountsFile, err)
 	}
 	defer mounts.Close()
 
@@ -164,16 +164,16 @@ func runXFSQuotaCommand(mountpoint string, command string) (string, error) {
 			mount := match[2]
 			if mount == mountpoint {
 				if _, err := tmpMounts.WriteString(fmt.Sprintf("%s\n", scanner.Text())); err != nil {
-					return "", fmt.Errorf("Cannot write temporary mounts file: %v", err)
+					return "", fmt.Errorf("cannot write temporary mounts file: %v", err)
 				}
 				if err := tmpMounts.Sync(); err != nil {
-					return "", fmt.Errorf("Cannot sync temporary mounts file: %v", err)
+					return "", fmt.Errorf("cannot sync temporary mounts file: %v", err)
 				}
 				return doRunXFSQuotaCommand(mountpoint, tmpMountsFileName, command)
 			}
 		}
 	}
-	return "", fmt.Errorf("Cannot run xfs_quota: cannot find mount point %s in %s", mountpoint, MountsFile)
+	return "", fmt.Errorf("cannot run xfs_quota: cannot find mount point %s in %s", mountpoint, MountsFile)
 }
 
 // SupportsQuotas determines whether the filesystem supports quotas.
@@ -215,14 +215,14 @@ func (v linuxVolumeQuotaApplier) GetQuotaOnDir(path string) (QuotaID, error) {
 	}
 	match := lsattrParseRegexp.FindStringSubmatch(string(data))
 	if match == nil {
-		return BadQuotaID, fmt.Errorf("Unable to parse lsattr -pd %s output %s", path, string(data))
+		return BadQuotaID, fmt.Errorf("unable to parse lsattr -pd %s output %s", path, string(data))
 	}
 	if match[2] != path {
-		return BadQuotaID, fmt.Errorf("Mismatch between supplied and returned path (%s != %s)", path, match[2])
+		return BadQuotaID, fmt.Errorf("mismatch between supplied and returned path (%s != %s)", path, match[2])
 	}
 	projid, err := strconv.ParseInt(match[1], 10, 32)
 	if err != nil {
-		return BadQuotaID, fmt.Errorf("Unable to parse project ID from %s (%v)", match[1], err)
+		return BadQuotaID, fmt.Errorf("unable to parse project ID from %s (%v)", match[1], err)
 	}
 	return QuotaID(projid), nil
 }
@@ -244,18 +244,18 @@ func (v linuxVolumeQuotaApplier) SetQuotaOnDir(path string, id QuotaID, bytes in
 func getQuantity(mountpoint string, id QuotaID, xfsQuotaArg string, multiplier int64, allowEmptyOutput bool) (int64, error) {
 	data, err := runXFSQuotaCommand(mountpoint, fmt.Sprintf("quota -p -N -n -v %s %v", xfsQuotaArg, id))
 	if err != nil {
-		return 0, fmt.Errorf("Unable to run xfs_quota: %v", err)
+		return 0, fmt.Errorf("unable to run xfs_quota: %v", err)
 	}
 	if data == "" && allowEmptyOutput {
 		return 0, nil
 	}
 	match := quotaParseRegexp.FindStringSubmatch(data)
 	if match == nil {
-		return 0, fmt.Errorf("Unable to parse quota output '%s'", data)
+		return 0, fmt.Errorf("unable to parse quota output '%s'", data)
 	}
 	size, err := strconv.ParseInt(match[1], 10, 64)
 	if err != nil {
-		return 0, fmt.Errorf("Unable to parse data size '%s' from '%s': %v", match[1], data, err)
+		return 0, fmt.Errorf("unable to parse data size '%s' from '%s': %v", match[1], data, err)
 	}
 	klog.V(4).Infof("getQuantity %s %d %s %d => %d %v", mountpoint, id, xfsQuotaArg, multiplier, size, err)
 	return size * multiplier, nil

pkg/volume/util/fsquota/project.go

@@ -179,15 +179,15 @@ func findAvailableQuota(path string, idMap map[common.QuotaID]bool) (common.Quot
 			}
 		}
 	}
-	return common.BadQuotaID, fmt.Errorf("Cannot find available quota ID")
+	return common.BadQuotaID, fmt.Errorf("cannot find available quota ID")
 }
 
 func addDirToProject(path string, id common.QuotaID, list *projectsList) (common.QuotaID, bool, error) {
 	idMap := make(map[common.QuotaID]bool)
 	for _, project := range list.projects {
 		if project.data == path {
 			if id != project.id {
-				return common.BadQuotaID, false, fmt.Errorf("Attempt to reassign project ID for %s", path)
+				return common.BadQuotaID, false, fmt.Errorf("attempt to reassign project ID for %s", path)
 			}
 			// Trying to reassign a directory to the project it's
 			// already in.  Maybe this should be an error, but for
@@ -223,16 +223,16 @@ func addDirToProject(path string, id common.QuotaID, list *projectsList) (common
 
 func removeDirFromProject(path string, id common.QuotaID, list *projectsList) (bool, error) {
 	if id == common.BadQuotaID {
-		return false, fmt.Errorf("Attempt to remove invalid quota ID from %s", path)
+		return false, fmt.Errorf("attempt to remove invalid quota ID from %s", path)
 	}
 	foundAt := -1
 	countByID := make(map[common.QuotaID]int)
 	for i, project := range list.projects {
 		if project.data == path {
 			if id != project.id {
-				return false, fmt.Errorf("Attempting to remove quota ID %v from path %s, but expecting ID %v", id, path, project.id)
+				return false, fmt.Errorf("attempting to remove quota ID %v from path %s, but expecting ID %v", id, path, project.id)
 			} else if foundAt != -1 {
-				return false, fmt.Errorf("Found multiple quota IDs for path %s", path)
+				return false, fmt.Errorf("found multiple quota IDs for path %s", path)
 			}
 			// Faster and easier than deleting an element
 			list.projects[i].isValid = false
@@ -241,7 +241,7 @@ func removeDirFromProject(path string, id common.QuotaID, list *projectsList) (b
 		countByID[project.id]++
 	}
 	if foundAt == -1 {
-		return false, fmt.Errorf("Cannot find quota associated with path %s", path)
+		return false, fmt.Errorf("cannot find quota associated with path %s", path)
 	}
 	if countByID[id] <= 1 {
 		// Removing the last entry means that we're no longer using
@@ -314,7 +314,7 @@ func writeProjectFiles(fProjects *os.File, fProjid *os.File, writeProjid bool, l
 		}
 		os.Remove(tmpProjects)
 	}
-	return fmt.Errorf("Unable to write project files: %v", err)
+	return fmt.Errorf("unable to write project files: %v", err)
 }
 
 func createProjectID(path string, ID common.QuotaID) (common.QuotaID, error) {

pkg/volume/util/fsquota/quota_linux.go

@@ -170,15 +170,15 @@ func getFSInfo(m mount.Interface, path string) (string, string, error) {
 	if !okMountpoint {
 		mountpoint, err = detectMountpoint(m, path)
 		if err != nil {
-			return "", "", fmt.Errorf("Cannot determine mountpoint for %s: %v", path, err)
+			return "", "", fmt.Errorf("cannot determine mountpoint for %s: %v", path, err)
 		}
 	}
 
 	backingDev, okBackingDev := backingDevMap[path]
 	if !okBackingDev {
 		backingDev, err = detectBackingDev(m, mountpoint)
 		if err != nil {
-			return "", "", fmt.Errorf("Cannot determine backing device for %s: %v", path, err)
+			return "", "", fmt.Errorf("cannot determine backing device for %s: %v", path, err)
 		}
 	}
 	mountpointMap[path] = mountpoint
@@ -306,11 +306,11 @@ func SupportsQuotas(m mount.Interface, path string) (bool, error) {
 //lint:ignore SA4009 poduid is overwritten by design, see comment below
 func AssignQuota(m mount.Interface, path string, poduid types.UID, bytes *resource.Quantity) error {
 	if bytes == nil {
-		return fmt.Errorf("Attempting to assign null quota to %s", path)
+		return fmt.Errorf("attempting to assign null quota to %s", path)
 	}
 	ibytes := bytes.Value()
 	if ok, err := SupportsQuotas(m, path); !ok {
-		return fmt.Errorf("Quotas not supported on %s: %v", path, err)
+		return fmt.Errorf("quotas not supported on %s: %v", path, err)
 	}
 	quotaLock.Lock()
 	defer quotaLock.Unlock()
@@ -321,20 +321,20 @@ func AssignQuota(m mount.Interface, path string, poduid types.UID, bytes *resour
 	// one quota per volume, we can rip all of the pod code out.
 	poduid = types.UID(uuid.NewUUID())
 	if pod, ok := dirPodMap[path]; ok && pod != poduid {
-		return fmt.Errorf("Requesting quota on existing directory %s but different pod %s %s", path, pod, poduid)
+		return fmt.Errorf("requesting quota on existing directory %s but different pod %s %s", path, pod, poduid)
 	}
 	oid, ok := podQuotaMap[poduid]
 	if ok {
 		if quotaSizeMap[oid] != ibytes {
-			return fmt.Errorf("Requesting quota of different size: old %v new %v", quotaSizeMap[oid], bytes)
+			return fmt.Errorf("requesting quota of different size: old %v new %v", quotaSizeMap[oid], bytes)
 		}
 	} else {
 		oid = common.BadQuotaID
 	}
 	id, err := createProjectID(path, oid)
 	if err == nil {
 		if oid != common.BadQuotaID && oid != id {
-			return fmt.Errorf("Attempt to reassign quota %v to %v", oid, id)
+			return fmt.Errorf("attempt to reassign quota %v to %v", oid, id)
 		}
 		// When enforcing quotas are enabled, we'll condition this
 		// on their being disabled also.
@@ -353,7 +353,7 @@ func AssignQuota(m mount.Interface, path string, poduid types.UID, bytes *resour
 		}
 		removeProjectID(path, id)
 	}
-	return fmt.Errorf("Assign quota FAILED %v", err)
+	return fmt.Errorf("assign quota FAILED %v", err)
 }
 
 // GetConsumption -- retrieve the consumption (in bytes) of the directory
@@ -396,7 +396,7 @@ func GetInodes(path string) (*resource.Quantity, error) {
 func ClearQuota(m mount.Interface, path string) error {
 	klog.V(3).Infof("ClearQuota %s", path)
 	if !enabledQuotasForMonitoring() {
-		return fmt.Errorf("ClearQuota called, but quotas disabled")
+		return fmt.Errorf("clearQuota called, but quotas disabled")
 	}
 	quotaLock.Lock()
 	defer quotaLock.Unlock()
@@ -413,7 +413,7 @@ func ClearQuota(m mount.Interface, path string) error {
 	}
 	_, ok = podQuotaMap[poduid]
 	if !ok {
-		return fmt.Errorf("ClearQuota: No quota available for %s", path)
+		return fmt.Errorf("clearQuota: No quota available for %s", path)
 	}
 	projid, err := getQuotaOnDir(m, path)
 	if err != nil {
@@ -422,7 +422,7 @@ func ClearQuota(m mount.Interface, path string) error {
 		klog.V(3).Infof("Attempt to check quota ID %v on dir %s failed: %v", dirQuotaMap[path], path, err)
 	}
 	if projid != dirQuotaMap[path] {
-		return fmt.Errorf("Expected quota ID %v on dir %s does not match actual %v", dirQuotaMap[path], path, projid)
+		return fmt.Errorf("expected quota ID %v on dir %s does not match actual %v", dirQuotaMap[path], path, projid)
 	}
 	count, ok := podDirCountMap[poduid]
 	if count <= 1 || !ok {
@@ -446,7 +446,7 @@ func ClearQuota(m mount.Interface, path string) error {
 	delete(supportsQuotasMap, path)
 	clearApplier(path)
 	if err != nil {
-		return fmt.Errorf("Unable to clear quota for %s: %v", path, err)
+		return fmt.Errorf("unable to clear quota for %s: %v", path, err)
 	}
 	return nil
 }

pkg/volume/util/hostutil/hostutil_linux_test.go

@@ -304,10 +304,7 @@ func TestGetFileType(t *testing.T) {
 }
 
 func isOperationNotPermittedError(err error) bool {
-	if strings.Contains(err.Error(), "Operation not permitted") {
-		return true
-	}
-	return false
+	return strings.Contains(err.Error(), "Operation not permitted")
 }
 
 func writeFile(content string) (string, string, error) {

pkg/volume/util/nested_volumes.go

@@ -48,7 +48,7 @@ func getNestedMountpoints(name, baseDir string, pod v1.Pod) ([]string, error) {
 		for _, myMountPoint := range myMountPoints {
 			if strings.HasPrefix(myMountPoint, parentPrefix) {
 				// Don't let a container trick us into creating directories outside of its rootfs
-				return fmt.Errorf("Invalid container mount point %v", myMountPoint)
+				return fmt.Errorf("invalid container mount point %v", myMountPoint)
 			}
 			myMPSlash := myMountPoint + string(os.PathSeparator)
 			// The previously found nested mountpoint (or "" if none found yet)
@@ -75,10 +75,7 @@ func getNestedMountpoints(name, baseDir string, pod v1.Pod) ([]string, error) {
 	var retErr error
 	podutil.VisitContainers(&pod.Spec, podutil.AllFeatureEnabledContainers(), func(c *v1.Container, containerType podutil.ContainerType) bool {
 		retErr = checkContainer(c)
-		if retErr != nil {
-			return false
-		}
-		return true
+		return retErr == nil
 	})
 	if retErr != nil {
 		return nil, retErr
@@ -96,7 +93,7 @@ func MakeNestedMountpoints(name, baseDir string, pod v1.Pod) error {
 	for _, dir := range dirs {
 		err := os.MkdirAll(filepath.Join(baseDir, dir), 0755)
 		if err != nil {
-			return fmt.Errorf("Unable to create nested volume mountpoints: %v", err)
+			return fmt.Errorf("unable to create nested volume mountpoints: %v", err)
 		}
 	}
 	return nil

pkg/volume/util/nestedpendingoperations/nestedpendingoperations.go

@@ -240,7 +240,7 @@ func (grm *nestedPendingOperations) getOperation(key operationKey) (uint, error)
 		}
 	}
 
-	return 0, fmt.Errorf("Operation %+v not found", key)
+	return 0, fmt.Errorf("operation %+v not found", key)
 }
 
 func (grm *nestedPendingOperations) deleteOperation(key operationKey) {