chore: Migrate to golangci-lint v2

Author: mrueg

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ env:
   E2E_SETUP_KUBECTL: yes
   SUDO: sudo
   GO_VERSION: "^1.24"
-  GOLANGCI_LINT_VERSION: "v1.64.6"
+  GOLANGCI_LINT_VERSION: "v2.0.2"
 
 jobs:
   ci-go-lint:

.golangci.yml

@@ -1,15 +1,10 @@
-run:
-  timeout: 10m
-
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - gocritic
     - gocyclo
-    - gofmt
-    - goimports
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - misspell
@@ -18,22 +13,34 @@ linters:
     - staticcheck
     - unconvert
     - unused
-
-linters-settings:
-  goimports:
-    local-prefixes: k8s.io/kube-state-metrics,k8s.io/kube-state-metrics/v2
-
-issues:
-  exclude-use-default: false
-  exclude-rules:
-    # We don't check metrics naming in the tests.
-    - path: _test\.go
-      linters:
-        - promlinter
-    # TODO(mrueg) Improve error handling
-    - text: "G104:"
-      linters:
-        - gosec
-    - text: "package-comments:"
-      linters:
-        - revive
+  exclusions:
+    generated: lax
+    rules:
+      - linters:
+          - promlinter
+        path: _test\.go
+      - linters:
+          - gosec
+        text: 'G104:'
+      - linters:
+          - revive
+        text: 'package-comments:'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - k8s.io/kube-state-metrics
+        - k8s.io/kube-state-metrics/v2
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

internal/store/clusterrole.go

@@ -131,7 +131,7 @@ func clusterRoleMetricFamilies(allowAnnotationsList, allowLabelsList []string) [
 			"",
 			wrapClusterRoleFunc(func(r *rbacv1.ClusterRole) *metric.Family {
 				return &metric.Family{
-					Metrics: resourceVersionMetric(r.ObjectMeta.ResourceVersion),
+					Metrics: resourceVersionMetric(r.ResourceVersion),
 				}
 			}),
 		),

internal/store/clusterrolebinding.go

@@ -133,7 +133,7 @@ func clusterRoleBindingMetricFamilies(allowAnnotationsList, allowLabelsList []st
 			"",
 			wrapClusterRoleBindingFunc(func(r *rbacv1.ClusterRoleBinding) *metric.Family {
 				return &metric.Family{
-					Metrics: resourceVersionMetric(r.ObjectMeta.ResourceVersion),
+					Metrics: resourceVersionMetric(r.ResourceVersion),
 				}
 			}),
 		),

internal/store/configmap.go

@@ -127,7 +127,7 @@ func configMapMetricFamilies(allowAnnotationsList, allowLabelsList []string) []g
 			"",
 			wrapConfigMapFunc(func(c *v1.ConfigMap) *metric.Family {
 				return &metric.Family{
-					Metrics: resourceVersionMetric(c.ObjectMeta.ResourceVersion),
+					Metrics: resourceVersionMetric(c.ResourceVersion),
 				}
 			}),
 		),

internal/store/cronjob.go

@@ -273,7 +273,7 @@ func cronJobMetricFamilies(allowAnnotationsList, allowLabelsList []string) []gen
 			"",
 			wrapCronJobFunc(func(j *batchv1.CronJob) *metric.Family {
 				return &metric.Family{
-					Metrics: resourceVersionMetric(j.ObjectMeta.ResourceVersion),
+					Metrics: resourceVersionMetric(j.ResourceVersion),
 				}
 			}),
 		),
@@ -358,7 +358,7 @@ func getNextScheduledTime(schedule string, lastScheduleTime *metav1.Time, create
 
 	sched, err := cron.ParseStandard(schedule)
 	if err != nil {
-		return time.Time{}, fmt.Errorf("Failed to parse cron job schedule '%s': %w", schedule, err)
+		return time.Time{}, fmt.Errorf("failed to parse cron job schedule '%s': %w", schedule, err)
 	}
 	if !lastScheduleTime.IsZero() {
 		return sched.Next(lastScheduleTime.Time), nil

internal/store/daemonset.go

@@ -217,7 +217,7 @@ func daemonSetMetricFamilies(allowAnnotationsList, allowLabelsList []string) []g
 						{
 							LabelKeys:   []string{},
 							LabelValues: []string{},
-							Value:       float64(d.ObjectMeta.Generation),
+							Value:       float64(d.Generation),
 						},
 					},
 				}

internal/store/deployment.go

