From 1cb7af97599046b9f80cde3d7825b672270a614d Mon Sep 17 00:00:00 2001
From: Tamal Saha <tamal@appscode.com>
Date: Sat, 11 Jul 2026 17:58:09 +0600
Subject: [PATCH] Modernize golangci-lint config

- Enable bodyclose and prealloc linters
- Move exclude-files/exclude-dirs to linters.exclusions.paths (golangci-lint
  v2 location) and fix over-escaped regex generated.*\\.go -> generated.*\.go
- Switch formatter from gofmt to gofumpt and drop the interface{} -> any
  rewrite rule (gofumpt is a stricter superset)
- Apply resulting gofumpt formatting

Signed-off-by: Tamal Saha <tamal@appscode.com>
---
 .golangci.yml                       | 21 ++++++++-------------
 apis/wizards/v1alpha1/register.go   |  6 ++++--
 apis/wizards/v1alpha1/types_test.go |  3 ++-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index cdd2defce0..1ebcfa46a0 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -2,27 +2,22 @@ version: "2"
 linters:
   default: standard
   enable:
+    - bodyclose
+    - prealloc
     - unparam
+  exclusions:
+    paths:
+      - generated.*\.go
+      - client
+      - vendor
 
 formatters:
   enable:
-    - gofmt
+    - gofumpt
     - goimports
-  settings:
-    gofmt:
-      rewrite-rules:
-        - pattern: 'interface{}'
-          replacement: 'any'
 
 issues:
   max-same-issues: 100
 
-  exclude-files:
-    - generated.*\\.go
-
-  exclude-dirs:
-    - client
-    - vendor
-
 run:
   timeout: 10m
diff --git a/apis/wizards/v1alpha1/register.go b/apis/wizards/v1alpha1/register.go
index b3830b18a6..d999b38fe4 100644
--- a/apis/wizards/v1alpha1/register.go
+++ b/apis/wizards/v1alpha1/register.go
@@ -53,7 +53,8 @@ func Resource(resource string) schema.GroupResource {
 
 // Adds the list of known types to api.Scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
+	scheme.AddKnownTypes(
+		SchemeGroupVersion,
 		&KubedbcomDruidEditorOptions{},
 		&KubedbcomDruidEditorOptionsList{},
 		&KubedbcomElasticsearchEditorOptions{},
@@ -94,7 +95,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&StoragekubestashcomBackupstorageEditorOptionsList{},
 	)
 
-	scheme.AddKnownTypes(SchemeGroupVersion,
+	scheme.AddKnownTypes(
+		SchemeGroupVersion,
 		&metav1.Status{},
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
diff --git a/apis/wizards/v1alpha1/types_test.go b/apis/wizards/v1alpha1/types_test.go
index d89015bb0c..bfccf40418 100644
--- a/apis/wizards/v1alpha1/types_test.go
+++ b/apis/wizards/v1alpha1/types_test.go
@@ -26,7 +26,8 @@ import (
 )
 
 func TestDefaultValues(t *testing.T) {
-	checker := schemachecker.New(os.DirFS("../../.."),
+	checker := schemachecker.New(
+		os.DirFS("../../.."),
 		schemachecker.TestCase{Obj: v1alpha1.KubedbcomElasticsearchEditorOptionsSpec{}},
 		schemachecker.TestCase{Obj: v1alpha1.KubedbcomMariadbEditorOptionsSpec{}},
 		schemachecker.TestCase{Obj: v1alpha1.KubedbcomMemcachedEditorOptionsSpec{}},