Skip to content

Commit e8e3964

Browse files
fredbifredbi
committed
chore: full relinting
Signed-off-by: Frederic BIDON <[email protected]>
1 parent 77926ca commit e8e3964

31 files changed

+371
-247
lines changed

‎.github/workflows/01-golang-lint.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: golangci-lint
2+
on:
3+
push:
4+
tags:
5+
- v*
6+
branches:
7+
- master
8+
- main
9+
pull_request:
10+
permissions:
11+
contents: read
12+
jobs:
13+
golangci:
14+
name: lint
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/setup-go@v4
18+
with:
19+
go-version: stable
20+
- uses: actions/checkout@v3
21+
- name: golangci-lint
22+
uses: golangci/golangci-lint-action@v3
23+
with:
24+
version: latest

‎.golangci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ linters-settings:
1313
# - ^print.*$
1414
# - 'fmt\.Print.*'
1515
gocognit:
16-
min-complexity: 65 # This is super high value. We should gradually lower it to 30-40.
16+
min-complexity: 61 # This is a rather high value. We should gradually lower it to 30-40.
1717

1818
linters:
1919
enable:
2020
- gofmt
2121
- goimports
2222
- bodyclose
2323
- dupl
24-
- forbidigo
2524
- gocognit
2625
- gocritic
2726
- goimports
@@ -33,6 +32,7 @@ linters:
3332
- unconvert
3433
- unparam
3534
disable:
35+
- forbidigo
3636
- maligned
3737
- lll
3838
- gochecknoinits

