Skip to content

Commit c5b2272

Browse files
authored
Migrate to golangci-lint v2 (#616)
1 parent 3d853db commit c5b2272

File tree

5 files changed

+35
-15
lines changed

5 files changed

+35
-15
lines changed

.github/workflows/docker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
cache: false
3939

4040
- name: Lint
41-
uses: golangci/golangci-lint-action@v6
41+
uses: golangci/golangci-lint-action@v7
4242
with:
43-
args: --build-tags integration -p bugs -p unused -D protogetter --timeout=5m
43+
args: --build-tags integration -D protogetter --timeout=5m
4444

4545
- name: Make tag
4646
run: |

.golangci.yaml

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,33 @@
1+
version: "2"
12
run:
23
concurrency: 4
34
linters:
5+
enable:
6+
- asciicheck
7+
- bidichk
8+
- gocheckcompilerdirectives
9+
- testifylint
410
disable:
11+
- errcheck
12+
- govet
513
- musttag
614
- protogetter
7-
enable:
8-
- testifylint
9-
- unused
10-
presets:
11-
- bugs
12-
- unused
13-
fast: true
15+
- staticcheck
16+
exclusions:
17+
generated: lax
18+
presets:
19+
- comments
20+
- common-false-positives
21+
- legacy
22+
- std-error-handling
23+
paths:
24+
- third_party$
25+
- builtin$
26+
- examples$
27+
formatters:
28+
exclusions:
29+
generated: lax
30+
paths:
31+
- third_party$
32+
- builtin$
33+
- examples$

cmd/metal-api/internal/datastore/integer_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func TestRethinkStore_AcquireRandomUniqueInteger(t *testing.T) {
120120

121121
got, err := ip.AcquireRandomUniqueInteger()
122122
require.NoError(t, err)
123-
assert.EqualValues(t, rs.VRFPoolRangeMin, got)
123+
assert.Equal(t, rs.VRFPoolRangeMin, got)
124124

125125
mock.AssertExpectations(t)
126126
}
@@ -164,7 +164,7 @@ func TestRethinkStore_AcquireUniqueInteger(t *testing.T) {
164164
require.EqualError(t, err, tt.err.Error())
165165
} else {
166166
require.NoError(t, err)
167-
assert.EqualValues(t, tt.value, got)
167+
assert.Equal(t, tt.value, got)
168168
}
169169

170170
if tt.requiresMock {
@@ -238,7 +238,7 @@ func TestRethinkStore_genericAcquire(t *testing.T) {
238238
require.EqualError(t, err, tt.expectedErr.Error())
239239
} else {
240240
require.NoError(t, err)
241-
assert.EqualValues(t, tt.value, got)
241+
assert.Equal(t, tt.value, got)
242242
}
243243

244244
if tt.requiresMock {

cmd/metal-api/internal/service/machine-service_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ func TestSetMachineStateIssuerResetWhenAvailable(t *testing.T) {
295295
require.NoError(t, err)
296296
require.Equal(t, "1", result.ID)
297297
require.Equal(t, string(metal.AvailableState), result.State.Value)
298-
require.Equal(t, "", result.State.Description)
299-
require.Equal(t, "", result.State.Issuer)
298+
require.Empty(t, result.State.Description)
299+
require.Empty(t, result.State.Issuer)
300300
}
301301

302302
func TestGetMachine(t *testing.T) {

cmd/metal-api/internal/service/size-service_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func TestGetSize(t *testing.T) {
7575
require.Equal(t, testdata.Sz1.ID, result.ID)
7676
require.Equal(t, testdata.Sz1.Name, *result.Name)
7777
require.Equal(t, testdata.Sz1.Description, *result.Description)
78-
require.Equal(t, len(testdata.Sz1.Constraints), len(result.SizeConstraints))
78+
require.Len(t, testdata.Sz1.Constraints, len(result.SizeConstraints))
7979
}
8080

8181
func TestSuggest(t *testing.T) {

0 commit comments

Comments
 (0)