Upgrade to golangci-lint v2, massive linter clean-up

Author: foxcpp

.github/workflows/test.yml

@@ -17,24 +17,23 @@ jobs:
     name: Lint
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
       - name: "Install libpam"
         run: |
           sudo apt-get update
           sudo apt-get install -y libpam-dev
-      - uses: golangci/golangci-lint-action@v6
+      - uses: golangci/golangci-lint-action@v9
         with:
-          version: v1.60
-          args: "--timeout=30m"
+          version: v2.11
   buildsh:
     name: "Verify build.sh"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-go@v6
         with:
           go-version-file: 'go.mod'
       - name: "Install libpam"
@@ -50,8 +49,8 @@ jobs:
     name: "Build and test"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-go@v5
+    - uses: actions/checkout@v6
+    - uses: actions/setup-go@v6
       with:
         go-version-file: 'go.mod'
     - name: "Install libpam"
@@ -65,11 +64,3 @@ jobs:
       run: |
         cd tests/
         ./run.sh
-    - uses: codecov/codecov-action@v2
-      with:
-        files: ./coverage.out
-        flags: unit
-    - uses: codecov/codecov-action@v2
-      with:
-        files: ./tests/coverage.out
-        flags: integration

.golangci.yml

@@ -1,17 +1,25 @@
+version: "2"
 linters:
   enable:
-  - gosimple
   - errcheck
   - staticcheck
   - ineffassign
-  - typecheck
   - govet
   - unused
-  - goimports
   - prealloc
   - unconvert
   - misspell
   - whitespace
   - nakedret
   - dogsled
   - copyloopvar
+  - sqlclosecheck
+  - testifylint
+  - rowserrcheck
+  - recvcheck
+  settings:
+    errcheck:
+      disable-default-exclusions: false
+formatters:
+  enable:
+  - goimports

config.go

@@ -114,7 +114,9 @@ func reinitLogging() {
 		return
 	}
 
-	out.Close()
+	if err := out.Close(); err != nil {
+		log.Println("Can't close logger:", err)
+	}
 
 	log.DefaultLogger.Out = newOut
 }

framework/cfgparser/imports.go

@@ -169,7 +169,7 @@ func (ctx *parseContext) expandSingleValueMacro(arg string) (string, error) {
 			value = ctx.macros[macroName][0]
 		}
 
-		arg = strings.Replace(arg, "$("+macroName+")", value, -1)
+		arg = strings.ReplaceAll(arg, "$("+macroName+")", value)
 	}
 
 	return arg, nil

framework/cfgparser/parse_test.go

