Update to golangci-lint v2.5.0

frelon · frelon · commit db4ec44566ef · 2025-10-06T10:03:03.000+02:00
Signed-off-by: Fredrik Lönnegren &lt;fredrik.lonnegren@suse.com&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,39 +1,137 @@
+version: "2"
 run:
-  deadline: 5m
+  go: "1.24"
+  timeout: 10m
+  modules-download-mode: readonly
   allow-parallel-runners: true
-
-issues:
-  # don't skip warning about doc comments
-  # don't exclude the default set of lint
-  exclude-use-default: false
-  # restore some of the defaults
-  # (fill in the rest as needed)
-  exclude-rules:
-    - path: "api/*"
-      linters:
-        - lll
-    - path: "internal/*"
-      linters:
-        - dupl
-        - lll
 linters:
-  disable-all: true
+  # sync from https://github.com/kubernetes-sigs/controller-runtime/blob/main/.golangci.yml
+  default: none
   enable:
+    - asasalint
+    - asciicheck
+    - bidichk
+    - bodyclose
+    - copyloopvar
+    - dogsled
     - dupl
     - errcheck
-    - exportloopref
+    - errchkjson
+    - errorlint
+    - forbidigo
+    - ginkgolinter
     - goconst
+    - gocritic
     - gocyclo
-    - gofmt
-    - goimports
-    - gosimple
+    - godoclint
+    - goprintffuncname
     - govet
+    - importas
     - ineffassign
+    - iotamixing
+    - makezero
     - misspell
     - nakedret
+    - nilerr
+    - nolintlint
     - prealloc
+    - revive
     - staticcheck
-    - typecheck
+    - tagliatelle
     - unconvert
     - unparam
     - unused
+    - whitespace
+  settings:
+    forbidigo:
+        forbid:
+          - pattern: context.Background
+            msg: Use ginkgos SpecContext or go testings t.Context instead
+          - pattern: context.TODO
+            msg: Use ginkgos SpecContext or go testings t.Context instead
+    govet:
+      disable:
+        - fieldalignment
+        - shadow
+      enable-all: true
+    importas:
+      no-unaliased: true
+    revive:
+      # By default, revive will enable only the linting rules that are named in the configuration file.
+      # So, it's needed to explicitly enable all required rules here.
+      rules:
+        # The following rules are recommended https://github.com/mgechev/revive#recommended-configuration
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+        - name: error-return
+        - name: error-strings
+        - name: error-naming
+        - name: if-return
+        - name: increment-decrement
+        - name: var-naming
+        - name: var-declaration
+        - name: range
+        - name: receiver-naming
+        - name: time-naming
+        - name: unexported-return
+        - name: indent-error-flow
+        - name: errorf
+        - name: superfluous-else
+        - name: unreachable-code
+        - name: redefines-builtin-id
+        #
+        # Rules in addition to the recommended configuration above.
+        #
+        - name: bool-literal-in-expr
+        - name: constant-logical-expr
+  exclusions:
+    generated: strict
+    paths:
+      - zz_generated.*\.go$
+      - .*conversion.*\.go$
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      # Dot imports for gomega and ginkgo are allowed
+      # within test files.
+      - linters:
+          - revive
+        path: _test\.go
+        text: should not use dot imports
+      # Ignore error type switch case
+      - linters:
+          - errorlint
+        path: pkg/loader/loader.go
+      # Ignore test files
+      - linters:
+          - dupl
+          - ginkgolinter
+        path: _test\.go
+      - linters:
+          - gocritic
+        path: pkg/markers/help.go
+      - linters:
+          - exhaustive
+        path: pkg/markers/parse.go|pkg/deepcopy/traverse.go|pkg/genall/help/types.go|pkg/crd/schema.go|pkg/crd/flatten.go
+      # Ignore consider pre-allocating variables
+      - linters:
+          - prealloc
+        text: Consider pre-allocating
+      - linters:
+          - staticcheck
+        path: (.+)\.go$
+        text: (QF1008)
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: strict
+    paths:
+      - zz_generated.*\.go$
+      - .*conversion.*\.go$
diff --git a/api/v1beta1/rtlsdrreceiver_types.go b/api/v1beta1/rtlsdrreceiver_types.go
@@ -42,6 +42,7 @@ type RtlSdrReceiverSpec struct {
 	ContainerPort *corev1.ContainerPort `json:"port"`
 }
 
