fix: fix lint error

Author: fatelei

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25'
+          go-version: "1.25"
       - name: Login ghcr
         uses: docker/login-action@v3
         with:
@@ -26,7 +26,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.48.0
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.5.0
           export PATH=$PATH:$(go env GOPATH)/bin
           make check
           make build

.golangci.yml

@@ -1,22 +1,29 @@
-# https://golangci-lint.run/usage/configuration#config-file
-
+version: "2"
 linters:
   enable:
-    - structcheck
-    - varcheck
-    - staticcheck
-    - unconvert
-    - gofmt
-    - goimports
-    - revive
-    - ineffassign
-    - vet
-    - unused
     - misspell
+    - revive
+    - unconvert
   disable:
     - errcheck
-
-run:
-  deadline: 4m
-  skip-dirs:
-    - misc
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

cmd/store/main.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"fmt"
+	"log/slog"
 	"os"
 	"os/signal"
-	"syscall"
-	"log/slog"
 	"path/filepath"
+	"syscall"
 
 	"github.com/containerd/nydus-snapshotter/cmd/containerd-nydus-grpc/pkg/command"
 	"github.com/containerd/nydus-snapshotter/config"
@@ -19,7 +19,7 @@ import (
 	"github.com/containers/nydus-storage-plugin/pkg/services/keychain/dockerconfig"
 	podmanauth "github.com/containers/nydus-storage-plugin/pkg/services/keychain/podmanauth"
 	"github.com/containers/nydus-storage-plugin/pkg/services/resolver"
- )
+)
 
 func waitForSIGINT() {
 	c := make(chan os.Signal, 1)
@@ -31,27 +31,35 @@ func parseOctalMode(s string) (uint32, error) {
 	var v uint32
 	for i := 0; i < len(s); i++ {
 		c := s[i]
-		if c < '0' || c > '7' { return 0, fmt.Errorf("invalid octal: %s", s) }
+		if c < '0' || c > '7' {
+			return 0, fmt.Errorf("invalid octal: %s", s)
+		}
 		v = (v << 3) | uint32(c-'0')
 	}
 	return v, nil
 }
 
-func setupSlog(level string, toStdout bool, logDir string, root string) error {
+func setupSlog(level string, toStdout bool, logDir string) error {
 	var lvl slog.Level
 	switch level {
-	case "debug": lvl = slog.LevelDebug
-	case "warn", "warning": lvl = slog.LevelWarn
-	case "error": lvl = slog.LevelError
-	default: lvl = slog.LevelInfo
+	case "debug":
+		lvl = slog.LevelDebug
+	case "warn", "warning":
+		lvl = slog.LevelWarn
+	case "error":
+		lvl = slog.LevelError
+	default:
+		lvl = slog.LevelInfo
 	}
 	var w *os.File
 	if toStdout || logDir == "" {
 		w = os.Stdout
 	} else {
 		path := filepath.Join(logDir, "nydus-store.log")
 		f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
-		if err != nil { return err }
+		if err != nil {
+			return err
+		}
 		w = f
 	}
 	h := slog.NewTextHandler(w, &slog.HandlerOptions{Level: lvl})
@@ -65,13 +73,13 @@ func main() {
 		Name:    "crio nydus store",
 		Usage:   "crio nydus store plugin",
 		Version: "0.0.0",
-		Flags:   append(flags.F,
+		Flags: append(flags.F,
 			&cli.StringFlag{Name: "fs-file-mode", Usage: "octal file mode for files (e.g. 0400)"},
 			&cli.StringFlag{Name: "fs-dir-mode", Usage: "octal dir mode (e.g. 0500)"},
 			&cli.StringFlag{Name: "fs-link-mode", Usage: "octal symlink mode (e.g. 0400)"},
 		),
 		Action: func(c *cli.Context) error {
-			if err := setupSlog(flags.Args.LogLevel, flags.Args.LogToStdout, flags.Args.LogDir, flags.Args.RootDir); err != nil {
+			if err := setupSlog(flags.Args.LogLevel, flags.Args.LogToStdout, flags.Args.LogDir); err != nil {
 				return errors.Wrap(err, "failed to prepare logger")
 			}
 
@@ -91,7 +99,7 @@ func main() {
 					dockerconfig.NewDockerconfigKeychain(c.Context),
 					// Podman-compatible auth.json
 					podmanauth.NewPodmanAuthKeychain(c.Context),
-				}..., 
+				}...,
 			)
 			layManager, err := manager.NewLayerManager(c.Context, flags.Args.RootDir, hosts, &cfg)
 			if err != nil {
@@ -103,13 +111,19 @@ func main() {
 			dirMode := fs.DefaultDirMode()
 			linkMode := fs.DefaultLinkMode()
 			if v := c.String("fs-file-mode"); v != "" {
-				if m, err := parseOctalMode(v); err == nil { fileMode = m }
+				if m, err := parseOctalMode(v); err == nil {
+					fileMode = m
+				}
 			}
 			if v := c.String("fs-dir-mode"); v != "" {
-				if m, err := parseOctalMode(v); err == nil { dirMode = m }
+				if m, err := parseOctalMode(v); err == nil {
+					dirMode = m
+				}
 			}
 			if v := c.String("fs-link-mode"); v != "" {
-				if m, err := parseOctalMode(v); err == nil { linkMode = m }
+				if m, err := parseOctalMode(v); err == nil {
+					linkMode = m
+				}
 			}
 
 			// Recover orphan bind mounts from previous crashes

pkg/cache/lrucache.go

@@ -23,7 +23,7 @@ type LRUCache struct {
 // NewLRUCache creates new lru cache.
 func NewLRUCache(maxEntries int) *LRUCache {
 	inner := lru.New(maxEntries)
-	inner.OnEvicted = func(key lru.Key, value interface{}) {
+	inner.OnEvicted = func(_ lru.Key, value interface{}) {
 		// Decrease the ref count incremented in Add().
 		// When nobody refers to this value, this value will be finalized via refCounter.
 		value.(*refCounter).finalize()

pkg/fs/blob_file.go

@@ -14,7 +14,7 @@ type blobFile struct {
 
 var _ = (fusefs.FileReader)((*blobFile)(nil))
 
-func (f *blobFile) Read(ctx context.Context, dest []byte, off int64) (fuse.ReadResult, syscall.Errno) {
+func (f *blobFile) Read(_ context.Context, _ []byte, _ int64) (fuse.ReadResult, syscall.Errno) {
 	//s, err := f.l.ReadAt(dest, off,
 	//	remote.WithContext(ctx),              // Make cancellable
 	//	remote.WithCacheOpts(cache.Direct()), // Do not pollute mem cache
@@ -28,7 +28,7 @@ func (f *blobFile) Read(ctx context.Context, dest []byte, off int64) (fuse.ReadR
 
 var _ = (fusefs.FileGetattrer)((*blobFile)(nil))
 
-func (f *blobFile) Getattr(ctx context.Context, out *fuse.AttrOut) syscall.Errno {
+func (f *blobFile) Getattr(_ context.Context, _ *fuse.AttrOut) syscall.Errno {
 	//layerToAttr(f.l, &out.Attr)
 	return 0
 }

pkg/fs/blob_file_test.go

@@ -9,15 +9,15 @@ import (
 
 func TestBlobFileReadEIO(t *testing.T) {
 	bf := &blobFile{}
-if rr, eno := bf.Read(context.Background(), nil, 0); eno == 0 || rr != nil {
+	if rr, eno := bf.Read(context.Background(), nil, 0); eno == 0 || rr != nil {
 		t.Fatalf("expected EIO and nil read result, got eno=%d rr=%v", eno, rr)
 	}
 }
 
 func TestBlobFileGetattrNoError(t *testing.T) {
 	bf := &blobFile{}
 	var out fuse.AttrOut
-if eno := bf.Getattr(context.Background(), &out); eno != 0 {
+	if eno := bf.Getattr(context.Background(), &out); eno != 0 {
 		t.Fatalf("Getattr returned errno=%d", eno)
 	}
 }

pkg/fs/blob_node.go

@@ -20,6 +20,6 @@ var _ = (fusefs.InodeEmbedder)((*blobNode)(nil))
 
 var _ = (fusefs.NodeOpener)((*blobNode)(nil))
 
-func (n *blobNode) Open(ctx context.Context, flags uint32) (fh fusefs.FileHandle, fuseFlags uint32, errno syscall.Errno) {
+func (n *blobNode) Open(_ context.Context, _ uint32) (fh fusefs.FileHandle, fuseFlags uint32, errno syscall.Errno) {
 	return &blobFile{}, 0, 0
 }

pkg/fs/blob_node_test.go

@@ -7,7 +7,7 @@ import (
 
 func TestBlobNodeOpenReturnsBlobFile(t *testing.T) {
 	n := &blobNode{}
-fh, _, eno := n.Open(context.Background(), 0)
+	fh, _, eno := n.Open(context.Background(), 0)
 	if eno != 0 {
 		t.Fatalf("Open errno=%d", eno)
 	}

pkg/fs/diff_node.go

@@ -15,7 +15,7 @@ type diffNode struct {
 	fs   *fs
 }
 
-func (n *diffNode) Getattr(ctx context.Context, f fusefs.FileHandle, out *fuse.AttrOut) syscall.Errno {
+func (n *diffNode) Getattr(_ context.Context, _ fusefs.FileHandle, out *fuse.AttrOut) syscall.Errno {
 	copyAttr(&out.Attr, &n.attr)
 	return 0
 }

pkg/fs/diff_node_test.go

@@ -14,8 +14,8 @@ func TestDiffNodeGetattrCopiesAttr(t *testing.T) {
 	if eno := d.Getattr(context.Background(), nil, &out); eno != 0 {
 		t.Fatalf("Getattr errno=%d", eno)
 	}
-	if out.Attr.Mode != d.attr.Mode {
-		t.Fatalf("mode mismatch: got %o want %o", out.Attr.Mode, d.attr.Mode)
+	if out.Mode != d.attr.Mode {
+		t.Fatalf("mode mismatch: got %o want %o", out.Mode, d.attr.Mode)
 	}
 }