Skip to content

Commit 8028dd4

Browse files
authored
Modernize golangci-lint config (#1298)
- 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>
1 parent c78344f commit 8028dd4

4 files changed

Lines changed: 16 additions & 17 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/installer/v1alpha1/register.go

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

5454
// Adds the list of known types to api.Scheme.
5555
func addKnownTypes(scheme *runtime.Scheme) error {
56-
scheme.AddKnownTypes(SchemeGroupVersion,
56+
scheme.AddKnownTypes(
57+
SchemeGroupVersion,
5758
&Acaas{},
5859
&AcaasList{},
5960
&AccountsUi{},
@@ -150,7 +151,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
150151
&WebsiteList{},
151152
)
152153

153-
scheme.AddKnownTypes(SchemeGroupVersion,
154+
scheme.AddKnownTypes(
155+
SchemeGroupVersion,
154156
&metav1.Status{},
155157
)
156158
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)

apis/installer/v1alpha1/types_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ import (
2929
)
3030

3131
func TestDefaultValues(t *testing.T) {
32-
checker := sc.New(os.DirFS("../../.."),
32+
checker := sc.New(
33+
os.DirFS("../../.."),
3334
sc.TestCase{Obj: v1alpha1.AcaasSpec{}},
3435
sc.TestCase{Obj: v1alpha1.AccountsUiSpec{}},
3536
sc.TestCase{Obj: v1alpha1.AceInstallerSpec{}},

cmd/update-version/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ func process(filename string, charts map[string]string) error {
101101
if rs != nil {
102102
_, err = obj.Pipe(
103103
yaml.Lookup("helm", "releases", name),
104-
yaml.SetField("version", yaml.NewScalarRNode(chartVersion)))
104+
yaml.SetField("version", yaml.NewScalarRNode(chartVersion)),
105+
)
105106
if err != nil {
106107
log.Fatal(err)
107108
}

0 commit comments

Comments
 (0)