+// RtlSdrVersion is the major version of the rtl-sdr receiver.
 // +kubebuilder:validation:Enum=v3;v4
 type RtlSdrVersion string
 
@@ -65,6 +66,7 @@ type RtlSdrReceiverStatus struct {
 	Pod *corev1.ObjectReference `json:"pod,omitempty"`
 }
 
+// RtlSdrReceiverState state of the rtl-sdr receiver.
 // +kubebuilder:validation:Enum=Waiting;Running;Failed
 type RtlSdrReceiverState string
 
diff --git a/cmd/device-plugin/main.go b/cmd/device-plugin/main.go
@@ -4,9 +4,10 @@ import (
 	"flag"
 	"time"
 
-	rtlsdr "github.com/frelon/k8s-radio/device-plugin/rtl-sdr"
 	"github.com/golang/glog"
 	"github.com/kubevirt/device-plugin-manager/pkg/dpm"
+
+	rtlsdr "github.com/frelon/k8s-radio/device-plugin/rtl-sdr"
 )
 
 type RadioDeviceLister struct {
@@ -30,8 +31,7 @@ func (l *RadioDeviceLister) Discover(pluginListCh chan dpm.PluginNameList) {
 }
 
 func (l *RadioDeviceLister) NewPlugin(resourceLastName string) dpm.PluginInterface {
-	switch resourceLastName {
-	case rtlsdr.ResourceName:
+	if resourceLastName == rtlsdr.ResourceName {
 		return &rtlsdr.Plugin{
 			Heartbeat: l.Heartbeat,
 			RtlSdrs:   make(map[string]*rtlsdr.RtlSdrDev),
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -95,11 +95,13 @@ func main() {
 		image = controller.RtlSdrDefaultImage
 	}
 
+	ctx := ctrl.SetupSignalHandler()
+
 	if err = (&controller.RtlSdrReceiverReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
 		Image:  image,
-	}).SetupWithManager(mgr); err != nil {
+	}).SetupWithManager(ctx, mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "RtlSdrReceiver")
 		os.Exit(1)
 	}
@@ -115,7 +117,7 @@ func main() {
 	}
 
 	setupLog.Info("starting manager")
-	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+	if err := mgr.Start(ctx); err != nil {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)
 	}
diff --git a/device-plugin/rtl-sdr/rtl-sdr.go b/device-plugin/rtl-sdr/rtl-sdr.go
@@ -66,7 +66,6 @@ func (p *Plugin) GetDevices() []*pluginapi.Device {
 }
 
 func (p *Plugin) ListAndWatch(e *pluginapi.Empty, s pluginapi.DevicePlugin_ListAndWatchServer) error {
-
 	err := p.UpdateDevices()
 	if err != nil {
 		glog.Errorf("Error listing devices: %s", err.Error())
diff --git a/internal/controller/rtlsdrreceiver_controller.go b/internal/controller/rtlsdrreceiver_controller.go
@@ -50,6 +50,7 @@ type RtlSdrReceiverReconciler struct {
 	Image string
 }
 
+// Reconcile reconsiles the resources.
 // +kubebuilder:rbac:groups=radio.frelon.se,resources=rtlsdrreceivers,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=radio.frelon.se,resources=rtlsdrreceivers/status,verbs=get;update;patch
 // +kubebuilder:rbac:groups=radio.frelon.se,resources=rtlsdrreceivers/finalizers,verbs=update
@@ -164,8 +165,8 @@ var (
 )
 
 // SetupWithManager sets up the controller with the Manager.
-func (r *RtlSdrReceiverReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	if err := mgr.GetFieldIndexer().IndexField(context.Background(), &corev1.Pod{}, jobOwnerKey, func(rawObj client.Object) []string {
+func (r *RtlSdrReceiverReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
+	if err := mgr.GetFieldIndexer().IndexField(ctx, &corev1.Pod{}, jobOwnerKey, func(rawObj client.Object) []string {
 		// grab the pod object, extract the owner...
 		pod := rawObj.(*corev1.Pod)
 		owner := metav1.GetControllerOf(pod)
diff --git a/internal/controller/rtlsdrreceiver_controller_test.go b/internal/controller/rtlsdrreceiver_controller_test.go
@@ -1,7 +1,6 @@
 package controller
 
 import (
-	"context"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -33,10 +32,9 @@ var _ = Describe("RtlSdrReceiver controller", func() {
 	utilruntime.Must(radiov1.AddToScheme(scheme))
 
 	Context("When updating RtlSdrReceiver Status", func() {
-		It("Should successfully create a new RtlSdrReceiver", func() {
+		It("Should successfully create a new RtlSdrReceiver", func(ctx SpecContext) {
 			By("By creating a new RtlSdrReceiver")
 
-			ctx := context.Background()
 			freq, err := resource.ParseQuantity("101.9M")
 			Expect(err).To(Succeed())
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ type RtlSdrReceiverSpec struct {`
`42`	`42`	ContainerPort *corev1.ContainerPort `json:"port"`
`43`	`43`	`}`
`44`	`44`
	`45`	`+// RtlSdrVersion is the major version of the rtl-sdr receiver.`
`45`	`46`	`// +kubebuilder:validation:Enum=v3;v4`
`46`	`47`	`type RtlSdrVersion string`
`47`	`48`
`@@ -65,6 +66,7 @@ type RtlSdrReceiverStatus struct {`
`65`	`66`	Pod *corev1.ObjectReference `json:"pod,omitempty"`
`66`	`67`	`}`
`67`	`68`
	`69`	`+// RtlSdrReceiverState state of the rtl-sdr receiver.`
`68`	`70`	`// +kubebuilder:validation:Enum=Waiting;Running;Failed`
`69`	`71`	`type RtlSdrReceiverState string`
`70`	`72`
Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,13 @@ func main() {`
`95`	`95`	`image = controller.RtlSdrDefaultImage`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ ctx := ctrl.SetupSignalHandler()`
	`99`	`+`
`98`	`100`	`if err = (&controller.RtlSdrReceiverReconciler{`
`99`	`101`	`Client: mgr.GetClient(),`
`100`	`102`	`Scheme: mgr.GetScheme(),`
`101`	`103`	`Image: image,`
`102`		`- }).SetupWithManager(mgr); err != nil {`
	`104`	`+ }).SetupWithManager(ctx, mgr); err != nil {`
`103`	`105`	`setupLog.Error(err, "unable to create controller", "controller", "RtlSdrReceiver")`
`104`	`106`	`os.Exit(1)`
`105`	`107`	`}`
`@@ -115,7 +117,7 @@ func main() {`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	`setupLog.Info("starting manager")`
`118`		`- if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {`
	`120`	`+ if err := mgr.Start(ctx); err != nil {`
`119`	`121`	`setupLog.Error(err, "problem running manager")`
`120`	`122`	`os.Exit(1)`
`121`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ func (p Plugin) GetDevices() []pluginapi.Device {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`func (p Plugin) ListAndWatch(e pluginapi.Empty, s pluginapi.DevicePlugin_ListAndWatchServer) error {`
`69`		`-`
`70`	`69`	`err := p.UpdateDevices()`
`71`	`70`	`if err != nil {`
`72`	`71`	`glog.Errorf("Error listing devices: %s", err.Error())`