fix: lint issues, modernize codebase (#922)

Author: caarlos0

.golangci.yml

@@ -1,36 +1,56 @@
+version: "2"
 run:
-  go: "1.20"
-  timeout: 5m
+  go: "1.24"
 linters:
   enable:
+    - depguard
+    - forbidigo
+    - misspell
+    - revive
+    - tagliatelle
+    - testifylint
     - thelper
-    - gofumpt
     - tparallel
     - unconvert
+    - usetesting
     - unparam
     - wastedassign
-    - revive
-    - forbidigo
-    - tagliatelle
-    - misspell
-    - depguard
-    - testifylint
-linters-settings:
-  forbidigo:
-    forbid:
-      - 'ioutil\.*'
-  tagliatelle:
-    case:
-      use-field-name: false
+  settings:
+    depguard:
       rules:
-        yaml: snake
-        json: snake
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: "github.com/pkg/errors"
-            desc: "use stdlib instead"
-  testifylint:
-    disable:
-      - encoded-compare
+        main:
+          deny:
+            - pkg: github.com/pkg/errors
+              desc: use stdlib instead
+    forbidigo:
+      forbid:
+        - pattern: ioutil\.*
+    tagliatelle:
+      case:
+        rules:
+          json: snake
+          yaml: snake
+        use-field-name: false
+    testifylint:
+      disable:
+        - encoded-compare
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofumpt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

arch/arch.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -107,12 +108,7 @@ func mapValidChar(r rune) rune {
 
 // isOneOf checks whether a rune is one of the runes in rr
 func isOneOf(r rune, rr ...rune) bool {
-	for _, char := range rr {
-		if r == char {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(rr, r)
 }
 
 // Package writes a new archlinux package to the given writer using the given info.

deb/deb.go

@@ -607,15 +607,15 @@ func createControl(instSize int64, md5sums []byte, info *nfpm.Info) (controlTarG
 			mode:     0o755,
 		},
 		"rules": {
-			fileName: info.Overridables.Deb.Scripts.Rules,
+			fileName: info.Deb.Scripts.Rules,
 			mode:     0o755,
 		},
 		"templates": {
-			fileName: info.Overridables.Deb.Scripts.Templates,
+			fileName: info.Deb.Scripts.Templates,
 			mode:     0o644,
 		},
 		"config": {
-			fileName: info.Overridables.Deb.Scripts.Config,
+			fileName: info.Deb.Scripts.Config,
 			mode:     0o755,
 		},
 	}

deprecation/deprecation.go

@@ -26,6 +26,6 @@ func Println(s string) {
 }
 
 // Printf printfs the given string to the Noticer.
-func Printf(format string, a ...interface{}) {
+func Printf(format string, a ...any) {
 	fmt.Fprintf(Noticer, format, a...)
 }

files/files.go

@@ -187,7 +187,7 @@ func (c *Content) IsDir() bool {
 }
 
 // Sys to part of the os.FileInfo interface
-func (c *Content) Sys() interface{} {
+func (c *Content) Sys() any {
 	return nil
 }
 

files/files_test.go

@@ -282,7 +282,7 @@ contents:
 	errs := make(chan error, 10)
 	t.Cleanup(func() { close(errs) })
 	var wg sync.WaitGroup
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
@@ -298,7 +298,7 @@ contents:
 	}
 	wg.Wait()
 
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		require.NoError(t, <-errs)
 	}
 }

files/fs.go

@@ -1,13 +1,10 @@
 package files
 
+import "slices"
+
 func ownedByFilesystem(path string) bool {
 	p := ToNixPath(path)
-	for _, pp := range append(fsPaths, logrotatePaths...) {
-		if p == pp {
-			return true
-		}
-	}
-	return false
+	return slices.Contains(append(fsPaths, logrotatePaths...), p)
 }
 
 // yum install yum-utils

internal/glob/glob.go

@@ -29,18 +29,13 @@ func longestCommonPrefix(strs []string) string {
 }
 
 func strlcp(a, b string) string {
-	var min int
-	if len(a) > len(b) {
-		min = len(b)
-	} else {
-		min = len(a)
-	}
-	for i := 0; i < min; i++ {
+	minlen := min(len(a), len(b))
+	for i := range minlen {
 		if a[i] != b[i] {
 			return a[0:i]
 		}
 	}
-	return a[0:min]
+	return a[0:minlen]
 }
 
 // ErrGlobNoMatch happens when no files matched the given glob.

internal/glob/glob_test.go

@@ -22,7 +22,7 @@ func TestLongestCommonPrefix(t *testing.T) {
 
 	empty := []string{}
 	lcp2 := longestCommonPrefix(empty)
-	require.Equal(t, "", lcp2)
+	require.Empty(t, lcp2)
 
 	unique := []string{
 		"every",
@@ -35,7 +35,7 @@ func TestLongestCommonPrefix(t *testing.T) {
 	}
 
 	lcp3 := longestCommonPrefix(unique)
-	require.Equal(t, "", lcp3)
+	require.Empty(t, lcp3)
 }
 
 func TestGlob(t *testing.T) {

internal/sign/pgp.go

@@ -254,7 +254,7 @@ func readSigningKey(keyFile, passphrase string) (*openpgp.Entity, error) {
 }
 
 func isASCII(s []byte) bool {
-	for i := 0; i < len(s); i++ {
+	for i := range s {
 		if s[i] > unicode.MaxASCII {
 			return false
 		}