Skip to content

Commit fbc418f

Browse files
committed
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 <tamal@appscode.com>
1 parent 57e6394 commit fbc418f

7 files changed

Lines changed: 31 additions & 26 deletions

File tree

.golangci.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,22 @@ version: "2"
22
linters:
33
default: standard
44
enable:
5+
- bodyclose
6+
- prealloc
57
- unparam
8+
exclusions:
9+
paths:
10+
- generated.*\.go
11+
- client
12+
- vendor
613

714
formatters:
815
enable:
9-
- gofmt
16+
- gofumpt
1017
- goimports
11-
settings:
12-
gofmt:
13-
rewrite-rules:
14-
- pattern: 'interface{}'
15-
replacement: 'any'
1618

1719
issues:
1820
max-same-issues: 100
1921

20-
exclude-files:
21-
- generated.*\\.go
22-
23-
exclude-dirs:
24-
- client
25-
- vendor
26-
2722
run:
2823
timeout: 10m

apis/editor/v1alpha1/register.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ func Resource(resource string) schema.GroupResource {
4848

4949
// Adds the list of known types to api.Scheme.
5050
func addKnownTypes(scheme *runtime.Scheme) error {
51-
scheme.AddKnownTypes(SchemeGroupVersion,
51+
scheme.AddKnownTypes(
52+
SchemeGroupVersion,
5253
&EditorModel{},
5354
)
5455

55-
scheme.AddKnownTypes(SchemeGroupVersion,
56+
scheme.AddKnownTypes(
57+
SchemeGroupVersion,
5658
&metav1.Status{},
5759
)
5860
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)

apis/management/v1alpha1/register.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,14 @@ func Resource(resource string) schema.GroupResource {
4848

4949
// Adds the list of known types to api.Scheme.
5050
func addKnownTypes(scheme *runtime.Scheme) error {
51-
scheme.AddKnownTypes(SchemeGroupVersion,
51+
scheme.AddKnownTypes(
52+
SchemeGroupVersion,
5253
&ProjectQuota{},
5354
&ProjectQuotaList{},
5455
)
5556

56-
scheme.AddKnownTypes(SchemeGroupVersion,
57+
scheme.AddKnownTypes(
58+
SchemeGroupVersion,
5759
&metav1.Status{},
5860
)
5961
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)

apis/meta/v1alpha1/register.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ func Resource(resource string) schema.GroupResource {
4848

4949
// Adds the list of known types to api.Scheme.
5050
func addKnownTypes(scheme *runtime.Scheme) error {
51-
scheme.AddKnownTypes(SchemeGroupVersion,
51+
scheme.AddKnownTypes(
52+
SchemeGroupVersion,
5253
&ChartPresetQuery{},
5354
&ClusterProfile{},
5455
&ClusterProfileList{},
@@ -82,7 +83,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
8283
&RenderDashboard{},
8384
)
8485

85-
scheme.AddKnownTypes(SchemeGroupVersion,
86+
scheme.AddKnownTypes(
87+
SchemeGroupVersion,
8688
&metav1.Status{},
8789
)
8890
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)

apis/node/v1alpha1/register.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,14 @@ func Resource(resource string) schema.GroupResource {
4848

4949
// Adds the list of known types to api.Scheme.
5050
func addKnownTypes(scheme *runtime.Scheme) error {
51-
scheme.AddKnownTypes(SchemeGroupVersion,
51+
scheme.AddKnownTypes(
52+
SchemeGroupVersion,
5253
&NodeTopology{},
5354
&NodeTopologyList{},
5455
)
5556

56-
scheme.AddKnownTypes(SchemeGroupVersion,
57+
scheme.AddKnownTypes(
58+
SchemeGroupVersion,
5759
&metav1.Status{},
5860
)
5961
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)

apis/ui/v1alpha1/register.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ func Resource(resource string) schema.GroupResource {
4848

4949
// Adds the list of known types to api.Scheme.
5050
func addKnownTypes(scheme *runtime.Scheme) error {
51-
scheme.AddKnownTypes(SchemeGroupVersion,
51+
scheme.AddKnownTypes(
52+
SchemeGroupVersion,
5253
&ClusterProfile{},
5354
&ClusterProfileList{},
5455
&Feature{},
@@ -63,7 +64,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
6364
&ResourceOutlineFilterList{},
6465
)
6566

66-
scheme.AddKnownTypes(SchemeGroupVersion,
67+
scheme.AddKnownTypes(
68+
SchemeGroupVersion,
6769
&metav1.Status{},
6870
)
6971
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)

pkg/tableconvertor/util.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,16 +320,16 @@ func describeVolume(volume core.Volume) string {
320320
sources.WriteString("{")
321321
if source.Secret != nil {
322322
sources.WriteString("\"Type\": \"Secret\",")
323-
sources.WriteString(fmt.Sprintf("\"SecretName\": %q", source.Secret.Name))
323+
fmt.Fprintf(&sources, "\"SecretName\": %q", source.Secret.Name)
324324
} else if source.DownwardAPI != nil {
325325
sources.WriteString("\"Type\": \"DownwardAPI\",")
326326
sources.WriteString("\"DownwardAPI\": \"true\"")
327327
} else if source.ConfigMap != nil {
328328
sources.WriteString("\"Type\": \"ConfigMap\",")
329-
sources.WriteString(fmt.Sprintf("\"ConfigMapName\": %q", source.ConfigMap.Name))
329+
fmt.Fprintf(&sources, "\"ConfigMapName\": %q", source.ConfigMap.Name)
330330
} else if source.ServiceAccountToken != nil {
331331
sources.WriteString("\"Type\": \"ServiceAccountToken\",")
332-
sources.WriteString(fmt.Sprintf("\"TokenExpirationSeconds\": \"%v\"", source.ServiceAccountToken.ExpirationSeconds))
332+
fmt.Fprintf(&sources, "\"TokenExpirationSeconds\": \"%v\"", source.ServiceAccountToken.ExpirationSeconds)
333333
}
334334
sources.WriteString("}")
335335
if i < len(projected.Sources)-1 {

0 commit comments

Comments
 (0)