make fix-golangci-lint

erikgb · erikgb · commit 3c311fd2d9cb · 2025-11-06T19:14:37.000+01:00
Signed-off-by: Erik Godding Boye &lt;egboye@gmail.com&gt;
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -14,6 +14,10 @@ linters:
     paths: [third_party, builtin$, examples$]
     warn-unused: true
   settings:
+    modernize:
+      disable:
+        # TODO(erikgb): Enable when we know how to do this correctly in API types
+        - omitzero
     staticcheck:
       checks: ["all", "-ST1000", "-ST1001", "-ST1003", "-ST1005", "-ST1012", "-ST1016", "-ST1020", "-ST1021", "-ST1022", "-QF1001", "-QF1003", "-QF1008"]
   enable:
diff --git a/test/e2e/framework/helper/helper.go b/test/e2e/framework/helper/helper.go
@@ -131,12 +131,12 @@ func (h *Helper) WaitForUnstructuredReady(dr dynamic.NamespaceableResourceInterf
 		if !found {
 			return false, nil
 		}
-		conditions, ok := status["conditions"].([]interface{})
+		conditions, ok := status["conditions"].([]any)
 		if !ok {
 			return false, errors.New(".status.conditions is not []interface{}")
 		}
 		for _, c := range conditions {
-			cond, ok := c.(map[string]interface{})
+			cond, ok := c.(map[string]any)
 			if !ok {
 				return false, errors.New(".status.conditions doesn't contain a map")
 			}

Original file line number	Diff line number	Diff line change
`@@ -131,12 +131,12 @@ func (h *Helper) WaitForUnstructuredReady(dr dynamic.NamespaceableResourceInterf`
`131`	`131`	`if !found {`
`132`	`132`	`return false, nil`
`133`	`133`	`}`
`134`		`- conditions, ok := status["conditions"].([]interface{})`
	`134`	`+ conditions, ok := status["conditions"].([]any)`
`135`	`135`	`if !ok {`
`136`	`136`	`return false, errors.New(".status.conditions is not []interface{}")`
`137`	`137`	`}`
`138`	`138`	`for _, c := range conditions {`
`139`		`- cond, ok := c.(map[string]interface{})`
	`139`	`+ cond, ok := c.(map[string]any)`
`140`	`140`	`if !ok {`
`141`	`141`	`return false, errors.New(".status.conditions doesn't contain a map")`
`142`	`142`	`}`