build: Expand golangci linters

Signed-off-by: Paulo Gomes <[email protected]>

Author: pjbgf

.golangci.yaml

@@ -1,74 +1,21 @@
+run:
+  concurrency: 3
+  timeout: 4m
+
 linters:
-  disable-all: true
-  enable:
-    - asasalint
-    - asciicheck
-    - bidichk
-    - bodyclose
-    - containedctx
-    - contextcheck
-    - decorder
-    - dogsled
-    - dupl
-    - dupword
-    - durationcheck
-    - errcheck
-    - errchkjson
-    - errname
-    - errorlint
+  enable-all: true
+  disable:
+    - depguard
+    - err113
     - execinquery
-    - exhaustive
+    - exhaustruct
     - exportloopref
-    - forcetypeassert
-    - ginkgolinter
-    - gocheckcompilerdirectives
-    - gochecknoinits
-    - gochecksumtype
-    - goconst
-    - gofmt
-    - goheader
-    - goimports
-    - gomodguard
-    - goprintffuncname
-    - gosec
-    - gosimple
-    - gosmopolitan
-    - govet
-    - grouper
-    - importas
-    - ineffassign
-    - loggercheck
-    - makezero
-    - mirror
-    - misspell
-    - nakedret
-    - nestif
-    - nilerr
-    - nilnil
-    - noctx
-    - nolintlint
-    - nosprintfhostport
-    - prealloc
-    - predeclared
-    - promlinter
-    - reassign
-    - revive
-    - rowserrcheck
-    - sloglint
-    - spancheck
-    - sqlclosecheck
-    - stylecheck
-    - tagalign
-    - tagliatelle
-    - tenv
-    - testableexamples
-    - testifylint
-    - thelper
-    - typecheck
-    - unconvert
-    - unparam
-    - unused
-    - usestdlibvars
-    - wastedassign
-    - whitespace
-    - zerologlint
+    - funlen
+    - gomnd
+    - ireturn
+    - mnd
+    - varnamelen
+    - wrapcheck
+    - wsl
+
+linters-settings:

fixtures.go

@@ -13,11 +13,13 @@ import (
 	"github.com/go-git/go-git-fixtures/v5/internal/tgz"
 )
 
+//nolint:gochecknoglobals
 var Filesystem = embedfs.New(&data)
 
 //go:embed data
 var data embed.FS
 
