refactor: migrate to golangci-lint v2 (#798)

* refactor: migrate to golangci-lint v2

Signed-off-by: Bruno Schaatsbergen <[email protected]>

* refactor: fix staticcheck complaints (type inference and embedded fields)

Signed-off-by: Bruno Schaatsbergen <[email protected]>

* fix: disable QF1008

This reduces noise from the staticcheck linter, preventing it from discouraging the use of embedded struct fields.

Signed-off-by: Bruno Schaatsbergen <[email protected]>

---------

Signed-off-by: Bruno Schaatsbergen <[email protected]>

Author: bschaatsbergen

.github/workflows/golangci-lint.yaml

@@ -25,8 +25,7 @@ jobs:
         with:
           go-version: stable
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # v9
         with:
-          args: --timeout=5m
-          version: v1.64
+          version: v2.6
           only-new-issues: true

.golangci.yml

@@ -1,40 +1,49 @@
+version: "2"
 run:
-  timeout: 5m
   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: "pkg/*"
-      linters:
-        - dupl
-        - lll
 linters:
-  disable-all: true
+  default: none
   enable:
+    - copyloopvar
     - dupl
     - errcheck
-    - copyloopvar
     - goconst
     - gocyclo
-    - gofmt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - lll
     - misspell
     - nakedret
     - prealloc
     - staticcheck
-    - typecheck
     - unconvert
     - unparam
     - unused
+  exclusions:
+    generated: lax
+    rules:
+      - linters:
+          - lll
+        path: api/*
+      - linters:
+          - dupl
+          - lll
+        path: pkg/*
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+  settings:
+    staticcheck:
+      checks:
+        - -QF1008
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

pkg/apis/condition_set.go

@@ -269,7 +269,7 @@ func findMostUnhealthy(deps []v1alpha1.Condition) (v1alpha1.Condition, bool) {
 			return true // non-nil comes before nil (opposite of Before)
 		}
 
-		return deps[i].LastTransitionTime.Time.After(deps[j].LastTransitionTime.Time)
+		return deps[i].LastTransitionTime.After(deps[j].LastTransitionTime.Time)
 	})
 
 	// First check the conditions with Status == False.
@@ -316,7 +316,7 @@ func (c ConditionSet) findUnhealthyDependents() []v1alpha1.Condition {
 			return true // non-nil comes before nil (opposite of Before)
 		}
 
-		return deps[i].LastTransitionTime.Time.After(deps[j].LastTransitionTime.Time)
+		return deps[i].LastTransitionTime.After(deps[j].LastTransitionTime.Time)
 	})
 	return deps
 }

pkg/applyset/applyset_test.go

@@ -310,7 +310,7 @@ func TestApplySet_Prune(t *testing.T) {
 
 	// This CM will be pruned
 	pruneCM := configMap("prune-cm", "default")
-	pruneCM.Unstructured.SetLabels(map[string]string{
+	pruneCM.SetLabels(map[string]string{
 		ApplysetPartOfLabel: "applyset-wHf5Gity0G0nPN34KuNBIBBEOu2H9ED2KqsblMPFygM-v1",
 	})
 	aset, dynamicClient := newTestApplySet(t, parent, pruneCM)
@@ -437,11 +437,11 @@ func TestApplySet_PruneMultiNamespace(t *testing.T) {
 
 	// These CMs will be pruned
 	pruneCM1 := configMap("prune-cm", "ns1")
-	pruneCM1.Unstructured.SetLabels(map[string]string{
+	pruneCM1.SetLabels(map[string]string{
 		ApplysetPartOfLabel: "applyset-wHf5Gity0G0nPN34KuNBIBBEOu2H9ED2KqsblMPFygM-v1",
 	})
 	pruneCM2 := configMap("prune-cm", "ns2")
-	pruneCM2.Unstructured.SetLabels(map[string]string{
+	pruneCM2.SetLabels(map[string]string{
 		ApplysetPartOfLabel: "applyset-wHf5Gity0G0nPN34KuNBIBBEOu2H9ED2KqsblMPFygM-v1",
 	})
 	aset, dynamicClient := newTestApplySet(t, parent, pruneCM1, pruneCM2)
@@ -501,7 +501,7 @@ func TestApplySet_PruneMultiNamespace(t *testing.T) {
 		return true, &parentPatch, nil
 	})
 
-	var pruned int = 0
+	var pruned = 0
 	dynamicClient.PrependReactor("delete", "configmaps", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) {
 		deleteAction := action.(k8stesting.DeleteAction)
 		assert.Equal(t, "prune-cm", deleteAction.GetName())
@@ -525,11 +525,11 @@ func TestApplySet_PruneOldNamespace(t *testing.T) {
 
 	// CM in old namespace should be pruned
 	pruneCM1 := configMap("prune-cm", "oldns1")
-	pruneCM1.Unstructured.SetLabels(map[string]string{
+	pruneCM1.SetLabels(map[string]string{
 		ApplysetPartOfLabel: "applyset-wHf5Gity0G0nPN34KuNBIBBEOu2H9ED2KqsblMPFygM-v1",
 	})
 	pruneCM2 := configMap("prune-cm", "ns2")
-	pruneCM2.Unstructured.SetLabels(map[string]string{
+	pruneCM2.SetLabels(map[string]string{
 		ApplysetPartOfLabel: "applyset-wHf5Gity0G0nPN34KuNBIBBEOu2H9ED2KqsblMPFygM-v1",
 	})
 	aset, dynamicClient := newTestApplySet(t, parent, pruneCM1, pruneCM2)
@@ -589,7 +589,7 @@ func TestApplySet_PruneOldNamespace(t *testing.T) {
 		return true, &parentPatch, nil
 	})
 
-	var pruned int = 0
+	var pruned = 0
 	dynamicClient.PrependReactor("delete", "configmaps", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) {
 		deleteAction := action.(k8stesting.DeleteAction)
 		assert.Equal(t, "prune-cm", deleteAction.GetName())
@@ -613,7 +613,7 @@ func TestApplySet_PruneOldGVKs(t *testing.T) {
 
 	// Foo type should be pruned
 	pruneFoo := foo("prune-foo", "ns1")
-	pruneFoo.Unstructured.SetLabels(map[string]string{
+	pruneFoo.SetLabels(map[string]string{
 		ApplysetPartOfLabel: "applyset-wHf5Gity0G0nPN34KuNBIBBEOu2H9ED2KqsblMPFygM-v1",
 	})
 	aset, dynamicClient := newTestApplySet(t, parent, pruneFoo)
@@ -659,7 +659,7 @@ func TestApplySet_PruneOldGVKs(t *testing.T) {
 		return true, &parentPatch, nil
 	})
 
-	var pruned int = 0
+	var pruned = 0
 	dynamicClient.PrependReactor("delete", "foos", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) {
 		deleteAction := action.(k8stesting.DeleteAction)
 		assert.Equal(t, "prune-foo", deleteAction.GetName())

pkg/dynamiccontroller/dynamic_controller_test.go

@@ -364,7 +364,7 @@ func TestInstanceUpdatePolicy(t *testing.T) {
 	assert.Equal(t, dc.queue.Len(), 2)
 	for dc.queue.Len() > 0 {
 		name, _ := dc.queue.Get()
-		_, ok := objs[name.NamespacedName.String()]
+		_, ok := objs[name.String()]
 		assert.True(t, ok)
 	}
 }

pkg/graph/parser/parser.go

@@ -196,7 +196,7 @@ func validateSchema(schema *spec.Schema, path string) error {
 
 func parseObject(field map[string]interface{}, schema *spec.Schema, path string, expectedTypes []string) ([]variable.FieldDescriptor, error) {
 	// Look for vendor schema extensions first
-	if len(schema.VendorExtensible.Extensions) > 0 {
+	if len(schema.Extensions) > 0 {
 		// If the schema has the x-kubernetes-preserve-unknown-fields extension, we need to parse
 		// this field using the schemaless parser. This allows us to extract CEL expressions from
 		// fields that don't have a strict schema definition, while still preserving any unknown
@@ -233,7 +233,7 @@ func parseObject(field map[string]interface{}, schema *spec.Schema, path string,
 
 func parseArray(field []interface{}, schema *spec.Schema, path string, expectedTypes []string) ([]variable.FieldDescriptor, error) {
 	// Look for vendor schema extensions first
-	if len(schema.VendorExtensible.Extensions) > 0 {
+	if len(schema.Extensions) > 0 {
 		// If the schema has the x-kubernetes-preserve-unknown-fields extension, we need to parse
 		// this field using the schemaless parser. This allows us to extract CEL expressions from
 		// fields that don't have a strict schema definition, while still preserving any unknown
@@ -419,7 +419,7 @@ func joinPathAndFieldName(path, fieldName string) string {
 
 // hasStructuralSchemaMarkerEnabled checks if a schema has a specific marker enabled.
 func hasStructuralSchemaMarkerEnabled(schema *spec.Schema, marker string) bool {
-	if ext, ok := schema.VendorExtensible.Extensions[marker]; ok {
+	if ext, ok := schema.Extensions[marker]; ok {
 		if enabled, ok := ext.(bool); ok && enabled {
 			return true
 		}

pkg/graph/schema/conversion_cel_type_test.go

@@ -221,8 +221,8 @@ func TestExtractSchemaFromDeclTypeWithCycleDetection(t *testing.T) {
 			name: "no cycle - simple object",
 			setupDeclType: func() *apiservercel.DeclType {
 				schema := &spec.Schema{}
-				schema.SchemaProps.Type = []string{"object"}
-				schema.SchemaProps.Properties = map[string]spec.Schema{
+				schema.Type = []string{"object"}
+				schema.Properties = map[string]spec.Schema{
 					"name":  {SchemaProps: spec.SchemaProps{Type: []string{"string"}}},
 					"value": {SchemaProps: spec.SchemaProps{Type: []string{"integer"}}},
 				}
@@ -249,8 +249,8 @@ func TestExtractSchemaFromDeclTypeWithCycleDetection(t *testing.T) {
 			name: "cycle detected - error out",
 			setupDeclType: func() *apiservercel.DeclType {
 				schema := &spec.Schema{}
-				schema.SchemaProps.Type = []string{"object"}
-				schema.SchemaProps.Properties = map[string]spec.Schema{
+				schema.Type = []string{"object"}
+				schema.Properties = map[string]spec.Schema{
 					"name": {SchemaProps: spec.SchemaProps{Type: []string{"string"}}},
 				}
 				return openapi.SchemaDeclType(schema, false).MaybeAssignTypeName("CyclicType")

pkg/graph/schema/conversion_schema.go

@@ -73,7 +73,7 @@ func ConvertJSONSchemaPropsToSpecSchema(props *extv1.JSONSchemaProps) (*spec.Sch
 	}
 
 	if len(props.Type) > 0 {
-		schema.SchemaProps.Type = []string{props.Type}
+		schema.Type = []string{props.Type}
 	}
 
 	if props.Items != nil {

pkg/runtime/resolver/resolver.go

@@ -130,7 +130,7 @@ func (r *Resolver) resolveField(field variable.FieldDescriptor) ResolutionResult
 				result.Error = fmt.Errorf("no data provided for expression: %s", expr)
 				return result
 			}
-			replaced = strings.Replace(replaced, "${"+expr+"}", fmt.Sprintf("%v", replacement), -1)
+			replaced = strings.ReplaceAll(replaced, "${"+expr+"}", fmt.Sprintf("%v", replacement))
 		}
 
 		err = r.setValueAtPath(field.Path, replaced)