Skip to content

Commit 06c400a

Browse files
committed
Fix linter errors
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
1 parent 52dd4c0 commit 06c400a

File tree

9 files changed

+68
-54
lines changed

9 files changed

+68
-54
lines changed

.golangci.json

Lines changed: 0 additions & 46 deletions
This file was deleted.

.golangci.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
issues:
2+
max-issues-per-linter: 1000
3+
max-same-issues: 100
4+
formatters:
5+
enable:
6+
- gofmt
7+
- goimports
8+
exclusions:
9+
generated: lax
10+
paths:
11+
- third_party$
12+
- builtin$
13+
- examples$
14+
linters:
15+
default: none
16+
enable:
17+
- govet
18+
- revive
19+
settings:
20+
revive:
21+
enable-all-rules: true
22+
rules:
23+
- {name: add-constant, disabled: true}
24+
- {name: argument-limit, disabled: true}
25+
- {name: cognitive-complexity, disabled: true}
26+
- {name: confusing-naming, disabled: true}
27+
- {name: confusing-results, disabled: true}
28+
- {name: cyclomatic, disabled: true}
29+
- {name: early-return, disabled: true}
30+
- {name: empty-block, disabled: true}
31+
- {name: enforce-switch-style, disabled: true}
32+
- {name: flag-parameter, disabled: true}
33+
- {name: function-length, disabled: true}
34+
- {name: function-result-limit, disabled: true}
35+
- {name: import-shadowing, disabled: true}
36+
- {name: line-length-limit, disabled: true}
37+
- {name: max-control-nesting, disabled: true}
38+
- {name: max-public-structs, disabled: true}
39+
- {name: redundant-import-alias, disabled: true}
40+
- {name: unsecure-url-scheme, disabled: true}
41+
- {name: unused-parameter, disabled: true}
42+
- {name: unused-receiver, disabled: true}
43+
- {name: use-waitgroup-go, disabled: true}
44+
- {name: var-naming, disabled: true}
45+
exclusions:
46+
generated: lax
47+
paths:
48+
- third_party$
49+
- builtin$
50+
- examples$
51+
- tests/
52+
presets:
53+
- comments
54+
- common-false-positives
55+
- legacy
56+
- std-error-handling
57+
version: "2"

pkg/apis/helm.cattle.io/v1/types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package v1
22

3+
//revive:disable:struct-tag
4+
35
import (
46
corev1 "k8s.io/api/core/v1"
57
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/codegen/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func main() {
1616
Boilerplate: "scripts/boilerplate.go.txt",
1717
Groups: map[string]args.Group{
1818
"helm.cattle.io": {
19-
Types: []interface{}{
19+
Types: []any{
2020
v1.HelmChart{},
2121
v1.HelmChartConfig{},
2222
},

pkg/controllers/chart/chart.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ func Register(
119119
cm corecontroller.ConfigMapController,
120120
s corecontroller.SecretController,
121121
sCache corecontroller.SecretCache) {
122-
123122
c := &Controller{
124123
systemNamespace: systemNamespace,
125124
jobClusterRole: jobClusterRole,
@@ -184,7 +183,7 @@ func Register(
184183
func (c *Controller) jobPatcher(namespace, name string, pt types.PatchType, data []byte) (runtime.Object, error) {
185184
err := c.jobs.Delete(namespace, name, &metav1.DeleteOptions{PropagationPolicy: &deletePolicy})
186185
if err == nil || apierrors.IsNotFound(err) {
187-
return nil, fmt.Errorf("create or replace job")
186+
return nil, errors.New("create or replace job")
188187
}
189188
return nil, err
190189
}

pkg/crds/crds.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package crds
22

33
import (
44
"embed"
5+
"errors"
56
"fmt"
67
"path"
78

@@ -18,7 +19,7 @@ var (
1819
//go:embed yaml
1920
crdFS embed.FS
2021

21-
errDuplicate = fmt.Errorf("duplicate CRD")
22+
errDuplicate = errors.New("duplicate CRD")
2223
)
2324

2425
func List() ([]*apiextv1.CustomResourceDefinition, error) {

test/framework/framework.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"bytes"
55
"context"
66
"encoding/base64"
7+
"errors"
78
"fmt"
89
"io"
910
"net/http"
@@ -108,7 +109,6 @@ func (f *Framework) beforeFramework() {
108109
f.ClientExt = clientext
109110
f.Name = common.Name
110111
f.Namespace = common.Name
111-
112112
}
113113

114114
func errExit(msg string, err error) {
@@ -192,7 +192,7 @@ func (f *Framework) UpdateHelmChart(chart *v1.HelmChart, namespace string) (upda
192192
}); err != nil {
193193
updated = nil
194194
}
195-
return
195+
return updated, err
196196
}
197197

198198
func (f *Framework) DeleteHelmChart(name, namespace string) error {
@@ -246,7 +246,7 @@ func (f *Framework) ListChartPods(chart *v1.HelmChart, appName string) ([]corev1
246246

247247
func (f *Framework) GetJob(chart *v1.HelmChart) (*batchv1.Job, error) {
248248
if chart.Status.JobName == "" {
249-
return nil, fmt.Errorf("waiting for job name to be populated")
249+
return nil, errors.New("waiting for job name to be populated")
250250
}
251251
r, err := f.ClientSet.BatchV1().Jobs(chart.Namespace).Get(context.TODO(), chart.Status.JobName, metav1.GetOptions{})
252252
if err != nil {

test/suite/helm_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"time"
77

8+
//revive:disable:dot-imports
89
. "github.com/onsi/ginkgo/v2"
910
. "github.com/onsi/gomega"
1011
batchv1 "k8s.io/api/batch/v1"
@@ -499,7 +500,6 @@ var _ = Describe("HelmChart Controller Tests", Ordered, func() {
499500

500501
Eventually(framework.ListReleases, 120*time.Second, 5*time.Second).WithArguments(chart).Should(HaveLen(0))
501502
})
502-
503503
})
504504

505505
Context("When a HelmChart creates a namespace", func() {

test/suite/zz_suite_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package suite_test
33
import (
44
"testing"
55

6+
//revive:disable:dot-imports
67
. "github.com/onsi/ginkgo/v2"
78
. "github.com/onsi/gomega"
89
)

0 commit comments

Comments
 (0)