Upgrade to golangci-lint v2

Author: Danielius1922

.github/workflows/golangci-lint.yml

@@ -25,7 +25,7 @@ jobs:
       - run: go version
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
           version: latest
           args: --timeout=5m

.golangci.yml

@@ -1,11 +1,8 @@
-linters-settings:
-  gocyclo:
-    min-complexity: 15
-  govet:
-    enable:
-      - nilness
-      - shadow
-
+version: "2"
+run:
+  go: "1.20"
+# issues:
+#   fix: true
 linters:
   enable:
     - asasalint        # Check for pass []any as any in variadic func(...any)
@@ -22,26 +19,21 @@ linters:
     - errchkjson       # Checks types passed to the json encoding functions. Reports unsupported types and optionally reports occasions, where the check for the returned error can be omitted.
     - errname          # Checks that sentinel errors are prefixed with the `Err` and error types are suffixed with the `Error`.
     - errorlint        # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13.
-    - exportloopref    # checks for pointers to enclosing loop variables
+    # - exportloopref    # checks for pointers to enclosing loop variables
     - forcetypeassert  # finds forced type assertions
-    - gci              # Gci control golang package import order and make it always deterministic.
     - gocheckcompilerdirectives  # Checks that go compiler directive comments (//go:) are valid.
     - gocognit         # Computes and checks the cognitive complexity of functions
     - goconst          # Finds repeated strings that could be replaced by a constant
     - gocritic         # The most opinionated Go source code linter
     - gocyclo          # Computes and checks the cyclomatic complexity of functions
     - godox            # Tool for detection of FIXME, TODO and other comment keywords
     # - goerr113         # Golang linter to check the errors handling expressions
-    - gofmt            # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification
-    - gofumpt          # Gofumpt checks whether code was gofumpt-ed.
     - goheader         # Checks is file header matches to pattern
-    - goimports        # Goimports does everything that gofmt does. Additionally it checks unused imports
-    - gomoddirectives  # Manage the use of 'replace', 'retract', and 'excludes' directives in go.mod.
+    # - gomoddirectives  # Manage the use of 'replace', 'retract', and 'excludes' directives in go.mod.
     - gomodguard       # Allow and block list linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations.
     - goprintffuncname # Checks that printf-like functions are named with `f` at the end
     - gosec            # Inspects source code for security problems
     - gosmopolitan     # Report certain i18n/l10n anti-patterns in your Go codebase
-    - gosimple         # Linter for Go source code that specializes in simplifying a code
     - govet            # Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
     - grouper          # An analyzer to analyze expression groups
     - importas         # Enforces consistent import aliases
@@ -66,12 +58,9 @@ linters:
     - sloglint         # Ensure consistent code style when using log/slog
     - spancheck        # Checks for mistakes with OpenTelemetry/Census spans
     - staticcheck      # Staticcheck is a go vet on steroids, applying a ton of static analysis checks
-    - stylecheck       # Stylecheck is a replacement for golint
     - tagliatelle      # Checks the struct tags.
-    - tenv             # tenv is analyzer that detects using os.Setenv instead of t.Setenv since Go1.17
     - testifylint      # Checks usage of github.com/stretchr/testify.
     - tparallel        # tparallel detects inappropriate usage of t.Parallel() method in your Go test codes
-    - typecheck        # Like the front-end of a Go compiler, parses and type-checks Go code
     - unconvert        # Remove unnecessary type conversions
     - unparam          # Reports unused function parameters
     - unused           # Checks Go code for unused constants, variables, functions and types
@@ -90,7 +79,6 @@ linters:
     - gochecknoglobals # Checks that no globals are present in Go code
     - gochecknoinits   # Checks that no init functions are present in Go code
     - godot            # Check if comments end in a period
-    - gomnd            # An analyzer to detect magic numbers.
     - inamedparam      # Reports interfaces with unnamed method parameters.
     - interfacebloat   # A linter that checks the number of methods inside an interface
     - ireturn          # Accept Interfaces, Return Concrete Types
@@ -110,45 +98,61 @@ linters:
     - varnamelen       # checks that the length of a variable's name matches its scope
     - wrapcheck        # Checks that errors returned from external packages are wrapped
     - wsl              # Whitespace Linter - Forces you to use empty lines!