+//nolint:gochecknoglobals
 var fixtures = Fixtures{{
 	Tags:         []string{"packfile", "ofs-delta", ".git", "root-reference"},
 	URL:          "https://github.com/git-fixtures/root-references.git",
@@ -144,12 +146,14 @@ var fixtures = Fixtures{{
 	Tags:         []string{"worktree", "dirty"},
 	WorktreeHash: "7203669c66103305e56b9dcdf940a7fbeb515f28",
 }, {
-	Tags:         []string{"packfile", "standalone"}, // standalone packfile that does not have any dependencies nor is part of any other fixture repo
+	// standalone packfile that does not have any dependencies nor is part of any other fixture repo.
+	Tags:         []string{"packfile", "standalone"},
 	PackfileHash: "3638209d310e10ea8d90c362d568be65dd5e03a6",
 }, {
-	Tags:         []string{"thinpack"}, // adds commit on top of spinnaker fixture 06ce06d0fc49646c4de733c45b7788aabad98a6f via a thin pack
+	// adds commit on top of spinnaker fixture 06ce06d0fc49646c4de733c45b7788aabad98a6f via a thin pack.
+	Tags:         []string{"thinpack"},
 	PackfileHash: "ee4fef0ef8be5053ebae4ce75acf062ddf3031fb",
-	Head:         "ee372bb08322c1e6e7c6c4f953cc6bf72784e7fb", // the thin pack adds this commit
+	Head:         "ee372bb08322c1e6e7c6c4f953cc6bf72784e7fb", // the thin pack adds this commit.
 }, {
 	Tags:       []string{"merge-base"},
 	DotGitHash: "26baa505b9f6fb2024b9999c140b75514718c988",
@@ -264,6 +268,7 @@ func (f *Fixture) DotGit(opts ...Option) billy.Filesystem {
 
 	if f.DotGitHash == "" && f.WorktreeHash != "" {
 		fs, _ := f.Worktree(opts...).Chroot(".git")
+
 		return fs
 	}
 
@@ -288,7 +293,7 @@ func (f *Fixture) DotGit(opts ...Option) billy.Filesystem {
 // EnsureIsBare overrides the config file with one where bare is true.
 func EnsureIsBare(fs billy.Filesystem) error {
 	if _, err := fs.Stat("config"); err != nil {
-		fmt.Printf("not .git folder: %s\n", err)
+		return fmt.Errorf("not .git folder: %w", err)
 	}
 
 	cfg, err := fs.OpenFile("config", os.O_TRUNC|os.O_WRONLY, 0)
@@ -308,6 +313,7 @@ func EnsureIsBare(fs billy.Filesystem) error {
 	)
 
 	_, err = io.Copy(cfg, content)
+
 	return err
 }
 
@@ -352,6 +358,7 @@ func (g Fixtures) One() *Fixture {
 	if len(g) == 0 {
 		return nil
 	}
+
 	return g[0]
 }
 

fixtures_test.go

@@ -1,30 +1,32 @@
-package fixtures
+package fixtures_test
 
 import (
 	"testing"
 
+	fixtures "github.com/go-git/go-git-fixtures/v5"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestDotGit(t *testing.T) {
 	t.Parallel()
 
-	fs := Basic().One().DotGit(WithTargetDir(t.TempDir))
+	fs := fixtures.Basic().One().DotGit(fixtures.WithTargetDir(t.TempDir))
 	files, err := fs.ReadDir("/")
 	require.NoError(t, err)
 	assert.Greater(t, len(files), 1)
 
-	fs = Basic().One().DotGit(WithMemFS())
+	fs = fixtures.Basic().One().DotGit(fixtures.WithMemFS())
 	files, err = fs.ReadDir("/")
 	require.NoError(t, err)
 	assert.Greater(t, len(files), 1)
 }
 
+//nolint:cyclop
 func TestEmbeddedFiles(t *testing.T) {
 	t.Parallel()
 
-	for i, f := range fixtures {
+	for i, f := range fixtures.All() {
 		if f.PackfileHash != "" {
 			if f.Packfile() == nil {
 				assert.Fail(t, "failed to get pack file", i)
@@ -36,21 +38,21 @@ func TestEmbeddedFiles(t *testing.T) {
 		}
 
 		if f.WorktreeHash != "" {
-			if f.Worktree(WithMemFS()) == nil {
+			if f.Worktree(fixtures.WithMemFS()) == nil {
 				assert.Fail(t, "[mem] failed to get worktree", i)
 			}
 
-			if f.Worktree(WithTargetDir(t.TempDir)) == nil {
+			if f.Worktree(fixtures.WithTargetDir(t.TempDir)) == nil {
 				assert.Fail(t, "[tempdir] failed to get worktree", i)
 			}
 		}
 
 		if f.DotGitHash != "" {
-			if f.DotGit(WithMemFS()) == nil {
+			if f.DotGit(fixtures.WithMemFS()) == nil {
 				assert.Fail(t, "[mem] failed to get dotgit", i)
 			}
 
-			if f.DotGit(WithTargetDir(t.TempDir)) == nil {
+			if f.DotGit(fixtures.WithTargetDir(t.TempDir)) == nil {
 				assert.Fail(t, "[tempdir] failed to get dotgit", i)
 			}
 		}
@@ -60,7 +62,7 @@ func TestEmbeddedFiles(t *testing.T) {
 func TestRevFiles(t *testing.T) {
 	t.Parallel()
 
-	f := ByTag("packfile-sha256").One()
+	f := fixtures.ByTag("packfile-sha256").One()
 
 	assert.NotNil(t, f)
 	assert.NotNil(t, f.Rev(), "failed to get rev file")

internal/embedfs/embed.go

@@ -20,7 +20,7 @@ type Embed struct {
 	underlying *embed.FS
 }
 
-func New(efs *embed.FS) billy.Filesystem {
+func New(efs *embed.FS) *Embed {
 	fs := &Embed{
 		underlying: efs,
 	}
@@ -41,6 +41,7 @@ func (fs *Embed) Stat(filename string) (os.FileInfo, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	return f.Stat()
 }
 
@@ -74,6 +75,7 @@ func (fs *Embed) OpenFile(filename string, flag int, _ os.FileMode) (billy.File,
 
 	// Only load the bytes to memory if the files is needed.
 	lazyFunc := func() *bytes.Reader { return bytes.NewReader(data) }
+
 	return toFile(lazyFunc, fi), nil
 }
 
@@ -84,9 +86,11 @@ func (fs *Embed) Join(elem ...string) string {
 	for i, el := range elem {
 		if el != "" {
 			clean := filepath.Clean(strings.Join(elem[i:], "/"))
+
 			return filepath.ToSlash(clean)
 		}
 	}
+
 	return ""
 }
 

internal/embedfs/embed_test.go

@@ -1,4 +1,4 @@
-package embedfs
+package embedfs_test
 
 import (
 	"embed"
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/go-git/go-billy/v5"
+	"github.com/go-git/go-git-fixtures/v5/internal/embedfs"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -18,6 +19,7 @@ var singleFile embed.FS
 //go:embed testdata
 var testdataDir embed.FS
 
+//nolint:gochecknoglobals
 var empty embed.FS
 
 func TestOpen(t *testing.T) {
@@ -43,8 +45,11 @@ func TestOpen(t *testing.T) {
 	}
 
 	for _, tc := range tests {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			fs := New(&testdataDir)
+			t.Parallel()
+
+			fs := embedfs.New(&testdataDir)
 
 			var got []byte
 			f, err := fs.Open(tc.name)
@@ -114,8 +119,11 @@ func TestOpenFileFlags(t *testing.T) {
 	}
 
 	for _, tc := range tests {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			fs := New(&testdataDir)
+			t.Parallel()
+
+			fs := embedfs.New(&testdataDir)
 
 			_, err := fs.OpenFile(tc.file, tc.flag, 0o700)
 			if tc.wantErr != "" {
@@ -156,8 +164,11 @@ func TestStat(t *testing.T) {
 	}
 
 	for _, tc := range tests {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			fs := New(&testdataDir)
+			t.Parallel()
+
+			fs := embedfs.New(&testdataDir)
 
 			fi, err := fs.Stat(tc.name)
 			if tc.wantErr {
@@ -212,8 +223,11 @@ func TestReadDir(t *testing.T) {
 	}
 
 	for _, tc := range tests {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			fs := New(tc.fs)
+			t.Parallel()
+
+			fs := embedfs.New(tc.fs)
 
 			fis, err := fs.ReadDir(tc.path)
 			if tc.wantErr {
@@ -241,7 +255,7 @@ func TestReadDir(t *testing.T) {
 func TestUnsupported(t *testing.T) {
 	t.Parallel()
 
-	fs := New(&testdataDir)
+	fs := embedfs.New(&testdataDir)
 
 	_, err := fs.Create("test")
 	require.ErrorIs(t, err, billy.ErrReadOnly)
@@ -259,7 +273,7 @@ func TestUnsupported(t *testing.T) {
 func TestFileUnsupported(t *testing.T) {
 	t.Parallel()
 
-	fs := New(&testdataDir)
+	fs := embedfs.New(&testdataDir)
 
 	f, err := fs.Open("testdata/empty.txt")
 	require.NoError(t, err)
@@ -272,8 +286,9 @@ func TestFileUnsupported(t *testing.T) {
 	require.ErrorIs(t, err, billy.ErrReadOnly)
 }
 
+//nolint:paralleltest
 func TestFileSeek(t *testing.T) {
-	fs := New(&testdataDir)
+	fs := embedfs.New(&testdataDir)
 
 	f, err := fs.Open("testdata/empty2.txt")
 	require.NoError(t, err)
@@ -295,6 +310,7 @@ func TestFileSeek(t *testing.T) {
 	}
 
 	for i, tc := range tests {
+		tc := tc
 		t.Run(fmt.Sprintf("#%d", i), func(t *testing.T) {
 			_, err = f.Seek(tc.seekOff, tc.seekWhence)
 			require.NoError(t, err)
@@ -309,6 +325,8 @@ func TestFileSeek(t *testing.T) {
 }
 
 func TestJoin(t *testing.T) {
+	t.Parallel()
+
 	tests := []struct {
 		name string
 		path []string
@@ -337,8 +355,11 @@ func TestJoin(t *testing.T) {
 	}
 
 	for _, tc := range tests {
+		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
-			fs := New(&empty)
+			t.Parallel()
+
+			fs := embedfs.New(&empty)
 
 			got := fs.Join(tc.path...)
 			assert.Equal(t, tc.want, got)