Skip to content

Commit 1bbfd06

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1291 from camilamacedo86/lint
enable lint golint and fix notifications
2 parents 0f3644a + ade6f5f commit 1bbfd06

File tree

14 files changed

+45
-50
lines changed

14 files changed

+45
-50
lines changed

‎cmd/edit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func newEditProjectCmd() *cobra.Command {
6060

6161
err = saveProjectFile("PROJECT", &projectInfo)
6262
if err != nil {
63-
log.Fatalf("error updating project file with resource information : %v \n", err)
63+
log.Fatalf("error updating project file with resource information : %v", err)
6464
}
6565
},
6666
}

‎pkg/scaffold/api.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func (api *API) scaffoldV2() error {
181181
// If the --force was used to re-crete a resource that was created before then,
182182
// the PROJECT file will not be updated.
183183
if err := saveProjectFile("PROJECT", api.project); err != nil {
184-
return fmt.Errorf("error updating project file with resource information : %v \n", err)
184+
return fmt.Errorf("error updating project file with resource information: %v", err)
185185
}
186186
}
187187

@@ -249,7 +249,7 @@ func (api *API) scaffoldV2() error {
249249
}
250250

251251
ctrlScaffolder := &controllerv2.Controller{Resource: r}
252-
testsuiteScaffolder := &controllerv2.ControllerSuiteTest{Resource: r}
252+
testsuiteScaffolder := &controllerv2.SuiteTest{Resource: r}
253253
err := scaffold.Execute(
254254
api.buildUniverse(),
255255
input.Options{},
@@ -297,10 +297,10 @@ func (api *API) isGroupAllowed(r *resource.Resource) bool {
297297
// validateResourceGroup will return an error if the group cannot be created
298298
func (api *API) validateResourceGroup(r *resource.Resource) error {
299299
if api.resourceExists() && !api.Force {
300-
return fmt.Errorf("group '%s', version '%s' and kind '%s' already exists.", r.Group, r.Version, r.Kind)
300+
return fmt.Errorf("group '%s', version '%s' and kind '%s' already exists", r.Group, r.Version, r.Kind)
301301
}
302302
if !api.isGroupAllowed(r) {
303-
return fmt.Errorf("group '%s' is not same as existing group. Multiple groups are not enabled in this project. To enable, use the multigroup command.", r.Group)
303+
return fmt.Errorf("group '%s' is not same as existing group. Multiple groups are not enabled in this project. To enable, use the multigroup command", r.Group)
304304
}
305305
return nil
306306
}

‎pkg/scaffold/project.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ func (p *V2Project) Scaffold() error {
239239
&webhook.Service{},
240240
&webhook.InjectCAPatch{},
241241
&prometheus.Kustomization{},
242-
&prometheus.PrometheusServiceMonitor{},
242+
&prometheus.ServiceMonitor{},
243243
&certmanager.CertManager{},
244244
&certmanager.Kustomization{},
245245
&certmanager.KustomizeConfig{})

‎pkg/scaffold/scaffold.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func (s *Scaffold) setFields(t input.File) {
100100
}
101101
}
102102

103-
func (_ *Scaffold) validate(file input.File) error {
103+
func (s *Scaffold) validate(file input.File) error {
104104
if reqValFile, ok := file.(input.RequiresValidation); ok {
105105
return reqValFile.Validate()
106106
}
@@ -239,11 +239,11 @@ func (s *Scaffold) buildFileModel(e input.File) (*model.File, error) {
239239
Path: i.Path,
240240
}
241241

242-
if b, err := s.doTemplate(i, e); err != nil {
242+
b, err := s.doTemplate(i, e)
243+
if err != nil {
243244
return nil, err
244-
} else {
245-
m.Contents = string(b)
246245
}
246+
m.Contents = string(b)
247247

248248
return m, nil
249249
}

‎pkg/scaffold/util/util.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ func GetResourceInfo(r *resource.Resource, repo, domain string, isMultiGroup boo
7878

7979
if isMultiGroup {
8080
return path.Join(repo, "apis", r.Group), r.Group + "." + domain
81-
} else {
82-
return path.Join(repo, "api"), r.Group + "." + domain
8381
}
82+
return path.Join(repo, "api"), r.Group + "." + domain
8483
}

‎pkg/scaffold/v1/crd/crd_sample.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
var _ input.File = &CRDSample{}
2929

3030
// CRDSample scaffolds a manifest for CRD sample.
31+
// nolint:golint
3132
type CRDSample struct {
3233
input.Input
3334

‎pkg/scaffold/v2/controller/controller_suitetest.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ import (
2727
"sigs.k8s.io/kubebuilder/pkg/scaffold/v2/internal"
2828
)
2929

30-
var _ input.File = &ControllerSuiteTest{}
30+
var _ input.File = &SuiteTest{}
3131

32-
// ControllerSuiteTest scaffolds the suite_test.go file to setup the controller test
33-
type ControllerSuiteTest struct {
32+
// SuiteTest scaffolds the suite_test.go file to setup the controller test
33+
type SuiteTest struct {
3434
input.Input
3535

3636
// Resource is the Resource to make the Controller for
3737
Resource *resource.Resource
3838
}
3939

4040
// GetInput implements input.File
41-
func (f *ControllerSuiteTest) GetInput() (input.Input, error) {
41+
func (f *SuiteTest) GetInput() (input.Input, error) {
4242

4343
if f.Path == "" {
4444
if f.MultiGroup {
@@ -53,7 +53,7 @@ func (f *ControllerSuiteTest) GetInput() (input.Input, error) {
5353
}
5454

5555
// Validate validates the values
56-
func (f *ControllerSuiteTest) Validate() error {
56+
func (f *SuiteTest) Validate() error {
5757
return f.Resource.Validate()
5858
}
5959

@@ -121,7 +121,7 @@ var _ = AfterSuite(func() {
121121

122122
// Update updates given file (suite_test.go) with code fragments required for
123123
// adding import paths and code setup for new types.
124-
func (f *ControllerSuiteTest) Update() error {
124+
func (f *SuiteTest) Update() error {
125125

126126
resourcePackage, _ := util.GetResourceInfo(f.Resource, f.Repo, f.Domain, f.MultiGroup)
127127

@@ -137,8 +137,8 @@ Expect(err).NotTo(HaveOccurred())
137137

138138
err := internal.InsertStringsInFile(f.Path,
139139
map[string][]string{
140-
scaffoldv2.ApiPkgImportScaffoldMarker: {ctrlImportCodeFragment, apiImportCodeFragment},
141-
scaffoldv2.ApiSchemeScaffoldMarker: {addschemeCodeFragment},
140+
scaffoldv2.APIPkgImportScaffoldMarker: {ctrlImportCodeFragment, apiImportCodeFragment},
141+
scaffoldv2.APISchemeScaffoldMarker: {addschemeCodeFragment},
142142
})
143143
if err != nil {
144144
return err

‎pkg/scaffold/v2/main.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
)
2828

2929
const (
30-
ApiPkgImportScaffoldMarker = "// +kubebuilder:scaffold:imports"
31-
ApiSchemeScaffoldMarker = "// +kubebuilder:scaffold:scheme"
30+
APIPkgImportScaffoldMarker = "// +kubebuilder:scaffold:imports"
31+
APISchemeScaffoldMarker = "// +kubebuilder:scaffold:scheme"
3232
ReconcilerSetupScaffoldMarker = "// +kubebuilder:scaffold:builder"
3333
)
3434

@@ -104,8 +104,8 @@ func (f *Main) Update(opts *MainUpdateOptions) error {
104104
if opts.WireResource {
105105
err := internal.InsertStringsInFile(path,
106106
map[string][]string{
107-
ApiPkgImportScaffoldMarker: {apiImportCodeFragment},
108-
ApiSchemeScaffoldMarker: {addschemeCodeFragment},
107+
APIPkgImportScaffoldMarker: {apiImportCodeFragment},
108+
APISchemeScaffoldMarker: {addschemeCodeFragment},
109109
})
110110
if err != nil {
111111
return err
@@ -115,17 +115,17 @@ func (f *Main) Update(opts *MainUpdateOptions) error {
115115
if opts.WireController {
116116
return internal.InsertStringsInFile(path,
117117
map[string][]string{
118-
ApiPkgImportScaffoldMarker: {apiImportCodeFragment, ctrlImportCodeFragment},
119-
ApiSchemeScaffoldMarker: {addschemeCodeFragment},
118+
APIPkgImportScaffoldMarker: {apiImportCodeFragment, ctrlImportCodeFragment},
119+
APISchemeScaffoldMarker: {addschemeCodeFragment},
120120
ReconcilerSetupScaffoldMarker: {reconcilerSetupCodeFragment},
121121
})
122122
}
123123

124124
if opts.WireWebhook {
125125
return internal.InsertStringsInFile(path,
126126
map[string][]string{
127-
ApiPkgImportScaffoldMarker: {apiImportCodeFragment, ctrlImportCodeFragment},
128-
ApiSchemeScaffoldMarker: {addschemeCodeFragment},
127+
APIPkgImportScaffoldMarker: {apiImportCodeFragment, ctrlImportCodeFragment},
128+
APISchemeScaffoldMarker: {addschemeCodeFragment},
129129
ReconcilerSetupScaffoldMarker: {webhookSetupCodeFragment},
130130
})
131131
}
@@ -205,4 +205,4 @@ func main() {
205205
os.Exit(1)
206206
}
207207
}
208-
`, ApiPkgImportScaffoldMarker, ApiSchemeScaffoldMarker, ReconcilerSetupScaffoldMarker)
208+
`, APIPkgImportScaffoldMarker, APISchemeScaffoldMarker, ReconcilerSetupScaffoldMarker)

‎pkg/scaffold/v2/prometheus/monitor.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@ import (
2222
"sigs.k8s.io/kubebuilder/pkg/scaffold/input"
2323
)
2424

25-
var _ input.File = &PrometheusServiceMonitor{}
25+
var _ input.File = &ServiceMonitor{}
2626

27-
// PrometheusMetricsService scaffolds an issuer CR and a certificate CR
28-
type PrometheusServiceMonitor struct {
27+
// ServiceMonitor scaffolds an issuer CR and a certificate CR
28+
type ServiceMonitor struct {
2929
input.Input
3030
}
3131

3232
// GetInput implements input.File
33-
func (f *PrometheusServiceMonitor) GetInput() (input.Input, error) {
33+
func (f *ServiceMonitor) GetInput() (input.Input, error) {
3434
if f.Path == "" {
3535
f.Path = filepath.Join("config", "prometheus", "monitor.yaml")
3636
}
37-
f.TemplateBody = monitorTemplate
37+
f.TemplateBody = serviceMonitorTemplate
3838
return f.Input, nil
3939
}
4040

41-
const monitorTemplate = `
41+
const serviceMonitorTemplate = `
4242
# Prometheus Monitor Service (Metrics)
4343
apiVersion: monitoring.coreos.com/v1
4444
kind: ServiceMonitor

‎scripts/verify.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ golangci-lint run --disable-all \
3939
--enable=gosec \
4040
--enable=staticcheck \
4141
--enable=unused \
42-
--enable=gosimple
42+
--enable=gosimple \
43+
--enable=golint \
4344

44-
##todo(camilamacedo86): The following checks requires fixes in the code
45-
# --enable=golint
46-
# --enable=lll

‎test/e2e/utils/kubectl.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,26 @@ func (k *Kubectl) Apply(inNamespace bool, cmdOptions ...string) (string, error)
5454
ops := append([]string{"apply"}, cmdOptions...)
5555
if inNamespace {
5656
return k.CommandInNamespace(ops...)
57-
} else {
58-
return k.Command(ops...)
5957
}
58+
return k.Command(ops...)
6059
}
6160

6261
// Get is a func to run kubectl get commands
6362
func (k *Kubectl) Get(inNamespace bool, cmdOptions ...string) (string, error) {
6463
ops := append([]string{"get"}, cmdOptions...)
6564
if inNamespace {
6665
return k.CommandInNamespace(ops...)
67-
} else {
68-
return k.Command(ops...)
6966
}
67+
return k.Command(ops...)
7068
}
7169

7270
// Delete is a func to run kubectl delete commands
7371
func (k *Kubectl) Delete(inNamespace bool, cmdOptions ...string) (string, error) {
7472
ops := append([]string{"delete"}, cmdOptions...)
7573
if inNamespace {
7674
return k.CommandInNamespace(ops...)
77-
} else {
78-
return k.Command(ops...)
7975
}
76+
return k.Command(ops...)
8077
}
8178

8279
// Logs is a func to run kubectl logs commands

‎test/e2e/utils/test_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"path/filepath"
2525
"strings"
2626

27-
. "github.com/onsi/ginkgo"
27+
. "github.com/onsi/ginkgo" //nolint:golint
2828
)
2929

3030
const certmanagerVersion = "v0.11.0"

‎test/e2e/v1/e2e_suite.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"strings"
2424
"time"
2525

26-
. "github.com/onsi/ginkgo"
27-
. "github.com/onsi/gomega"
26+
. "github.com/onsi/ginkgo" //nolint:golint
27+
. "github.com/onsi/gomega" //nolint:golint
2828

2929
"sigs.k8s.io/kubebuilder/test/e2e/utils"
3030
)

‎test/e2e/v2/e2e_suite.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"strings"
2626
"time"
2727

28-
. "github.com/onsi/ginkgo"
29-
. "github.com/onsi/gomega"
28+
. "github.com/onsi/ginkgo" //nolint:golint
29+
. "github.com/onsi/gomega" //nolint:golint
3030

3131
"sigs.k8s.io/kubebuilder/test/e2e/utils"
3232
)

0 commit comments

Comments
 (0)