-
-issues:
-  # Excluding configuration per-path, per-linter, per-text and per-source
-  exclude-rules:
-    # Exclude some linters from running on tests files.
-    - path: _test\.go
-      linters:
-        - dupl
-        - dupword
-        - forcetypeassert
-        - gosec
-        - gocyclo
-        - gocognit
-        - nakedret
-
-    - path: ^test/.*\.go
-      linters:
-        - dupl
-        - forcetypeassert
-        - gosec
-        - gocyclo
-        - gocognit
-
-    - path: example_test\.go
-      text: "exitAfterDefer"
-      linters:
-        - gocritic
-
-    - path: .*/client/conn.go
-      linters:
-        - godox
-
-    - path: .*.go
-      text: "replace with standard maps package"
-      linters:
-        - godox
-
-#   # Fix found issues (if it's supported by the linter).
-#   fix: true
-
-run:
-  go: "1.20"
+  settings:
+    gocyclo:
+      min-complexity: 15
+    govet:
+      enable:
+        - nilness
+        - shadow
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    # Log a warning if an exclusion rule is unused.
+    # Default: false
+    warn-unused: true
+    rules:
+      - linters:
+          - dupl
+          - dupword
+          - forcetypeassert
+          - gocognit
+          - gocyclo
+          - gosec
+          - nakedret
+        path: _test\.go
+      - linters:
+          - dupl
+          - forcetypeassert
+          - gocognit
+          - gocyclo
+          - gosec
+        path: ^test/.*\.go
+      - linters:
+          - gocritic
+        path: example_test\.go
+        text: exitAfterDefer
+      - linters:
+          - godox
+        path: .*/client/conn.go
+      - linters:
+          - godox
+        path: .*.go
+        text: replace with standard maps package
+    # Which file paths to exclude: they will be analyzed, but issues from them won't be reported.
+    # "/" will be replaced by the current OS file path separator to properly work on Windows.
+    # Default: []
+    paths:
+      - examples
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax

examples/dtls/cid/server/main.go

