switch to golangci-lint v2

Signed-off-by: Avi Deitcher <[email protected]>

Author: deitch

.github/workflows/ci.yaml

@@ -53,10 +53,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+        uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.24
       - run: go build
       - name: vet
         if: matrix.os != 'windows-latest'

.golangci.yml

@@ -1,56 +1,72 @@
-linters-settings:
-  errcheck:
-    check-type-assertions: true
-  goconst:
-    min-len: 2
-    min-occurrences: 3
-  gocritic:
-    enabled-tags:
-      - diagnostic
-      - experimental
-      - opinionated
-      - performance
-      - style
-  govet:
-    check-shadowing: false
-  nolintlint:
-    require-explanation: true
-    require-specific: true
-  gosec:
-    excludes:
-      - G115
-
+version: "2"
+run:
+  issues-exit-code: 1
 linters:
-  disable-all: true
+  default: none
   enable:
     - bodyclose
+    - copyloopvar
     - dogsled
     - dupl
     - errcheck
-    - copyloopvar
     - exhaustive
     - gocritic
-    - gofmt
-    - goimports
     - gocyclo
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - misspell
-    - nolintlint
     - nakedret
+    - nolintlint
     - prealloc
     - predeclared
     - revive
     - staticcheck
-    - stylecheck
     - thelper
     - tparallel
-    - typecheck
     - unconvert
     - unparam
     - whitespace
-
-run:
-  issues-exit-code: 1
+  settings:
+    errcheck:
+      check-type-assertions: true
+    goconst:
+      min-len: 2
+      min-occurrences: 3
+    gocritic:
+      enabled-tags:
+        - diagnostic
+        - experimental
+        - opinionated
+        - performance
+        - style
+    gosec:
+      excludes:
+        - G115
+    govet:
+      disable:
+        - shadow
+    nolintlint:
+      require-explanation: true
+      require-specific: true
+  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$

Makefile

@@ -6,7 +6,7 @@ GOENV ?= GO111MODULE=on CGO_ENABLED=0
 GO_FILES ?= $(shell $(GOENV) go list ./...)
 GOBIN ?= $(shell go env GOPATH)/bin
 LINTER ?= $(GOBIN)/golangci-lint
-LINTER_VERSION ?= v1.61.0
+LINTER_VERSION ?= v2.0.2
 
 # BUILDARCH is the host architecture
 # ARCH is the target architecture

diskfs.go

@@ -128,12 +128,14 @@ func initDisk(b backend.Storage, sectorSize SectorSize) (*disk.Disk, error) {
 			return nil, backend.ErrNotSuitable
 		}
 
+		//nolint:revive // revive thinks we can drop the 'else' statement, but we need it to capture the size
 		if size, err := getBlockDeviceSize(osFile); err != nil {
 			return nil, fmt.Errorf("error getting block device %s size: %s", devInfo.Name(), err)
 		} else {
 			newDisk.Size = size
 		}
 
