build: Enable additional linters and fix issues

pjbgf · pjbgf · commit e31bed9bc542 · 2025-11-20T21:13:40.000Z
Signed-off-by: Paulo Gomes &lt;pjbgf@linux.com&gt;
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -27,6 +27,7 @@ linters:
     - goprintffuncname
     - gosmopolitan
     - govet
+    - forcetypeassert
     - grouper
     - importas
     - ineffassign
@@ -47,6 +48,8 @@ linters:
     - tagalign
     - tagliatelle
     - testableexamples
+    - thelper
+    - tparallel
     - unconvert
     - unused
     - usestdlibvars
@@ -60,6 +63,13 @@ linters:
       - common-false-positives
       - legacy
       - std-error-handling
+
+  settings:
+    revive:
+      rules:
+      - name: var-naming
+        disabled: true
+
 formatters:
   enable:
     - gci
diff --git a/embedfs/embed_test.go b/embedfs/embed_test.go
@@ -44,6 +44,8 @@ func TestOpen(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
 			fs := New(&testdataDir)
 
 			var got []byte
@@ -115,6 +117,7 @@ func TestOpenFileFlags(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			fs := New(&testdataDir)
 
 			_, err := fs.OpenFile(tc.file, tc.flag, 0o700)
@@ -157,6 +160,7 @@ func TestStat(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			fs := New(&testdataDir)
 
 			fi, err := fs.Stat(tc.name)
@@ -213,6 +217,7 @@ func TestReadDir(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			fs := New(tc.fs)
 
 			fis, err := fs.ReadDir(tc.path)
@@ -296,6 +301,7 @@ func TestFileSeek(t *testing.T) {
 
 	for i, tc := range tests {
 		t.Run(fmt.Sprintf("#%d", i), func(t *testing.T) {
+			//nolint:tparallel
 			_, err = f.Seek(tc.seekOff, tc.seekWhence)
 			require.NoError(t, err)
 
@@ -309,6 +315,8 @@ func TestFileSeek(t *testing.T) {
 }
 
 func TestJoin(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name string
 		path []string
@@ -338,6 +346,7 @@ func TestJoin(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
 			fs := New(&empty)
 
 			got := fs.Join(tc.path...)
diff --git a/helper/chroot/chroot.go b/helper/chroot/chroot.go
@@ -1,6 +1,7 @@
 package chroot
 
 import (
+	"errors"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -126,7 +127,12 @@ func (fs *ChrootHelper) TempFile(dir, prefix string) (billy.File, error) {
 		return nil, err
 	}
 
-	f, err := fs.underlying.(billy.TempFile).TempFile(fullpath, prefix)
+	tf, ok := fs.underlying.(billy.TempFile)
+	if !ok {
+		return nil, errors.New("underlying fs does not implement billy.TempFile")
+	}
+
+	f, err := tf.TempFile(fullpath, prefix)
 	if err != nil {
 		return nil, err
 	}
@@ -140,7 +146,11 @@ func (fs *ChrootHelper) ReadDir(path string) ([]fs.DirEntry, error) {
 		return nil, err
 	}
 
-	return fs.underlying.(billy.Dir).ReadDir(fullpath)
+	d, ok := fs.underlying.(billy.Dir)
+	if !ok {
+		return nil, errors.New("underlying fs does not implement billy.Dir")
+	}
+	return d.ReadDir(fullpath)
 }
 
 func (fs *ChrootHelper) MkdirAll(filename string, perm fs.FileMode) error {
@@ -149,7 +159,11 @@ func (fs *ChrootHelper) MkdirAll(filename string, perm fs.FileMode) error {
 		return err
 	}
 
-	return fs.underlying.(billy.Dir).MkdirAll(fullpath, perm)
+	d, ok := fs.underlying.(billy.Dir)
+	if !ok {
+		return errors.New("underlying fs does not implement billy.Dir")
+	}
+	return d.MkdirAll(fullpath, perm)
 }
 
 func (fs *ChrootHelper) Lstat(filename string) (os.FileInfo, error) {
@@ -158,7 +172,11 @@ func (fs *ChrootHelper) Lstat(filename string) (os.FileInfo, error) {
 		return nil, err
 	}
 
-	return fs.underlying.(billy.Symlink).Lstat(fullpath)
+	sl, ok := fs.underlying.(billy.Symlink)
+	if !ok {
+		return nil, errors.New("underlying fs does not implement billy.Symlink")
+	}
+	return sl.Lstat(fullpath)
 }
 
 func (fs *ChrootHelper) Symlink(target, link string) error {
@@ -175,7 +193,11 @@ func (fs *ChrootHelper) Symlink(target, link string) error {
 		return err
 	}
 
-	return fs.underlying.(billy.Symlink).Symlink(target, link)
+	sl, ok := fs.underlying.(billy.Symlink)
+	if !ok {
+		return errors.New("underlying fs does not implement billy.Symlink")
+	}
+	return sl.Symlink(target, link)
 }
 
 func (fs *ChrootHelper) Readlink(link string) (string, error) {
@@ -184,7 +206,12 @@ func (fs *ChrootHelper) Readlink(link string) (string, error) {
 		return "", err
 	}
 
-	target, err := fs.underlying.(billy.Symlink).Readlink(fullpath)
+	sl, ok := fs.underlying.(billy.Symlink)
+	if !ok {
+		return "", errors.New("underlying fs does not implement billy.Symlink")
+	}
+
+	target, err := sl.Readlink(fullpath)
 	if err != nil {
 		return "", err
 	}
diff --git a/helper/chroot/chroot_test.go b/helper/chroot/chroot_test.go
@@ -353,6 +353,7 @@ func TestCapabilities(t *testing.T) {
 }
 
 func testCapabilities(t *testing.T, basic billy.Basic) {
+	t.Helper()
 	baseCapabilities := billy.Capabilities(basic)
 
 	fs := New(basic, "/foo")
diff --git a/helper/iofs/iofs_test.go b/helper/iofs/iofs_test.go
@@ -11,6 +11,7 @@ import (
 
 	billyfs "github.com/go-git/go-billy/v6"
 	"github.com/go-git/go-billy/v6/memfs"
+	"github.com/stretchr/testify/require"
 )
 
 type errorList interface {
@@ -30,7 +31,7 @@ func TestWithFSTest(t *testing.T) {
 	}
 	createdFiles := make([]string, 0, len(files))
 	for filename, contents := range files {
-		makeFile(memfs, t, filename, contents)
+		makeFile(t, memfs, filename, contents)
 		createdFiles = append(createdFiles, filename)
 	}
 
@@ -47,10 +48,11 @@ func TestWithFSTest(t *testing.T) {
 func TestDeletes(t *testing.T) {
 	t.Parallel()
 	memfs := memfs.New()
-	iofs := New(memfs).(fs.ReadFileFS)
+	iofs, ok := New(memfs).(fs.ReadFileFS)
+	require.True(t, ok)
 
-	makeFile(memfs, t, "foo.txt", "hello, world")
-	makeFile(memfs, t, "deleted", "nothing to see")
+	makeFile(t, memfs, "foo.txt", "hello, world")
+	makeFile(t, memfs, "deleted", "nothing to see")
 
 	if _, err := iofs.ReadFile("nonexistent"); err == nil {
 		t.Errorf("expected error for nonexistent file")
@@ -73,7 +75,7 @@ func TestDeletes(t *testing.T) {
 	}
 }
 
-func makeFile(fs billyfs.Basic, t *testing.T, filename string, contents string) {
+func makeFile(t *testing.T, fs billyfs.Basic, filename string, contents string) {
 	t.Helper()
 	file, err := fs.Create(filename)
 	if err != nil {
diff --git a/helper/mount/mount.go b/helper/mount/mount.go
@@ -1,6 +1,7 @@
 package mount
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"io/fs"
@@ -184,19 +185,37 @@ func (h *Mount) getBasicAndPath(path string) (billy.Basic, string) {
 func (h *Mount) getDirAndPath(path string) (billy.Dir, string, error) {
 	path = cleanPath(path)
 	if !h.isMountpoint(path) {
-		return h.underlying.(billy.Dir), path, nil
+		d, ok := h.underlying.(billy.Dir)
+		if !ok {
+			return nil, "", errors.New("underlying fs does not implement billy.Dir")
+		}
+		return d, path, nil
 	}
 
-	return h.source.(billy.Dir), h.mustRelToMountpoint(path), nil
+	d, ok := h.source.(billy.Dir)
+	if !ok {
+		return nil, "", errors.New("source fs does not implement billy.Dir")
+	}
+	return d, h.mustRelToMountpoint(path), nil
 }
 
 func (h *Mount) getSymlinkAndPath(path string) (billy.Symlink, string, error) {
 	path = cleanPath(path)
 	if !h.isMountpoint(path) {
-		return h.underlying.(billy.Symlink), path, nil
+		sl, ok := h.underlying.(billy.Symlink)
+		if !ok {
+			return nil, "", errors.New("underlying fs does not implement billy.Symlink")
+		}
+
+		return sl, path, nil
+	}
+
+	sl, ok := h.source.(billy.Symlink)
+	if !ok {
+		return nil, "", errors.New("source fs does not implement billy.Symlink")
 	}
 
-	return h.source.(billy.Symlink), h.mustRelToMountpoint(path), nil
+	return sl, h.mustRelToMountpoint(path), nil
 }
 
 func (h *Mount) mustRelToMountpoint(path string) string {
diff --git a/helper/mount/mount_test.go b/helper/mount/mount_test.go
@@ -377,6 +377,7 @@ func TestCapabilities(t *testing.T) {
 }
 
 func testCapabilities(t *testing.T, a, b billy.Basic) {
+	t.Helper()
 	aCapabilities := billy.Capabilities(a)
 	bCapabilities := billy.Capabilities(b)
 
diff --git a/helper/polyfill/polyfill.go b/helper/polyfill/polyfill.go
@@ -1,3 +1,4 @@
+//nolint:forcetypeassert
 package polyfill
 
 import (
diff --git a/helper/polyfill/polyfill_test.go b/helper/polyfill/polyfill_test.go
@@ -57,6 +57,7 @@ func TestCapabilities(t *testing.T) {
 }
 
 func testCapabilities(t *testing.T, basic billy.Basic) {
+	t.Helper()
 	baseCapabilities := billy.Capabilities(basic)
 
 	fs := New(basic)
diff --git a/memfs/memory.go b/memfs/memory.go
@@ -119,7 +119,9 @@ func (fs *Memory) Stat(filename string) (os.FileInfo, error) {
 	// the name of the file should always the name of the stated file, so we
 	// overwrite the Stat returned from the storage with it, since the
 	// filename may belong to a link.
-	fi.(*fileInfo).name = filepath.Base(filename)
+	if ffi, ok := fi.(*fileInfo); ok {
+		ffi.name = filepath.Base(filename)
+	}
 	return fi, nil
 }
 
diff --git a/osfs/os_bound_test.go b/osfs/os_bound_test.go
@@ -393,7 +393,7 @@ func TestReadLink(t *testing.T) {
 				return newBoundOS(cwd, true)
 			},
 			filename:        "symlink-file",
-			expected:        filepath.Join("cwd-target/file"),
+			expected:        filepath.FromSlash("cwd-target/file"),
 			makeExpectedAbs: true,
 		},
 		{
@@ -881,6 +881,7 @@ func TestRemoveAll(t *testing.T) {
 		{
 			name: "parent with children",
 			before: func(t *testing.T, dir string) billy.Filesystem {
+				t.Helper()
 				err := os.MkdirAll(filepath.Join(dir, "parent", "children"), 0o700)
 				require.NoError(t, err)
 				return newBoundOS(dir, true)
@@ -894,6 +895,7 @@ func TestRemoveAll(t *testing.T) {
 		{
 			name: "same dir file",
 			before: func(t *testing.T, dir string) billy.Filesystem {
+				t.Helper()
 				err := os.WriteFile(filepath.Join(dir, "test-file"), []byte("anything"), 0o600)
 				require.NoError(t, err)
 				return newBoundOS(dir, true)
@@ -903,6 +905,7 @@ func TestRemoveAll(t *testing.T) {
 		{
 			name: "same dir symlink",
 			before: func(t *testing.T, dir string) billy.Filesystem {
+				t.Helper()
 				target := filepath.Join(dir, "target-file")
 				err := os.WriteFile(target, []byte("anything"), 0o600)
 				require.NoError(t, err)
@@ -915,6 +918,7 @@ func TestRemoveAll(t *testing.T) {
 		{
 			name: "rel path to file above cwd",
 			before: func(t *testing.T, dir string) billy.Filesystem {
+				t.Helper()
 				err := os.WriteFile(filepath.Join(dir, "rel-above-cwd"), []byte("anything"), 0o600)
 				require.NoError(t, err)
 				return newBoundOS(dir, true)
@@ -924,6 +928,7 @@ func TestRemoveAll(t *testing.T) {
 		{
 			name: "abs file",
 			before: func(t *testing.T, dir string) billy.Filesystem {
+				t.Helper()
 				err := os.WriteFile(filepath.Join(dir, "abs-test-file"), []byte("anything"), 0o600)
 				require.NoError(t, err)
 				return newBoundOS(dir, true)
@@ -934,6 +939,7 @@ func TestRemoveAll(t *testing.T) {
 		{
 			name: "abs symlink",
 			before: func(t *testing.T, dir string) billy.Filesystem {
+				t.Helper()
 				err := os.Symlink("/etc/passwd", filepath.Join(dir, "symlink"))
 				require.NoError(t, err)
 				return newBoundOS(dir, true)
diff --git a/test/basic_test.go b/test/basic_test.go
@@ -491,6 +491,7 @@ func TestRename(t *testing.T) {
 		{
 			name: "file rename",
 			before: func(t *testing.T, fs Filesystem) {
+				t.Helper()
 				root := fsRoot(fs)
 				f, err := fs.Create(fs.Join(root, "foo"))
 				require.NoError(t, err)
@@ -503,6 +504,7 @@ func TestRename(t *testing.T) {
 		{
 			name: "dir rename",
 			before: func(t *testing.T, fs Filesystem) {
+				t.Helper()
 				root := fsRoot(fs)
 				f, err := fs.Create(fs.Join(root, "foo", "bar1"))
 				require.NoError(t, err)
diff --git a/test/bench_test.go b/test/bench_test.go
@@ -141,6 +141,7 @@ func read(n string, of func(string) (io.ReadSeekCloser, error)) func(b *testing.
 }
 
 func prepFS(b *testing.B, f io.WriteCloser) {
+	b.Helper()
 	defer f.Close()
 
 	content := make([]byte, contentSize)
diff --git a/test/dir_test.go b/test/dir_test.go
diff --git a/test/fs_test.go b/test/fs_test.go
diff --git a/test/symlink_test.go b/test/symlink_test.go
diff --git a/test/tempfile_test.go b/test/tempfile_test.go

Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,7 @@ func TestCapabilities(t *testing.T) {`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`func testCapabilities(t *testing.T, basic billy.Basic) {`
	`356`	`+ t.Helper()`
`356`	`357`	`baseCapabilities := billy.Capabilities(basic)`
`357`	`358`
`358`	`359`	`fs := New(basic, "/foo")`
Original file line number	Diff line number	Diff line change
`@@ -377,6 +377,7 @@ func TestCapabilities(t *testing.T) {`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`func testCapabilities(t *testing.T, a, b billy.Basic) {`
	`380`	`+ t.Helper()`
`380`	`381`	`aCapabilities := billy.Capabilities(a)`
`381`	`382`	`bCapabilities := billy.Capabilities(b)`
`382`	`383`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//nolint:forcetypeassert`
`1`	`2`	`package polyfill`
`2`	`3`
`3`	`4`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ func TestCapabilities(t *testing.T) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`func testCapabilities(t *testing.T, basic billy.Basic) {`
	`60`	`+ t.Helper()`
`60`	`61`	`baseCapabilities := billy.Capabilities(basic)`
`61`	`62`
`62`	`63`	`fs := New(basic)`