Skip to content

Commit 507b9a2

Browse files
authored
Merge pull request #7336 from oscr/golangci-lint-1.50
✨ Update golangci-lint 1.50. Enable new linter dupword
2 parents f4bcd02 + dbcd0a0 commit 507b9a2

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ jobs:
2525
- name: golangci-lint
2626
uses: golangci/[email protected]
2727
with:
28-
version: v1.49.0
28+
version: v1.50.0
2929
working-directory: ${{matrix.working-directory}}

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ linters:
88
- containedctx
99
- depguard
1010
- dogsled
11+
- dupword
1112
- durationcheck
1213
- errcheck
1314
- errchkjson

cmd/clusterctl/client/yamlprocessor/simple_processor_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func TestSimpleProcessor_Process(t *testing.T) {
186186
configVariablesClient: test.NewFakeVariableClient().
187187
WithVar("BAR", "bar"),
188188
},
189-
want: []byte("foo bar, bar, bar"),
189+
want: []byte("foo bar, bar, bar"), //nolint:dupword
190190
wantErr: false,
191191
},
192192
{
@@ -196,7 +196,7 @@ func TestSimpleProcessor_Process(t *testing.T) {
196196
configVariablesClient: test.NewFakeVariableClient().
197197
WithVar("BAR", "bar"),
198198
},
199-
want: []byte(`\\ foo bar, bar, bar`),
199+
want: []byte(`\\ foo bar, bar, bar`), //nolint:dupword
200200
wantErr: false,
201201
},
202202
{

internal/contract/types_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func TestPath_IsParenOf(t *testing.T) {
6060
want: false,
6161
},
6262
{
63-
name: "False for not overlapping path path",
63+
name: "False for not overlapping path",
6464
p: Path{"foo", "bar"},
6565
other: Path{"baz"},
6666
want: false,
@@ -102,7 +102,7 @@ func TestPath_Equal(t *testing.T) {
102102
want: false,
103103
},
104104
{
105-
name: "False for not overlapping path path",
105+
name: "False for not overlapping path",
106106
p: Path{"foo", "bar"},
107107
other: Path{"baz"},
108108
want: false,
@@ -144,7 +144,7 @@ func TestPath_Overlaps(t *testing.T) {
144144
want: true,
145145
},
146146
{
147-
name: "False for not overlapping path path",
147+
name: "False for not overlapping path",
148148
p: Path{"foo", "bar"},
149149
other: Path{"baz"},
150150
want: false,

0 commit comments

Comments
 (0)