@@ -277,7 +277,7 @@ func deploymentMetricFamilies(allowAnnotationsList, allowLabelsList []string) []
 				return &metric.Family{
 					Metrics: []*metric.Metric{
 						{
-							Value: float64(d.ObjectMeta.Generation),
+							Value: float64(d.Generation),
 						},
 					},
 				}

internal/store/horizontalpodautoscaler.go

@@ -134,7 +134,7 @@ func createHPAMetaDataGeneration() generator.FamilyGenerator {
 			return &metric.Family{
 				Metrics: []*metric.Metric{
 					{
-						Value: float64(a.ObjectMeta.Generation),
+						Value: float64(a.Generation),
 					},
 				},
 			}

internal/store/ingress.go

@@ -140,7 +140,7 @@ func ingressMetricFamilies(allowAnnotationsList, allowLabelsList []string) []gen
 			"",
 			wrapIngressFunc(func(i *networkingv1.Ingress) *metric.Family {
 				return &metric.Family{
-					Metrics: resourceVersionMetric(i.ObjectMeta.ResourceVersion),
+					Metrics: resourceVersionMetric(i.ResourceVersion),
 				}
 			}),
 		),

pkg/app/server.go

@@ -497,7 +497,7 @@ func resolveCustomResourceConfig(opts *options.Options) (customresourcestate.Con
 	if file := opts.CustomResourceConfigFile; file != "" {
 		f, err := os.Open(filepath.Clean(file))
 		if err != nil {
-			return nil, fmt.Errorf("Custom Resource State Metrics file could not be opened: %v", err)
+			return nil, fmt.Errorf("unable to open Custom Resource State Metrics file: %v", err)
 		}
 		return yaml.NewDecoder(f), nil
 	}

pkg/customresourcestate/registry_factory.go

@@ -70,7 +70,7 @@ func compileCommon(c MetricMeta) (*compiledCommon, error) {
 }
 
 func compileFamily(f Generator, resource Resource) (*compiledFamily, error) {
-	labels := resource.Labels.Merge(f.Labels)
+	labels := resource.Merge(f.Labels)
 
 	if f.Each.Type == metric.Info && !strings.HasSuffix(f.Name, "_info") {
 		klog.InfoS("Info metric does not have _info suffix", "gvk", resource.GroupVersionKind.String(), "name", f.Name)
@@ -652,7 +652,7 @@ func compilePath(path []string) (out valuePath, _ error) {
 							// negative index
 							i += len(s)
 						}
-						if !(0 <= i && i < len(s)) {
+						if i < 0 || i > len(s) {
 							return fmt.Errorf("list index out of range: %s", part)
 						}
 						return s[i]

pkg/sharding/listwatch_test.go

@@ -42,7 +42,7 @@ func TestSharding(t *testing.T) {
 		totalShards: 2,
 	}
 
-	if !(s1.keep(cm) || s2.keep(cm)) {
+	if !s1.keep(cm) && !s2.keep(cm) {
 		t.Fatal("One shard must pick up the object.")
 	}
 

pkg/util/utils.go

@@ -135,7 +135,7 @@ func GVRFromType(resourceName string, expectedType interface{}) (*schema.GroupVe
 	}
 	t, err := meta.TypeAccessor(expectedType)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to get type accessor for %T: %w", expectedType, err)
+		return nil, fmt.Errorf("failed to get type accessor for %T: %w", expectedType, err)
 	}
 	apiVersion := t.GetAPIVersion()
 	g, v, found := strings.Cut(apiVersion, "/")

tests/e2e/framework/framework.go

@@ -118,7 +118,7 @@ func (k *KSMClient) IsHealthz() (bool, error) {
 
 func (k *KSMClient) writeMetrics(endpoint *url.URL, w io.Writer) error {
 	if endpoint == nil {
-		return errors.New("Endpoint is nil")
+		return errors.New("endpoint is nil")
 	}
 
 	u := *endpoint
@@ -165,7 +165,7 @@ func (f *Framework) ParseMetrics(metrics func(io.Writer) error) (map[string]*dto
 	buf := &bytes.Buffer{}
 	err := metrics(buf)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to get metrics: %w", err)
+		return nil, fmt.Errorf("failed to get metrics: %w", err)
 	}
 
 	parser := &expfmt.TextParser{}

tests/lib/lib_test.go

@@ -62,7 +62,7 @@ func TestAsLibrary(t *testing.T) {
 	}
 	m := w.String()
 
-	if !strings.Contains(m, service.ObjectMeta.Name) {
+	if !strings.Contains(m, service.Name) {
 		t.Fatal("expected string to contain service name")
 	}
 }