+		//nolint:revive // revive thinks we can drop the 'else' statement, but we need it to capture the size
 		if lblksize, pblksize, err = getSectorSizes(osFile); err != nil {
 			return nil, fmt.Errorf("unable to get block sizes for device %s: %v", devInfo.Name(), err)
 		} else {

examples/efi_create.go

@@ -14,14 +14,13 @@ import (
 )
 
 func CreateEfi(diskImg string) {
-
 	var (
-		espSize          int64 = 100 * 1024 * 1024     // 100 MB
-		diskSize         int64 = espSize + 4*1024*1024 // 104 MB
+		espSize          int64 = 100 * 1024 * 1024 // 100 MB
 		blkSize          int64 = 512
 		partitionStart   int64 = 2048
-		partitionSectors int64 = espSize / blkSize
-		partitionEnd     int64 = partitionSectors - partitionStart + 1
+		diskSize               = espSize + 4*1024*1024 // 104 MB
+		partitionSectors       = espSize / blkSize
+		partitionEnd           = partitionSectors - partitionStart + 1
 	)
 
 	// create a disk image
@@ -32,23 +31,37 @@ func CreateEfi(diskImg string) {
 	// create a partition table
 	table := &gpt.Table{
 		Partitions: []*gpt.Partition{
-			&gpt.Partition{Start: uint64(partitionStart), End: uint64(partitionEnd), Type: gpt.EFISystemPartition, Name: "EFI System"},
+			{Start: uint64(partitionStart), End: uint64(partitionEnd), Type: gpt.EFISystemPartition, Name: "EFI System"},
 		},
 	}
 	// apply the partition table
 	err = disk.Partition(table)
+	if err != nil {
+		log.Panic(err)
+	}
 
 	/*
 	 * create an ESP partition with some contents
 	 */
 	kernel, err := os.ReadFile("/some/kernel/file")
+	if err != nil {
+		log.Panic(err)
+	}
 
 	spec := diskpkg.FilesystemSpec{Partition: 1, FSType: filesystem.TypeFat32}
 	fs, err := disk.CreateFilesystem(spec)
+	if err != nil {
+		log.Panic(err)
+	}
 
 	// make our directories
-	err = fs.Mkdir("/EFI/BOOT")
+	if err = fs.Mkdir("/EFI/BOOT"); err != nil {
+		log.Panic(err)
+	}
 	rw, err := fs.OpenFile("/EFI/BOOT/BOOTX64.EFI", os.O_CREATE|os.O_RDWR)
+	if err != nil {
+		log.Panic(err)
+	}
 
 	n, err := rw.Write(kernel)
 	if err != nil {

examples/iso_info.go

@@ -48,7 +48,11 @@ func fileInfoFor(path string, fs filesystem.FileSystem) error {
 			continue
 		}
 
-		myFile := isoFile.(*iso9660.File)
+		myFile, ok := isoFile.(*iso9660.File)
+		if !ok {
+			fmt.Printf("Failed to cast to iso9660.File for %s\n", fullPath)
+			continue
+		}
 		fmt.Printf("%s\n Size: %d\n Location: %d\n\n", fullPath, file.Size(), myFile.Location())
 	}
 	return nil

examples/serve-image/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"log"
 	"net/http"
 	"os"
@@ -13,15 +14,10 @@ import (
 	"github.com/diskfs/go-diskfs/filesystem/squashfs"
 )
 
-func main() {
-	filename := flag.String("filename", "", "File to serve")
-	addr := flag.String("addr", ":8100", "address & port to server on")
-	fsType := flag.String("type", "iso9660", "Filesystem type (iso9660, fat32, squashfs)")
-	flag.Parse()
-
+func serve(filename, addr, fsType *string) error {
 	f, err := os.Open(*filename)
 	if err != nil {
-		log.Fatalf("Cannot open %q: %s", *filename, err)
+		return fmt.Errorf("cannot open %q: %s", *filename, err)
 	}
 	b := file.New(f, true)
 
@@ -35,15 +31,26 @@ func main() {
 	case "squashfs":
 		fs, err = squashfs.Read(b, 0, 0, 0)
 	default:
-		log.Fatalf("Unknown filesystem type %q", *fsType)
+		return fmt.Errorf("unknown filesystem type %q", *fsType)
 	}
 	if err != nil {
-		log.Fatalf("Cannot open %s image in %q: %s", *fsType, *filename, err)
+		return fmt.Errorf("cannot open %s image in %q: %s", *fsType, *filename, err)
 	}
 
 	http.Handle("/", http.FileServer(http.FS(filesystem.FS(fs))))
 
 	log.Printf("Serving %q on HTTP port: %s\n", *filename, *addr)
-	log.Fatal(http.ListenAndServe(*addr, nil))
+	//nolint:gosec // we know this violates G114, but it is just an example
+	return http.ListenAndServe(*addr, nil)
+}
 
+func main() {
+	filename := flag.String("filename", "", "File to serve")
+	addr := flag.String("addr", ":8100", "address & port to server on")
+	fsType := flag.String("type", "iso9660", "Filesystem type (iso9660, fat32, squashfs)")
+	flag.Parse()
+
+	if err := serve(filename, addr, fsType); err != nil {
+		log.Fatalf("Error serving: %s", err)
+	}
 }

filesystem/fat32/common_test.go

@@ -250,6 +250,7 @@ func testGetValidDirectoryEntriesFromFile(dirFilePath, dirEntryPattern string, f
 	// ignore entries for . and ..
 	dirEntriesSubset := dirEntries
 	for {
+		//nolint:staticcheck // could lift into for loop, but this is easier to read
 		if len(dirEntriesSubset) == 0 || (dirEntriesSubset[0].filenameShort != "." && dirEntriesSubset[0].filenameShort != "..") {
 			break
 		}

filesystem/fat32/directoryentry.go

@@ -23,8 +23,6 @@ const (
 var validShortNameCharacters, _ = asciiset.MakeASCIISet("!#$%&'()-0123456789@ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`{}~")
 
 // directoryEntry is a single directory entry
-//
-//nolint:structcheck // we are willing to leave unused elements here so that we can know their reference
 type directoryEntry struct {
 	filenameShort      string
 	fileExtension      string

filesystem/fat32/fat32.go

@@ -44,7 +44,7 @@ const (
 	maxCharsLongFilename int        = 13
 )
 
-//nolint:deadcode,varcheck,unused // we need these references in the future
+//nolint:unused // we need these references in the future
 const (
 	minClusterSize int = 128
 	maxClusterSize int = 65529

filesystem/fat32/fat32_test.go

@@ -17,7 +17,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/diskfs/go-diskfs"
+	diskfs "github.com/diskfs/go-diskfs"
 	"github.com/diskfs/go-diskfs/backend"
 	"github.com/diskfs/go-diskfs/backend/file"
 	"github.com/diskfs/go-diskfs/disk"

filesystem/fat32/fsinfosector.go

@@ -19,10 +19,8 @@ const (
 
 const (
 	// unknownFreeDataClusterCount is the fixed flag for unknown number of free data clusters
-	//nolint:varcheck,deadcode // keep for future reference
 	unknownFreeDataClusterCount uint32 = 0xffffffff
 	// unknownlastAllocatedCluster is the fixed flag for unknown most recently allocated cluster
-	//nolint:varcheck,deadcode // keep for future reference
 	unknownlastAllocatedCluster uint32 = 0xffffffff
 )
 

filesystem/iso9660/directoryentry.go

@@ -400,7 +400,7 @@ func (de *directoryEntry) getLocation(p string) (location, size uint32, err erro
 						return 0, 0, fmt.Errorf("extension %s count not find a filename property: %v", e.ID(), err2)
 					default:
 						checkFilename = filename
-						//nolint:gosimple // redundant break, but we want this explicit
+						//nolint:staticcheck // redundant break, but we want this explicit
 						break
 					}
 				}
@@ -459,7 +459,7 @@ func (de *directoryEntry) Name() string {
 				continue
 			default:
 				name = filename
-				//nolint:gosimple // redundant break, but we want this explicit
+				//nolint:staticcheck // redundant break, but we want this explicit
 				break
 			}
 		}

filesystem/iso9660/eltorito.go

@@ -10,7 +10,7 @@ import (
 	"github.com/diskfs/go-diskfs/util"
 )
 
-//nolint:deadcode,varcheck,unused // we need these references in the future
+//nolint:unused // we need these references in the future
 const (
 	elToritoSector        = 0x11
 	elToritoDefaultBlocks = 4

filesystem/iso9660/finalize.go

@@ -52,8 +52,6 @@ type FinalizeOptions struct {
 //	Nlink() uint32         // number of hardlinks, if supported
 //	Uid()   uint32         // uid, if supported
 //	Gid()   uint32         // gid, if supported
-//
-//nolint:structcheck // keep unused members so that we can know their references
 type finalizeFileInfo struct {
 	path               string
 	target             string

filesystem/iso9660/finalize_internal_test.go

@@ -149,11 +149,11 @@ func TestCollapseAndSortChildren(t *testing.T) {
 	root.children = children
 	root.addProperties(1)
 	dirs, files := root.collapseAndSortChildren()
-	dirsMatch := true
+	var dirsMatch = true
 	if len(dirs) != len(expectedDirs) {
 		dirsMatch = false
 	}
-	filesMatch := true
+	var filesMatch bool
 	if len(files) != len(expectedFiles) {
 		filesMatch = false
 	}

filesystem/iso9660/finalize_test.go

@@ -560,7 +560,7 @@ func validateElTorito(t *testing.T, f *os.File) {
 	// look for El Torito line
 	re := regexp.MustCompile(`El Torito VD version 1 found, boot catalog is in sector (\d+)\n`)
 	matches := re.FindStringSubmatch(outString)
-	if matches == nil || len(matches) < 1 {
+	if len(matches) < 1 {
 		t.Fatalf("unable to match El Torito information")
 	}
 	// what sector should it be in?