From 3d9836eefff79f18dd8e2b45cb3ef7bb15cd616a Mon Sep 17 00:00:00 2001
From: Tamal Saha <tamal@appscode.com>
Date: Sat, 11 Jul 2026 17:57:25 +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/cloud/v1alpha1/register.go   |  6 ++++--
 apis/cluster/v1alpha1/register.go |  6 ++++--
 apis/config/v1alpha1/register.go  |  6 ++++--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index cdd2defce..1ebcfa46a 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/cloud/v1alpha1/register.go b/apis/cloud/v1alpha1/register.go
index e906f4bb1..6a32b74e5 100644
--- a/apis/cloud/v1alpha1/register.go
+++ b/apis/cloud/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,
 		&CloudProvider{},
 		&CloudProviderList{},
 
@@ -64,7 +65,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&MachineTypeList{},
 	)
 
-	scheme.AddKnownTypes(SchemeGroupVersion,
+	scheme.AddKnownTypes(
+		SchemeGroupVersion,
 		&metav1.Status{},
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
diff --git a/apis/cluster/v1alpha1/register.go b/apis/cluster/v1alpha1/register.go
index 8cd75c0f0..b05fce7d2 100644
--- a/apis/cluster/v1alpha1/register.go
+++ b/apis/cluster/v1alpha1/register.go
@@ -48,7 +48,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,
 		&ClusterInfo{},
 		&ClusterInfoList{},
 
@@ -59,7 +60,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ClusterUserAuthList{},
 	)
 
-	scheme.AddKnownTypes(SchemeGroupVersion,
+	scheme.AddKnownTypes(
+		SchemeGroupVersion,
 		&metav1.Status{},
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
diff --git a/apis/config/v1alpha1/register.go b/apis/config/v1alpha1/register.go
index f4660aa34..135f47590 100644
--- a/apis/config/v1alpha1/register.go
+++ b/apis/config/v1alpha1/register.go
@@ -53,11 +53,13 @@ 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,
 		&AceSetupConfig{},
 	)
 
-	scheme.AddKnownTypes(SchemeGroupVersion,
+	scheme.AddKnownTypes(
+		SchemeGroupVersion,
 		&metav1.Status{},
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)