@@ -15,7 +15,6 @@ import (
 	"github.com/plgd-dev/go-coap/v3/mux"
 	"github.com/plgd-dev/go-coap/v3/options"
 	udpClient "github.com/plgd-dev/go-coap/v3/udp/client"
-	"go.uber.org/atomic"
 )
 
 func handleA(w mux.ResponseWriter, r *mux.Message) {
@@ -45,8 +44,7 @@ func handleB(w mux.ResponseWriter, r *mux.Message) {
 // NOTE: this utility is for example purposes only. Context should be handled
 // properly in meaningful scenarios.
 type wrappedListener struct {
-	l      net.Listener
-	closed atomic.Bool
+	l net.Listener
 }
 
 // AcceptWithContext disregards the passed context and calls the underlying
@@ -87,6 +85,6 @@ func main() {
 	if err != nil {
 		log.Fatalf("Error establishing DTLS listener: %v", err)
 	}
-	s := server.New(options.WithMux(m), options.WithInactivityMonitor(10*time.Second, func(cc *udpClient.Conn) {}))
+	s := server.New(options.WithMux(m), options.WithInactivityMonitor(10*time.Second, func(*udpClient.Conn) {}))
 	s.Serve(wrapListener(l))
 }

examples/dtls/pki/cert_util.go

@@ -87,7 +87,6 @@ func LoadCertPool(caBytes []byte) (*x509.CertPool, error) {
 	for _, certBytes := range rootCertificate.Certificate {
 		cert, err := x509.ParseCertificate(certBytes)
 		if err != nil {
-			certPool = nil
 			return nil, err
 		}
 		certPool.AddCert(cert)

examples/mcast/client/main.go

@@ -103,15 +103,14 @@ func main() {
 		err = req.SetupGet("/oic/res", token) /* msg.Option{
 			ID:    msg.URIQuery,
 			Value: []byte("rt=oic.wk.d"),
-		}*/
-		if err != nil {
+		}*/if err != nil {
 			panic(fmt.Errorf("cannot create discover request: %w", err))
 		}
 		req.SetMessageID(message.GetMID())
 		req.SetType(message.NonConfirmable)
 		defer messagePool.ReleaseMessage(req)
 
-		err = s.DiscoveryRequest(req, "224.0.1.187:5683", func(cc *client.Conn, resp *pool.Message) {
+		err = s.DiscoveryRequest(req, "224.0.1.187:5683", func(cc *client.Conn, _ *pool.Message) {
 			_, loaded := duplicit.LoadOrStore(cc.RemoteAddr().String(), true)
 			if loaded {
 				atomic.AddUint32(&numDuplicit, 1)
@@ -125,7 +124,7 @@ func main() {
 
 		previousNum := uint32(0)
 		if previousDuplicit != nil {
-			previousDuplicit.Range(func(key, value interface{}) bool {
+			previousDuplicit.Range(func(key, _ interface{}) bool {
 				_, ok := duplicit.Load(key)
 				if !ok {
 					fmt.Printf("device %v is lost\n", key)

examples/mcast/server/main.go

@@ -49,7 +49,7 @@ func main() {
 
 	for i := range ifaces {
 		iface := ifaces[i]
-		err := l.JoinGroup(&iface, a)
+		err = l.JoinGroup(&iface, a)
 		if err != nil {
 			log.Printf("cannot JoinGroup(%v, %v): %v", iface, a, err)
 		}

examples/options/server/main.go

@@ -9,12 +9,11 @@ import (
 
 	piondtls "github.com/pion/dtls/v3"
 	coap "github.com/plgd-dev/go-coap/v3"
+	dtlsServer "github.com/plgd-dev/go-coap/v3/dtls/server"
 	"github.com/plgd-dev/go-coap/v3/message"
 	"github.com/plgd-dev/go-coap/v3/message/codes"
 	"github.com/plgd-dev/go-coap/v3/mux"
 	"github.com/plgd-dev/go-coap/v3/options"
-
-	dtlsServer "github.com/plgd-dev/go-coap/v3/dtls/server"
 	tcpServer "github.com/plgd-dev/go-coap/v3/tcp/server"
 	udpClient "github.com/plgd-dev/go-coap/v3/udp/client"
 )
@@ -50,11 +49,11 @@ func handleOnNewConn(cc *udpClient.Conn) {
 	if !ok {
 		log.Fatalf("cannot get connection state")
 	}
-	clientId := state.IdentityHint
-	cc.SetContextValue("clientId", clientId)
+	clientID := state.IdentityHint
+	cc.SetContextValue("clientId", clientID)
 	cc.AddOnClose(func() {
-		clientId := state.IdentityHint
-		log.Printf("closed connection clientId: %s", clientId)
+		clientID := state.IdentityHint
+		log.Printf("closed connection clientId: %s", clientID)
 	})
 }
 

examples/simple/server/main.go

@@ -17,7 +17,7 @@ func loggingMiddleware(next mux.Handler) mux.Handler {
 	})
 }
 
-func handleA(w mux.ResponseWriter, r *mux.Message) {
+func handleA(w mux.ResponseWriter, _ *mux.Message) {
 	err := w.SetResponse(codes.Content, message.TextPlain, bytes.NewReader([]byte("hello world")))
 	if err != nil {
 		log.Printf("cannot set response: %v", err)

pkg/cache/cache.go

@@ -50,7 +50,7 @@ func NewCache[K comparable, D any]() *Cache[K, D] {
 
 func (c *Cache[K, D]) LoadOrStore(key K, e *Element[D]) (actual *Element[D], loaded bool) {
 	now := time.Now()
-	c.Map.ReplaceWithFunc(key, func(oldValue *Element[D], oldLoaded bool) (newValue *Element[D], deleteValue bool) {
+	c.ReplaceWithFunc(key, func(oldValue *Element[D], oldLoaded bool) (newValue *Element[D], deleteValue bool) {
 		if oldLoaded {
 			if !oldValue.IsExpired(now) {
 				actual = oldValue
@@ -77,7 +77,7 @@ func (c *Cache[K, D]) Load(key K) (actual *Element[D]) {
 func (c *Cache[K, D]) CheckExpirations(now time.Time) {
 	c.Range(func(key K, value *Element[D]) bool {
 		if value.IsExpired(now) {
-			c.Map.Delete(key)
+			c.Delete(key)
 			value.onExpire(value.Data())
 		}
 		return true