‎bool_slice_test.go‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ func TestBS(t *testing.T) {
4242

4343
vals := []string{"1", "F", "TRUE", "0"}
4444
arg := fmt.Sprintf("--bs=%s", strings.Join(vals, ","))
45-
err := f.Parse([]string{arg})
46-
if err != nil {
47-
t.Fatal("expected no error; got", err)
45+
erp := f.Parse([]string{arg})
46+
if erp != nil {
47+
t.Fatal("expected no error; got", erp)
4848
}
49+
4950
for i, v := range bs {
5051
b, err := strconv.ParseBool(vals[i])
5152
if err != nil {
@@ -55,10 +56,12 @@ func TestBS(t *testing.T) {
5556
t.Fatalf("expected is[%d] to be %s but got: %t", i, vals[i], v)
5657
}
5758
}
58-
getBS, err := f.GetBoolSlice("bs")
59-
if err != nil {
60-
t.Fatalf("got error: %v", err)
59+
60+
getBS, erb := f.GetBoolSlice("bs")
61+
if erb != nil {
62+
t.Fatalf("got error: %v", erb)
6163
}
64+
6265
for i, v := range getBS {
6366
b, err := strconv.ParseBool(vals[i])
6467
if err != nil {
@@ -76,10 +79,11 @@ func TestBSDefault(t *testing.T) {
7679

7780
vals := []string{"false", "T"}
7881

79-
err := f.Parse([]string{})
80-
if err != nil {
81-
t.Fatal("expected no error; got", err)
82+
erp := f.Parse([]string{})
83+
if erp != nil {
84+
t.Fatal("expected no error; got", erp)
8285
}
86+
8387
for i, v := range bs {
8488
b, err := strconv.ParseBool(vals[i])
8589
if err != nil {
@@ -90,10 +94,11 @@ func TestBSDefault(t *testing.T) {
9094
}
9195
}
9296

93-
getBS, err := f.GetBoolSlice("bs")
94-
if err != nil {
95-
t.Fatal("got an error from GetBoolSlice():", err)
97+
getBS, erb := f.GetBoolSlice("bs")
98+
if erb != nil {
99+
t.Fatal("got an error from GetBoolSlice():", erb)
96100
}
101+
97102
for i, v := range getBS {
98103
b, err := strconv.ParseBool(vals[i])
99104
if err != nil {
@@ -111,10 +116,11 @@ func TestBSWithDefault(t *testing.T) {
111116

112117
vals := []string{"FALSE", "1"}
113118
arg := fmt.Sprintf("--bs=%s", strings.Join(vals, ","))
114-
err := f.Parse([]string{arg})
115-
if err != nil {
116-
t.Fatal("expected no error; got", err)
119+
erp := f.Parse([]string{arg})
120+
if erp != nil {
121+
t.Fatal("expected no error; got", erp)
117122
}
123+
118124
for i, v := range bs {
119125
b, err := strconv.ParseBool(vals[i])
120126
if err != nil {
@@ -125,10 +131,11 @@ func TestBSWithDefault(t *testing.T) {
125131
}
126132
}
127133

128-
getBS, err := f.GetBoolSlice("bs")
129-
if err != nil {
130-
t.Fatal("got an error from GetBoolSlice():", err)
134+
getBS, erb := f.GetBoolSlice("bs")
135+
if erb != nil {
136+
t.Fatal("got an error from GetBoolSlice():", erb)
131137
}
138+
132139
for i, v := range getBS {
133140
b, err := strconv.ParseBool(vals[i])
134141
if err != nil {

‎bool_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (v *triStateValue) IsBoolFlag() bool {
2626
}
2727

2828
func (v *triStateValue) Get() interface{} {
29-
return triStateValue(*v)
29+
return *v
3030
}
3131

3232
func (v *triStateValue) Set(s string) error {

‎bytes_test.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,15 @@ func TestBytesHex(t *testing.T) {
5252
for _, arg := range args {
5353
err := f.Parse([]string{arg})
5454

55-
if err != nil && tc.success == true {
55+
switch {
56+
case err != nil && tc.success == true:
5657
t.Errorf("expected success, got %q", err)
5758
continue
58-
} else if err == nil && tc.success == false {
59+
case err == nil && tc.success == false:
5960
// bytesHex, err := f.GetBytesHex("bytes")
6061
t.Errorf("expected failure while processing %q", tc.input)
6162
continue
62-
} else if tc.success {
63+
case tc.success:
6364
bytesHex, err := f.GetBytesHex("bytes")
6465
if err != nil {
6566
t.Errorf("Got error trying to fetch the 'bytes' flag: %v", err)
@@ -113,14 +114,15 @@ func TestBytesBase64(t *testing.T) {
113114
for _, arg := range args {
114115
err := f.Parse([]string{arg})
115116

116-
if err != nil && tc.success == true {
117+
switch {
118+
case err != nil && tc.success == true:
117119
t.Errorf("expected success, got %q", err)
118120
continue
119-
} else if err == nil && tc.success == false {
121+
case err == nil && tc.success == false:
120122
// bytesBase64, err := f.GetBytesBase64("bytes")
121123
t.Errorf("expected failure while processing %q", tc.input)
122124
continue
123-
} else if tc.success {
125+
case tc.success:
124126
bytesBase64, err := f.GetBytesBase64("bytes")
125127
if err != nil {
126128
t.Errorf("Got error trying to fetch the 'bytes' flag: %v", err)

‎count.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func newCountValue(val int, p *int) *countValue {
1313
func (i *countValue) Set(s string) error {
1414
// "+1" means that no specific value was passed, so increment
1515
if s == "+1" {
16-
*i = countValue(*i + 1)
16+
*i++
1717
return nil
1818
}
1919
v, err := strconv.ParseInt(s, 0, 0)

‎count_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@ func TestCount(t *testing.T) {
3737
tc := &testCases[i]
3838

3939
err := f.Parse(tc.input)
40-
if err != nil && tc.success == true {
40+
switch {
41+
case err != nil && tc.success == true:
4142
t.Errorf("expected success, got %q", err)
4243
continue
43-
} else if err == nil && tc.success == false {
44+
case err == nil && tc.success == false:
4445
t.Errorf("expected failure, got success")
4546
continue
46-
} else if tc.success {
47+
case tc.success:
4748
c, err := f.GetCount("verbose")
4849
if err != nil {
4950
t.Errorf("Got error trying to fetch the counter flag")

‎duration_slice_test.go‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ func TestDS(t *testing.T) {
4646

4747
vals := []string{"1ns", "2ms", "3m", "4h"}
4848
arg := fmt.Sprintf("--ds=%s", strings.Join(vals, ","))
49-
err := f.Parse([]string{arg})
50-
if err != nil {
51-
t.Fatal("expected no error; got", err)
49+
erp := f.Parse([]string{arg})
50+
if erp != nil {
51+
t.Fatal("expected no error; got", erp)
5252
}
53+
5354
for i, v := range ds {
5455
d, err := time.ParseDuration(vals[i])
5556
if err != nil {
@@ -59,10 +60,12 @@ func TestDS(t *testing.T) {
5960
t.Fatalf("expected ds[%d] to be %s but got: %d", i, vals[i], v)
6061
}
6162
}
62-
getDS, err := f.GetDurationSlice("ds")
63-
if err != nil {
64-
t.Fatalf("got error: %v", err)
63+
64+
getDS, erd := f.GetDurationSlice("ds")
65+
if erd != nil {
66+
t.Fatalf("got error: %v", erd)
6567
}
68+
6669
for i, v := range getDS {
6770
d, err := time.ParseDuration(vals[i])
6871
if err != nil {
@@ -80,10 +83,11 @@ func TestDSDefault(t *testing.T) {
8083

8184
vals := []string{"0s", "1ns"}
8285

83-
err := f.Parse([]string{})
84-
if err != nil {
85-
t.Fatal("expected no error; got", err)
86+
erp := f.Parse([]string{})
87+
if erp != nil {
88+
t.Fatal("expected no error; got", erp)
8689
}
90+
8791
for i, v := range ds {
8892
d, err := time.ParseDuration(vals[i])
8993
if err != nil {
@@ -94,10 +98,11 @@ func TestDSDefault(t *testing.T) {
9498
}
9599
}
96100

97-
getDS, err := f.GetDurationSlice("ds")
98-
if err != nil {
99-
t.Fatal("got an error from GetDurationSlice():", err)
101+
getDS, erd := f.GetDurationSlice("ds")
102+
if erd != nil {
103+
t.Fatal("got an error from GetDurationSlice():", erd)
100104
}
105+
101106
for i, v := range getDS {
102107
d, err := time.ParseDuration(vals[i])
103108
if err != nil {
@@ -115,10 +120,11 @@ func TestDSWithDefault(t *testing.T) {
115120

116121
vals := []string{"1ns", "2ns"}
117122
arg := fmt.Sprintf("--ds=%s", strings.Join(vals, ","))
118-
err := f.Parse([]string{arg})
119-
if err != nil {
120-
t.Fatal("expected no error; got", err)
123+
erp := f.Parse([]string{arg})
124+
if erp != nil {
125+
t.Fatal("expected no error; got", erp)
121126
}
127+
122128
for i, v := range ds {
123129
d, err := time.ParseDuration(vals[i])
124130
if err != nil {
@@ -129,10 +135,11 @@ func TestDSWithDefault(t *testing.T) {
129135
}
130136
}
131137

132-
getDS, err := f.GetDurationSlice("ds")
133-
if err != nil {
134-
t.Fatal("got an error from GetDurationSlice():", err)
138+
getDS, erd := f.GetDurationSlice("ds")
139+
if erd != nil {
140+
t.Fatal("got an error from GetDurationSlice():", erd)
135141
}
142+
136143
for i, v := range getDS {
137144
d, err := time.ParseDuration(vals[i])
138145
if err != nil {
@@ -180,6 +187,7 @@ func TestDSCalledTwice(t *testing.T) {
180187
if err != nil {
181188
t.Fatal("expected no error; got", err)
182189
}
190+
183191
for i, v := range ds {
184192
if expected[i] != v {
185193
t.Fatalf("expected ds[%d] to be %d but got: %d", i, expected[i], v)

0 commit comments

Comments
 (0)