refactor: golangci-lint v2

Signed-off-by: Christian Stewart <[email protected]>

Author: paralin

.golangci.yml

@@ -1,67 +1,90 @@
+# Config file version V2 has been introduced, read more in lintersdb.
+# Visit https://golangci-lint.run/usage/configuration/#config-file
+version: "2"
+
+# Settings for the `run` command.
+run:
+  # Concurrency defines how many analyses can run simultaneously.
+  # Default is 1.
+  concurrency: 4
+  # Modules-download-mode specifies how to download modules.
+  # Allowed values: readonly, vendor, mod. Default is readonly.
+  modules-download-mode: vendor
+
+# Linters configuration.
 linters:
   enable:
     - depguard
-    - goimports
     - gosec
-    - gosimple
-    - govet
     - importas
-    - ineffassign
     - misspell
     - revive
-    - staticcheck
-    - typecheck
     - unconvert
-    - unused
-
   disable:
     - errcheck
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: io/ioutil
+              desc: The io/ioutil package has been deprecated, see https://go.dev/doc/go1.16#ioutil
+            - pkg: "github.com/stretchr/testify/assert"
+              desc: Use "gotest.tools/v3/assert" instead
+            - pkg: "github.com/stretchr/testify/require"
+              desc: Use "gotest.tools/v3/assert" instead
+            - pkg: "github.com/stretchr/testify/suite"
+              desc: Do not use
+    gosec:
+      excludes:
+        - G306 # Allow WriteFile permissions to be 0644.
+    importas:
+      # Do not allow unaliased imports of aliased packages.
+      no-unaliased: true
+    revive:
+      rules:
+        - name: package-comments
+          disabled: true
+    staticcheck:
+      # All SA checks are enabled by default, customize as needed.
+      # Refer to https://staticcheck.io/docs/checks for check details.
+      checks:
+        - all
+        - '-SA1012' # Allow passing nil contexts.
+        - '-ST1003' # Example of disabling another check if needed
 
-  run:
-    concurrency: 4
-    modules-download-mode: vendor
-
-    skip-dirs:
-      - hack
-
-linters-settings:
-  staticcheck:
-    checks:
-      - all
-      - '-SA1012' # Allow passing nil contexts.
-
-  importas:
-    # Do not allow unaliased imports of aliased packages.
-    no-unaliased: true
-
-  maligned:
-    suggest-new: true
-
-  depguard:
-    rules:
-      main:
-        deny:
-          - pkg: io/ioutil
-            desc: The io/ioutil package has been deprecated, see https://go.dev/doc/go1.16#ioutil
-          - pkg: "github.com/stretchr/testify/assert"
-            desc: Use "gotest.tools/v3/assert" instead
-          - pkg: "github.com/stretchr/testify/require"
-            desc: Use "gotest.tools/v3/assert" instead
-          - pkg: "github.com/stretchr/testify/suite"
-            desc: Do not use
-
-  revive:
-    rules:
-      - name: package-comments
-        disabled: true
-
-  gosec:
-    excludes:
-      - G306 # Allow WriteFile permissions to be 0644.
+  # Exclusions based on common patterns and presets.
+  exclusions:
+    # Treat generated files leniently.
+    generated: lax
+    # Use predefined sets of common exclusions.
+    presets:
+      - comments
+      - common-false-positives
+      - legacy # Excludes checks deprecated in new Go versions
+      - std-error-handling # Excludes some common stdlib error patterns
+    # Exclude specific paths using regex.
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 
+# Issues reporting configuration.
 issues:
   # Maximum issues count per one linter. Set to 0 to disable. Default is 50.
   max-issues-per-linter: 0
-
   # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
   max-same-issues: 0
+
+# Formatters configuration (new in V2).
+formatters:
+  enable:
+    - goimports # Enable goimports as a formatter.
+  exclusions:
+    # Treat generated files leniently for formatting.
+    generated: lax
+    # Exclude specific paths from formatting using regex.
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

bus/api/api.pb.go

