Skip to content

Commit 959c3ae

Browse files
committed
Fix linting issues
1 parent f66df57 commit 959c3ae

3 files changed

Lines changed: 11 additions & 12 deletions

File tree

.golangci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ linters-settings:
66
cyclop:
77
max-complexity: 10
88
govet:
9-
check-shadowing: true
9+
shadow: true
1010
lll:
1111
line-length: 170
1212
tab-width: 4
@@ -23,10 +23,8 @@ linters:
2323
# we should re-enable them and make lint pass
2424
disable:
2525
- goimports
26-
- maligned
2726
- gochecknoglobals
2827
- exhaustruct
29-
- exhaustivestruct
3028
- wrapcheck
3129
- gomoddirectives
3230
- godox

pkg/mergo/transformers/transformers.go

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

2929
// TransformerMap is a mergo.Transformers implementation.
30-
type TransformerMap map[reflect.Type]func(dst, src reflect.Value) error
30+
type TransformerMap map[reflect.Type]func(dst, src reflect.Value) error //nolint: recvcheck
3131

3232
// PodSpec mergo transformers for corev1.PodSpec.
3333
var PodSpec TransformerMap
@@ -87,7 +87,7 @@ func (s TransformerMap) Transformer(t reflect.Type) func(dst, src reflect.Value)
8787
func (s *TransformerMap) mergeByKey(key string, dst, elem reflect.Value, opts ...func(*mergo.Config)) error {
8888
elemKey := elem.FieldByName(key)
8989

90-
for i := 0; i < dst.Len(); i++ {
90+
for i := range dst.Len() {
9191
dstKey := dst.Index(i).FieldByName(key)
9292

9393
if elemKey.Kind() != dstKey.Kind() {
@@ -141,7 +141,7 @@ func eq(key string, a, b reflect.Value) bool {
141141
}
142142

143143
func indexByKey(key string, v reflect.Value, list reflect.Value) (int, bool) {
144-
for i := 0; i < list.Len(); i++ {
144+
for i := range list.Len() {
145145
if eq(key, v, list.Index(i)) {
146146
return i, true
147147
}
@@ -164,7 +164,7 @@ func (s *TransformerMap) MergeListByKey(key string, opts ...func(*mergo.Config))
164164
return func(dst, src reflect.Value) error {
165165
entries := reflect.MakeSlice(src.Type(), src.Len(), src.Len())
166166

167-
for i := 0; i < src.Len(); i++ {
167+
for i := range src.Len() {
168168
elem := src.Index(i)
169169

170170
if err := s.mergeByKey(key, dst, elem, opts...); err != nil {
@@ -190,7 +190,7 @@ func (s *TransformerMap) MergeListByKey(key string, opts ...func(*mergo.Config))
190190
// NilOtherFields nils all fields not defined in src.
191191
func (s *TransformerMap) NilOtherFields(opts ...func(*mergo.Config)) func(_, _ reflect.Value) error {
192192
return func(dst, src reflect.Value) error {
193-
for i := 0; i < dst.NumField(); i++ {
193+
for i := range dst.NumField() {
194194
dstField := dst.Type().Field(i)
195195
srcValue := src.FieldByName(dstField.Name)
196196
dstValue := dst.FieldByName(dstField.Name)

pkg/syncer/syncer.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package syncer
1818

1919
import (
2020
"context"
21+
"errors"
2122
"fmt"
2223

2324
"github.com/iancoleman/strcase"
@@ -36,11 +37,11 @@ const (
3637

3738
var (
3839
// ErrOwnerDeleted is returned when the object owner is marked for deletion.
39-
ErrOwnerDeleted = fmt.Errorf("owner is deleted")
40+
ErrOwnerDeleted = errors.New("owner is deleted")
4041

4142
// ErrIgnore is returned for ignored errors.
4243
// Ignored errors are treated by the syncer as successful syncs.
43-
ErrIgnore = fmt.Errorf("ignored error")
44+
ErrIgnore = errors.New("ignored error")
4445
)
4546

4647
// IgnoredError wraps and marks errors as being ignored.
@@ -50,10 +51,10 @@ func IgnoredError(err error) error {
5051

5152
func basicEventReason(objKindName string, err error) string {
5253
if err != nil {
53-
return fmt.Sprintf("%sSyncFailed", strcase.ToCamel(objKindName))
54+
return strcase.ToCamel(objKindName) + "SyncFailed"
5455
}
5556

56-
return fmt.Sprintf("%sSyncSuccessfull", strcase.ToCamel(objKindName))
57+
return strcase.ToCamel(objKindName) + "SyncSuccessfull"
5758
}
5859

5960
// Redacts sensitive data from runtime.Object making them suitable for logging.

0 commit comments

Comments
 (0)