Merge pull request #187 from thaJeztah/atomicwriter_linting

fix linting issues for golangci-lint v2

Author: thaJeztah

Diff for: capability/syscall_linux.go

@@ -141,16 +141,17 @@ func setVfsCap(path string, data *vfscapData) (err error) {
 		return
 	}
 	var size uintptr
-	if data.version == 1 {
+	switch data.version {
+	case 1:
 		data.magic = vfsCapVer1
 		size = vfscapDataSizeV1
-	} else if data.version == 2 {
+	case 2:
 		data.magic = vfsCapVer2
 		if data.effective[0] != 0 || data.effective[1] != 0 {
 			data.magic |= vfsCapFlageffective
 		}
 		size = vfscapDataSizeV2
-	} else {
+	default:
 		return syscall.EINVAL
 	}
 	_, _, e1 := syscall.RawSyscall6(syscall.SYS_SETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_vfsXattrName)), uintptr(unsafe.Pointer(data)), size, 0, 0)

Diff for: mountinfo/mounted_linux_test.go

@@ -279,7 +279,7 @@ func testMountedFast(t *testing.T, path string, tc *testMount, openat2Supported
 	mounted, sure, err := MountedFast(path)
 	if err != nil {
 		// Got an error; is it expected?
-		if !(tc.isNotExist && errors.Is(err, os.ErrNotExist)) {
+		if !tc.isNotExist || !errors.Is(err, os.ErrNotExist) {
 			t.Errorf("MountedFast: unexpected error: %v", err)
 		}
 
@@ -350,7 +350,7 @@ func TestMountedBy(t *testing.T) {
 				}
 			} else {
 				// Got an error; is it expected?
-				if !(tc.isNotExist && errors.Is(err, os.ErrNotExist)) {
+				if !tc.isNotExist || !errors.Is(err, os.ErrNotExist) {
 					t.Errorf("Mounted: unexpected error: %v", err)
 				}
 				// Check false is returned in error case.

Diff for: user/user.go

@@ -444,7 +444,7 @@ func GetAdditionalGroups(additionalGroups []string, group io.Reader) ([]int, err
 			return false
 		})
 		if err != nil {
-			return nil, fmt.Errorf("Unable to find additional groups %v: %w", additionalGroups, err)
+			return nil, fmt.Errorf("unable to find additional groups %v: %w", additionalGroups, err)
 		}
 	}
 
@@ -468,7 +468,7 @@ func GetAdditionalGroups(additionalGroups []string, group io.Reader) ([]int, err
 			gid, err := strconv.ParseInt(ag, 10, 64)
 			if err != nil {
 				// Not a numeric ID either.
-				return nil, fmt.Errorf("Unable to find group %s: %w", ag, ErrNoGroupEntries)
+				return nil, fmt.Errorf("unable to find group %s: %w", ag, ErrNoGroupEntries)
 			}
 			// Ensure gid is inside gid range.
 			if gid < minID || gid > maxID {