@@ -113,7 +113,7 @@ func (b *Bus) RemoveController(c controller.Controller) {
 // addController adds a controller to the bus
 func (b *Bus) addController(c controller.Controller) error {
 	b.mtx.Lock()
-	rel, err := b.Controller.AddHandler(c)
+	rel, err := b.AddHandler(c)
 	if err == nil {
 		b.controllers = append(b.controllers, &attachedCtrl{
 			ctrl: c,

bus/api/api_srpc.pb.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 
 	protobuf_go_lite "github.com/aperturerobotics/protobuf-go-lite"
-	vtcompare "github.com/aperturerobotics/protobuf-go-lite"
 )
 
 // Config is an object specifying configuration for a component of the system.
@@ -50,17 +49,17 @@ type Debuggable interface {
 }
 
 // EqualsConfig implements EqualsConfig assuming both Config are the same type and have VTEqual.
-func EqualsConfig[T vtcompare.EqualVT[T]](t1 T, c2 Config) bool {
+func EqualsConfig[T protobuf_go_lite.EqualVT[T]](t1 T, c2 Config) bool {
 	t2, ok := c2.(T)
 	if !ok {
 		return false
 	}
-	return vtcompare.IsEqualVT(t1, t2)
+	return protobuf_go_lite.IsEqualVT(t1, t2)
 }
 
 // IsEqualVT compares two objects with VTEqual.
-func IsEqualVT[T vtcompare.EqualVT[T]](c1, c2 T) bool {
-	return vtcompare.IsEqualVT[T](c1, c2)
+func IsEqualVT[T protobuf_go_lite.EqualVT[T]](c1, c2 T) bool {
+	return protobuf_go_lite.IsEqualVT[T](c1, c2)
 }
 
 // MergeDebugVals merges multiple DebugValues into the first DebugValues passed.

bus/api/controller/controller.pb.go

@@ -94,7 +94,7 @@ func (r *applyConfigSetResolver) Resolve(
 			if v != 0 {
 				handler.RemoveValue(v)
 			}
-			var val configset.ApplyConfigSetValue = st
+			var val configset.ApplyConfigSetValue = st //nolint:staticcheck
 			id, accepted := handler.AddValue(val)
 			if accepted {
 				r.refs[ref] = id

bus/inmem/inmem.go

@@ -94,7 +94,7 @@ func (r *lookupConfigSetResolver) Resolve(
 			if v != 0 {
 				handler.RemoveValue(v)
 			}
-			var val configset.LookupConfigSetValue = st
+			var val configset.LookupConfigSetValue = st //nolint:staticcheck
 			id, accepted := handler.AddValue(val)
 			if accepted {
 				r.refs[ref] = id

config/config.go

@@ -156,17 +156,18 @@ func (c *ControllerConfig) UnmarshalProtoJSON(s *json.UnmarshalState) {
 				break
 			}
 			nextTok := s.WhatIsNext()
-			if nextTok == jsoniter.StringValue {
+			switch nextTok {
+			case jsoniter.StringValue:
 				// Expect base58 encoded string
 				var err error
 				c.Config, err = base64.RawStdEncoding.DecodeString(s.ReadString())
 				if err != nil {
 					s.SetError(errors.Wrap(err, "unmarshal config value as base58 string"))
 					return
 				}
-			} else if nextTok == jsoniter.ObjectValue {
+			case jsoniter.ObjectValue:
 				c.Config = s.SkipAndReturnBytes()
-			} else {
+			default:
 				s.SetError(errors.Errorf("invalid json value for config: type %v", nextTok))
 				return
 			}

config/config.pb.go

@@ -58,7 +58,7 @@ func (r *KeyedGetterResolver[K, V]) Resolve(ctx context.Context, handler Resolve
 			return nil
 		}
 
-		var result V = val
+		var result V = val //nolint:staticcheck
 		addedValID, accepted := handler.AddValue(result)
 		if !accepted {
 			// value not needed

controller/configset/controller/apply-config-set.go

@@ -11,11 +11,11 @@ replace github.com/libp2p/go-msgio => github.com/aperturerobotics/go-libp2p-msgi
 
 require (
 	github.com/aperturerobotics/cli v1.0.0 // latest
-	github.com/aperturerobotics/common v0.21.2 // latest
+	github.com/aperturerobotics/common v0.22.1 // latest
 	github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20241223092408-d525fa878b3e // latest
 	github.com/aperturerobotics/protobuf-go-lite v0.9.1 // latest
 	github.com/aperturerobotics/starpc v0.38.0 // latest
-	github.com/aperturerobotics/util v1.29.2 // latest
+	github.com/aperturerobotics/util v1.30.0 // latest
 )
 
 require (

controller/configset/controller/config.pb.go

@@ -1,7 +1,7 @@
 github.com/aperturerobotics/cli v1.0.0 h1:s3xT2h7eBih4/4yZKTn/HQ6P+qpk6ygWZl2416xAI1M=
 github.com/aperturerobotics/cli v1.0.0/go.mod h1:wtlINjMcKuwyV1x4ftReuA6hHZcPB8kPMXHyQqGFCSc=
-github.com/aperturerobotics/common v0.21.2 h1:fqnPL5Oovpd8nDaNBYGiD1UpZhcH/JfpsS8gt5iBDyA=
-github.com/aperturerobotics/common v0.21.2/go.mod h1:FrecdNcsYvVS8RcWCR8FUkKFh+XmouFOYKHpBdMqqBA=
+github.com/aperturerobotics/common v0.22.1 h1:wxTV9wSgfAM9jYUuSzNFzUeC28DQMBgDO3iGahlHeaY=
+github.com/aperturerobotics/common v0.22.1/go.mod h1:wsPfDVCTNpGHddg/MSfm84rKoO4GAvb+TQtATXz+pKY=
 github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0 h1:tGwbeDoEeQCrUQL+ClUywldqvz9eRmhcVrGwGxz2xJg=
 github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0/go.mod h1:FJkAtQcP9XxqG1NNLNHKm+wLVIGSCQX2s6CEoD+w97g=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20241223092408-d525fa878b3e h1:9KDK70CSnHCUGShpq3sEg/t8zEEnKePlhJ4775ekpeI=
@@ -10,8 +10,8 @@ github.com/aperturerobotics/protobuf-go-lite v0.9.1 h1:P1knXKnwLJpVE8fmeXYGckKu7
 github.com/aperturerobotics/protobuf-go-lite v0.9.1/go.mod h1:fULrxQxEBWKQm7vvju9AfjTp9yfHoLgwMQWTiZQ2tg0=
 github.com/aperturerobotics/starpc v0.38.0 h1:/1R3TLIoVIk5AA2SdCylykrL9BfoeTsXVvv8cRn0ebU=
 github.com/aperturerobotics/starpc v0.38.0/go.mod h1:hXOnhcvSXOoA6/Tw/qinQKhpi8+7WDkhrFXS5nHQ6us=
-github.com/aperturerobotics/util v1.29.2 h1:4mF7PfltK2g9KuD5gYUx3zvfEQXA/7F/V6EIEwJA35Q=
-github.com/aperturerobotics/util v1.29.2/go.mod h1:wfEm6n6evCQCGu+NjR8qINo0feaPEgeXxDZK6/oSuk8=
+github.com/aperturerobotics/util v1.30.0 h1:OKhFVPnAfR8/dfVNV27EtMr27C0kzwPiStoCwKiint0=
+github.com/aperturerobotics/util v1.30.0/go.mod h1:T97YTP+FVLegYo5rylOVaPuTLyZyiDqYxD5zVLI9YAc=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=

controller/configset/controller/lookup-config-set.go

@@ -47,7 +47,7 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@aptre/common": "^0.21.1",
+    "@aptre/common": "^0.22.1",
     "depcheck": "^1.4.7",
     "happy-dom": "^17.4.4",
     "prettier": "^3.5.3",
@@ -57,7 +57,7 @@
   },
   "dependencies": {
     "@aptre/protobuf-es-lite": "^0.4.4",
-    "starpc": "^0.38.0"
+    "starpc": "^0.38.1"
   },
   "resolutions": {
     "@aptre/protobuf-es-lite": "0.4.8"