Update golangci-linter version to make it compatible with go 1.20

Three linters are removed because of they're deprecated since v1.49.0
and replaced by unused: structcheck, deadcode and varcheck.

depguard is also removed because it generates a bunch of false-positives
as below:
- import 'k8s.io/klog/v2' is not allowed from list 'Main' (depguard).
- import 'sigs.k8s.io/controller-runtime' is not allowed from list 'Main' (depguard)

It also fixes other linter issues.

Change-Id: I07ddf005ed806fd263785fab356e4a050f739165
GitOrigin-RevId: 422ad15749d44969467213a3f66e4ee64d739f2f

.golangci.yml

@@ -7,8 +7,6 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
-    - depguard
     - dogsled
     - dupl
     - errcheck
@@ -28,14 +26,12 @@ linters:
     - misspell
     - nakedret
     - staticcheck
-    - structcheck
     - stylecheck
     - revive
     - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
 
 

Makefile.deps

@@ -30,7 +30,7 @@ CONTROLLER_GEN := $(GOBIN)/controller-gen
 ADDLICENSE_VERSION := v1.0.0
 ADDLICENSE := $(GOBIN)/addlicense
 
-GOLINT_VERSION := v1.46.2
+GOLINT_VERSION := v1.54.2
 GOLINT := $(GOBIN)/golangci-lint
 
 KIND_VERSION := v0.14.0

config/crd/bases/kpt.dev_resourcegroups.yaml

@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

controllers/handler/event_handler.go

@@ -58,7 +58,7 @@ func (e *EnqueueEventToChannel) OnAdd(obj interface{}) {
 }
 
 // Update implements EventHandler
-func (e *EnqueueEventToChannel) OnUpdate(oldObj, newObj interface{}) {
+func (e *EnqueueEventToChannel) OnUpdate(_, newObj interface{}) {
 	e.Log.V(5).Info("received an update event")
 	e.enqueueEvent(newObj)
 }

controllers/handler/throttler.go

@@ -51,15 +51,15 @@ func NewThrottler(d time.Duration) *Throttler {
 }
 
 // Create implements EventHandler. All create events are ignored.
-func (e *Throttler) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) {
+func (e *Throttler) Create(event.CreateEvent, workqueue.RateLimitingInterface) {
 }
 
 // Update implements EventHandler. All update events are ignored.
-func (e *Throttler) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) {
+func (e *Throttler) Update(event.UpdateEvent, workqueue.RateLimitingInterface) {
 }
 
 // Delete implements EventHandler. All delete events are ignored.
-func (e *Throttler) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) {
+func (e *Throttler) Delete(event.DeleteEvent, workqueue.RateLimitingInterface) {
 }
 
 // Generic implements EventHandler.

controllers/metrics/record.go

@@ -34,6 +34,10 @@ const (
 	RepoSyncName = "repo-sync"
 	// RootSyncName is the expected name of any RootSync CR.
 	RootSyncName = "root-sync"
+
+	//nolint:gosec // ignore the false-positive alert for G101: Potential hardcoded credentials
+	// CMSNamespace is the name of the Config Sync controller's namespace
+	CMSNamespace = "config-management-system"
 )
 
 // RecordReconcileDuration produces a measurement for the ReconcileDuration view.
@@ -108,7 +112,7 @@ func RecordPipelineError(ctx context.Context, nn types.NamespacedName, component
 
 // ComputeReconcilerName computes the reconciler name from the ResourceGroup CR name
 func ComputeReconcilerNameType(nn types.NamespacedName) (reconcilerName, reconcilerType string) {
-	if nn.Namespace == "config-management-system" {
+	if nn.Namespace == CMSNamespace {
 		if nn.Name == RootSyncName {
 			return RootReconcilerPrefix, RootSyncName
 		}

controllers/profiler/profile.go

@@ -21,6 +21,7 @@ import (
 
 	//nolint:gosec // pprof init() registers handlers, which we serve with ListenAndServe
 	_ "net/http/pprof"
+	"time"
 
 	"k8s.io/klog/v2"
 )
@@ -34,7 +35,11 @@ func Service() {
 		go func() {
 			klog.Infof("Starting profiling on port %d", *profilerPort)
 			addr := fmt.Sprintf(":%d", *profilerPort)
-			err := http.ListenAndServe(addr, nil)
+			server := &http.Server{
+				Addr:              addr,
+				ReadHeaderTimeout: 30 * time.Second,
+			}
+			err := server.ListenAndServe()
 			if err != nil {
 				klog.Fatalf("Profiler server failed to start: %+v", err)
 			}

controllers/root/root_controller.go

@@ -229,7 +229,7 @@ type NoGenericEventPredicate struct {
 }
 
 // Generic skips all generic events
-func (NoGenericEventPredicate) Generic(e event.GenericEvent) bool {
+func (NoGenericEventPredicate) Generic(event.GenericEvent) bool {
 	return false
 }
 

controllers/typeresolver/typeresolver.go

@@ -73,7 +73,7 @@ func (r *TypeResolver) Resolve(gk schema.GroupKind) (schema.GroupVersionKind, bo
 
 // +kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=get;list;watch
 
-func (r *TypeResolver) Reconcile(c context.Context, req ctrl.Request) (ctrl.Result, error) {
+func (r *TypeResolver) Reconcile(context.Context, ctrl.Request) (ctrl.Result, error) {
 	logger := r.log
 	logger.Info("refreshing type resolver")
 	r.Refresh()

controllers/watch/filteredwatcher.go

@@ -149,7 +149,7 @@ func waitUntilNextRetry(retries int) {
 // Run reads the event from the base watch interface,
 // filters the event and pushes the object contained
 // in the event to the controller work queue.
-func (w *filteredWatcher) Run(ctx context.Context) error {
+func (w *filteredWatcher) Run(context.Context) error {
 	klog.Infof("Watch started for %s", w.gvk)
 	var resourceVersion string
 	var retriesForWatchError int

controllers/watch/manager_test.go

@@ -37,7 +37,7 @@ func fakeRunnable(ctx context.Context) Runnable {
 }
 
 func fakeError(gvk schema.GroupVersionKind) error {
-	return errors.New("failed")
+	return errors.Errorf("failed error for %q", gvk)
 }
 
 func testRunnables(_ context.Context, errOnType map[schema.GroupVersionKind]bool) func(context.Context, watcherConfig) (Runnable, error) {