From fbc418f812aca4c6a974de9935a798a46c8b2e27 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Fri, 10 Jul 2026 19:21:40 +0600 Subject: [PATCH] Modernize golangci-lint config and switch to gofumpt - 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 and use fmt.Fprintf over Sprintf+WriteString in tableconvertor Signed-off-by: Tamal Saha --- .golangci.yml | 21 ++++++++------------- apis/editor/v1alpha1/register.go | 6 ++++-- apis/management/v1alpha1/register.go | 6 ++++-- apis/meta/v1alpha1/register.go | 6 ++++-- apis/node/v1alpha1/register.go | 6 ++++-- apis/ui/v1alpha1/register.go | 6 ++++-- pkg/tableconvertor/util.go | 6 +++--- 7 files changed, 31 insertions(+), 26 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/editor/v1alpha1/register.go b/apis/editor/v1alpha1/register.go index 053c12290f..39d62eca8a 100644 --- a/apis/editor/v1alpha1/register.go +++ b/apis/editor/v1alpha1/register.go @@ -48,11 +48,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, &EditorModel{}, ) - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &metav1.Status{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/apis/management/v1alpha1/register.go b/apis/management/v1alpha1/register.go index 9daa322305..1eb2b6aafb 100644 --- a/apis/management/v1alpha1/register.go +++ b/apis/management/v1alpha1/register.go @@ -48,12 +48,14 @@ 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, &ProjectQuota{}, &ProjectQuotaList{}, ) - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &metav1.Status{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/apis/meta/v1alpha1/register.go b/apis/meta/v1alpha1/register.go index 91f7a4d49c..398005e933 100644 --- a/apis/meta/v1alpha1/register.go +++ b/apis/meta/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, &ChartPresetQuery{}, &ClusterProfile{}, &ClusterProfileList{}, @@ -82,7 +83,8 @@ func addKnownTypes(scheme *runtime.Scheme) error { &RenderDashboard{}, ) - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &metav1.Status{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/apis/node/v1alpha1/register.go b/apis/node/v1alpha1/register.go index 99334b8213..5e9539c9ac 100644 --- a/apis/node/v1alpha1/register.go +++ b/apis/node/v1alpha1/register.go @@ -48,12 +48,14 @@ 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, &NodeTopology{}, &NodeTopologyList{}, ) - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &metav1.Status{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/apis/ui/v1alpha1/register.go b/apis/ui/v1alpha1/register.go index e83830dea1..c3910863e8 100644 --- a/apis/ui/v1alpha1/register.go +++ b/apis/ui/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, &ClusterProfile{}, &ClusterProfileList{}, &Feature{}, @@ -63,7 +64,8 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ResourceOutlineFilterList{}, ) - scheme.AddKnownTypes(SchemeGroupVersion, + scheme.AddKnownTypes( + SchemeGroupVersion, &metav1.Status{}, ) metav1.AddToGroupVersion(scheme, SchemeGroupVersion) diff --git a/pkg/tableconvertor/util.go b/pkg/tableconvertor/util.go index 226e75951d..f9a698b434 100644 --- a/pkg/tableconvertor/util.go +++ b/pkg/tableconvertor/util.go @@ -320,16 +320,16 @@ func describeVolume(volume core.Volume) string { sources.WriteString("{") if source.Secret != nil { sources.WriteString("\"Type\": \"Secret\",") - sources.WriteString(fmt.Sprintf("\"SecretName\": %q", source.Secret.Name)) + fmt.Fprintf(&sources, "\"SecretName\": %q", source.Secret.Name) } else if source.DownwardAPI != nil { sources.WriteString("\"Type\": \"DownwardAPI\",") sources.WriteString("\"DownwardAPI\": \"true\"") } else if source.ConfigMap != nil { sources.WriteString("\"Type\": \"ConfigMap\",") - sources.WriteString(fmt.Sprintf("\"ConfigMapName\": %q", source.ConfigMap.Name)) + fmt.Fprintf(&sources, "\"ConfigMapName\": %q", source.ConfigMap.Name) } else if source.ServiceAccountToken != nil { sources.WriteString("\"Type\": \"ServiceAccountToken\",") - sources.WriteString(fmt.Sprintf("\"TokenExpirationSeconds\": \"%v\"", source.ServiceAccountToken.ExpirationSeconds)) + fmt.Fprintf(&sources, "\"TokenExpirationSeconds\": \"%v\"", source.ServiceAccountToken.ExpirationSeconds) } sources.WriteString("}") if i < len(projected.Sources)-1 {