@@ -23,6 +23,8 @@ import (
 	"reflect"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 var cases = []struct {
@@ -579,8 +581,8 @@ func printTree(t *testing.T, root Node, indent int) {
 }
 
 func TestRead(t *testing.T) {
-	os.Setenv("TESTING_VARIABLE", "ABCDEF")
-	os.Setenv("TESTING_VARIABLE2", "ABC2 DEF2")
+	require.NoError(t, os.Setenv("TESTING_VARIABLE", "ABCDEF"))
+	require.NoError(t, os.Setenv("TESTING_VARIABLE2", "ABC2 DEF2"))
 
 	for _, case_ := range cases {
 		t.Run(case_.name, func(t *testing.T) {

framework/dns/dnssec_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/foxcpp/maddy/framework/log"
 	"github.com/miekg/dns"
+	"github.com/stretchr/testify/require"
 )
 
 type TestSrvAction int
@@ -55,8 +56,8 @@ func (s *IPAddrTestServer) Run() {
 	go s.udpServ.ActivateAndServe() //nolint:errcheck
 }
 
-func (s *IPAddrTestServer) Close() {
-	s.udpServ.PacketConn.Close()
+func (s *IPAddrTestServer) Close() error {
+	return s.udpServ.PacketConn.Close()
 }
 
 func (s *IPAddrTestServer) Addr() *net.UDPAddr {
@@ -141,7 +142,9 @@ func TestExtResolver_AuthLookupIPAddr(t *testing.T) {
 			s.aAD = aAD
 			s.aaaaAD = aaaaAD
 			s.Run()
-			defer s.Close()
+			defer func() {
+				require.NoError(t, s.Close())
+			}()
 			res := ExtResolver{
 				cl: new(dns.Client),
 				Cfg: &dns.ClientConfig{

framework/resource/netresource/fd.go

@@ -11,7 +11,11 @@ import (
 
 func ListenFD(fd uint) (net.Listener, error) {
 	file := os.NewFile(uintptr(fd), strconv.FormatUint(uint64(fd), 10))
-	defer file.Close()
+	defer func() {
+		if err := file.Close(); err != nil {
+			panic(err)
+		}
+	}()
 	return net.FileListener(file)
 }
 
@@ -42,6 +46,10 @@ func ListenFDName(name string) (net.Listener, error) {
 	}
 
 	file := os.NewFile(3+fd, name)
-	defer file.Close()
+	defer func() {
+		if err := file.Close(); err != nil {
+			panic(err)
+		}
+	}()
 	return net.FileListener(file)
 }

framework/resource/singleton.go

@@ -50,8 +50,10 @@ func (s *Singleton[T]) CloseUnused(isUsed func(key string) bool) error {
 		if isUsed(key) {
 			continue
 		}
+		if err := res.Close(); err != nil {
+			s.log.Error("resource close failed", err, "key", key)
+		}
 		s.log.DebugMsg("resource released", "key", key)
-		res.Close()
 		delete(s.resources, key)
 	}
 
@@ -63,8 +65,10 @@ func (s *Singleton[T]) Close() error {
 	defer s.lock.Unlock()
 
 	for key, res := range s.resources {
+		if err := res.Close(); err != nil {
+			s.log.Error("resource close failed", err, "key", key)
+		}
 		s.log.DebugMsg("resource released", "key", key)
-		res.Close()
 		delete(s.resources, key)
 	}
 

internal/auth/dovecot_sasl/dovecot_sasl.go

@@ -77,7 +77,9 @@ func (a *Auth) getConn() (*dovecotsasl.Client, error) {
 }
 
 func (a *Auth) returnConn(cl *dovecotsasl.Client) {
-	cl.Close()
+	if err := cl.Close(); err != nil {
+		a.log.Error("connection close failed", err)
+	}
 }
 
 func (a *Auth) Configure(inlineArgs []string, cfg *config.Map) error {
@@ -113,7 +115,11 @@ func (a *Auth) Configure(inlineArgs []string, cfg *config.Map) error {
 		return fmt.Errorf("%s: unable to contact server: %v", modName, err)
 	}
 
-	defer cl.Close()
+	defer func() {
+		if err := cl.Close(); err != nil {
+			a.log.Error("connection close failed", err)
+		}
+	}()
 	a.mechanisms = make(map[string]dovecotsasl.Mechanism, len(cl.ConnInfo().Mechs))
 	for name, mech := range cl.ConnInfo().Mechs {
 		if mech.Private {

internal/auth/ldap/ldap.go

@@ -181,7 +181,9 @@ func (a *Auth) getConn() (*ldap.Conn, error) {
 		a.conn = conn
 	}
 	if a.conn.IsClosing() {
-		a.conn.Close()
+		if err := a.conn.Close(); err != nil {
+			a.log.Error("Connection close failed", err)
+		}
 		conn, err := a.newConn()
 		if err != nil {
 			a.connLock.Unlock()
@@ -196,11 +198,15 @@ func (a *Auth) returnConn(conn *ldap.Conn) {
 	defer a.connLock.Unlock()
 	if err := a.readBind(conn); err != nil {
 		a.log.Error("failed to rebind for reading", err)
-		conn.Close()
+		if err := a.conn.Close(); err != nil {
+			a.log.Error("Connection close failed", err)
+		}
 		a.conn = nil
 	}
 	if a.conn != conn {
-		a.conn.Close()
+		if err := a.conn.Close(); err != nil {
+			a.log.Error("Connection close failed", err)
+		}
 	}
 	a.conn = conn
 }
@@ -285,8 +291,7 @@ func (a *Auth) Start() error {
 func (a *Auth) Stop() error {
 	a.connLock.Lock()
 	defer a.connLock.Unlock()
-	a.conn.Close()
-	return nil
+	return a.conn.Close()
 }
 
 func init() {