Skip to content

Commit c79ddb3

Browse files
thockinthockin
committed
Update to support golangci-lint v2
1 parent 20a64ba commit c79ddb3

File tree

10 files changed

+89
-84
lines changed

10 files changed

+89
-84
lines changed

Diff for: ‎.github/workflows/lint.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
go-version: '>=1.21.0'
1818
cache: false
1919
- name: Lint
20-
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
20+
uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd # v7.0.0
2121
with:
2222
# version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
2323
version: latest

Diff for: ‎.golangci.yaml

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1+
version: "2"
2+
13
run:
24
timeout: 1m
35
tests: true
46

57
linters:
6-
disable-all: true
7-
enable:
8+
default: none
9+
enable: # please keep this alphabetized
10+
- asasalint
811
- asciicheck
12+
- copyloopvar
13+
- dupl
914
- errcheck
1015
- forcetypeassert
16+
- goconst
1117
- gocritic
12-
- gofmt
13-
- goimports
14-
- gosimple
1518
- govet
1619
- ineffassign
1720
- misspell
21+
- musttag
1822
- revive
1923
- staticcheck
20-
- typecheck
2124
- unused
2225

2326
issues:
24-
exclude-use-default: false
2527
max-issues-per-linter: 0
2628
max-same-issues: 10

Diff for: ‎benchmark/benchmark_slog_test.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -32,42 +32,42 @@ import (
3232
//
3333

3434
func BenchmarkSlogSinkLogInfoOneArg(b *testing.B) {
35-
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard()))
35+
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard())) //nolint:staticcheck
3636
doInfoOneArg(b, log)
3737
}
3838

3939
func BenchmarkSlogSinkLogInfoSeveralArgs(b *testing.B) {
40-
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard()))
40+
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard())) //nolint:staticcheck
4141
doInfoSeveralArgs(b, log)
4242
}
4343

4444
func BenchmarkSlogSinkLogInfoWithValues(b *testing.B) {
45-
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard()))
45+
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard())) //nolint:staticcheck
4646
doInfoWithValues(b, log)
4747
}
4848

4949
func BenchmarkSlogSinkLogV0Info(b *testing.B) {
50-
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard()))
50+
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard())) //nolint:staticcheck
5151
doV0Info(b, log)
5252
}
5353

5454
func BenchmarkSlogSinkLogV9Info(b *testing.B) {
55-
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard()))
55+
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard())) //nolint:staticcheck
5656
doV9Info(b, log)
5757
}
5858

5959
func BenchmarkSlogSinkLogError(b *testing.B) {
60-
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard()))
60+
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard())) //nolint:staticcheck
6161
doError(b, log)
6262
}
6363

6464
func BenchmarkSlogSinkWithValues(b *testing.B) {
65-
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard()))
65+
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard())) //nolint:staticcheck
6666
doWithValues(b, log)
6767
}
6868

6969
func BenchmarkSlogSinkWithName(b *testing.B) {
70-
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard()))
70+
var log logr.Logger = logr.FromSlogHandler(logr.ToSlogHandler(logr.Discard())) //nolint:staticcheck
7171
doWithName(b, log)
7272
}
7373

@@ -82,61 +82,61 @@ func makeSlogJSONLogger() logr.Logger {
8282
}
8383

8484
func BenchmarkSlogJSONLogInfoOneArg(b *testing.B) {
85-
var log logr.Logger = makeSlogJSONLogger()
85+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
8686
doInfoOneArg(b, log)
8787
}
8888

8989
func BenchmarkSlogJSONLogInfoSeveralArgs(b *testing.B) {
90-
var log logr.Logger = makeSlogJSONLogger()
90+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
9191
doInfoSeveralArgs(b, log)
9292
}
9393

9494
func BenchmarkSlogJSONLogInfoWithValues(b *testing.B) {
95-
var log logr.Logger = makeSlogJSONLogger()
95+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
9696
doInfoWithValues(b, log)
9797
}
9898

9999
func BenchmarkSlogJSONLogV0Info(b *testing.B) {
100-
var log logr.Logger = makeSlogJSONLogger()
100+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
101101
doV0Info(b, log)
102102
}
103103

104104
func BenchmarkSlogJSONLogV9Info(b *testing.B) {
105-
var log logr.Logger = makeSlogJSONLogger()
105+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
106106
doV9Info(b, log)
107107
}
108108

109109
func BenchmarkSlogJSONLogError(b *testing.B) {
110-
var log logr.Logger = makeSlogJSONLogger()
110+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
111111
doError(b, log)
112112
}
113113

114114
func BenchmarkSlogJSONLogWithValues(b *testing.B) {
115-
var log logr.Logger = makeSlogJSONLogger()
115+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
116116
doWithValues(b, log)
117117
}
118118

119119
func BenchmarkSlogJSONWithName(b *testing.B) {
120-
var log logr.Logger = makeSlogJSONLogger()
120+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
121121
doWithName(b, log)
122122
}
123123

124124
func BenchmarkSlogJSONWithCallDepth(b *testing.B) {
125-
var log logr.Logger = makeSlogJSONLogger()
125+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
126126
doWithCallDepth(b, log)
127127
}
128128

129129
func BenchmarkSlogJSONLogInfoStringerValue(b *testing.B) {
130-
var log logr.Logger = makeSlogJSONLogger()
130+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
131131
doStringerValue(b, log)
132132
}
133133

134134
func BenchmarkSlogJSONLogInfoErrorValue(b *testing.B) {
135-
var log logr.Logger = makeSlogJSONLogger()
135+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
136136
doErrorValue(b, log)
137137
}
138138

139139
func BenchmarkSlogJSONLogInfoMarshalerValue(b *testing.B) {
140-
var log logr.Logger = makeSlogJSONLogger()
140+
var log logr.Logger = makeSlogJSONLogger() //nolint:staticcheck
141141
doMarshalerValue(b, log)
142142
}

Diff for: ‎benchmark/benchmark_test.go

+26-26
Original file line numberDiff line numberDiff line change
@@ -146,42 +146,42 @@ func doMarshalerValue(b *testing.B, log logr.Logger) {
146146
//
147147

148148
func BenchmarkDiscardLogInfoOneArg(b *testing.B) {
149-
var log logr.Logger = logr.Discard()
149+
var log logr.Logger = logr.Discard() //nolint:staticcheck
150150
doInfoOneArg(b, log)
151151
}
152152

153153
func BenchmarkDiscardLogInfoSeveralArgs(b *testing.B) {
154-
var log logr.Logger = logr.Discard()
154+
var log logr.Logger = logr.Discard() //nolint:staticcheck
155155
doInfoSeveralArgs(b, log)
156156
}
157157

158158
func BenchmarkDiscardLogInfoWithValues(b *testing.B) {
159-
var log logr.Logger = logr.Discard()
159+
var log logr.Logger = logr.Discard() //nolint:staticcheck
160160
doInfoWithValues(b, log)
161161
}
162162

163163
func BenchmarkDiscardLogV0Info(b *testing.B) {
164-
var log logr.Logger = logr.Discard()
164+
var log logr.Logger = logr.Discard() //nolint:staticcheck
165165
doV0Info(b, log)
166166
}
167167

168168
func BenchmarkDiscardLogV9Info(b *testing.B) {
169-
var log logr.Logger = logr.Discard()
169+
var log logr.Logger = logr.Discard() //nolint:staticcheck
170170
doV9Info(b, log)
171171
}
172172

173173
func BenchmarkDiscardLogError(b *testing.B) {
174-
var log logr.Logger = logr.Discard()
174+
var log logr.Logger = logr.Discard() //nolint:staticcheck
175175
doError(b, log)
176176
}
177177

178178
func BenchmarkDiscardWithValues(b *testing.B) {
179-
var log logr.Logger = logr.Discard()
179+
var log logr.Logger = logr.Discard() //nolint:staticcheck
180180
doWithValues(b, log)
181181
}
182182

183183
func BenchmarkDiscardWithName(b *testing.B) {
184-
var log logr.Logger = logr.Discard()
184+
var log logr.Logger = logr.Discard() //nolint:staticcheck
185185
doWithName(b, log)
186186
}
187187

@@ -193,91 +193,91 @@ func noopKV(_, _ string) {}
193193
func noopJSON(_ string) {}
194194

195195
func BenchmarkFuncrLogInfoOneArg(b *testing.B) {
196-
var log logr.Logger = funcr.New(noopKV, funcr.Options{})
196+
var log logr.Logger = funcr.New(noopKV, funcr.Options{}) //nolint:staticcheck
197197
doInfoOneArg(b, log)
198198
}
199199

200200
func BenchmarkFuncrJSONLogInfoOneArg(b *testing.B) {
201-
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{})
201+
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{}) //nolint:staticcheck
202202
doInfoOneArg(b, log)
203203
}
204204

205205
func BenchmarkFuncrLogInfoSeveralArgs(b *testing.B) {
206-
var log logr.Logger = funcr.New(noopKV, funcr.Options{})
206+
var log logr.Logger = funcr.New(noopKV, funcr.Options{}) //nolint:staticcheck
207207
doInfoSeveralArgs(b, log)
208208
}
209209

210210
func BenchmarkFuncrJSONLogInfoSeveralArgs(b *testing.B) {
211-
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{})
211+
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{}) //nolint:staticcheck
212212
doInfoSeveralArgs(b, log)
213213
}
214214

215215
func BenchmarkFuncrLogInfoWithValues(b *testing.B) {
216-
var log logr.Logger = funcr.New(noopKV, funcr.Options{})
216+
var log logr.Logger = funcr.New(noopKV, funcr.Options{}) //nolint:staticcheck
217217
doInfoWithValues(b, log)
218218
}
219219

220220
func BenchmarkFuncrJSONLogInfoWithValues(b *testing.B) {
221-
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{})
221+
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{}) //nolint:staticcheck
222222
doInfoWithValues(b, log)
223223
}
224224

225225
func BenchmarkFuncrLogV0Info(b *testing.B) {
226-
var log logr.Logger = funcr.New(noopKV, funcr.Options{})
226+
var log logr.Logger = funcr.New(noopKV, funcr.Options{}) //nolint:staticcheck
227227
doV0Info(b, log)
228228
}
229229

230230
func BenchmarkFuncrJSONLogV0Info(b *testing.B) {
231-
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{})
231+
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{}) //nolint:staticcheck
232232
doV0Info(b, log)
233233
}
234234

235235
func BenchmarkFuncrLogV9Info(b *testing.B) {
236-
var log logr.Logger = funcr.New(noopKV, funcr.Options{})
236+
var log logr.Logger = funcr.New(noopKV, funcr.Options{}) //nolint:staticcheck
237237
doV9Info(b, log)
238238
}
239239

240240
func BenchmarkFuncrJSONLogV9Info(b *testing.B) {
241-
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{})
241+
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{}) //nolint:staticcheck
242242
doV9Info(b, log)
243243
}
244244

245245
func BenchmarkFuncrLogError(b *testing.B) {
246-
var log logr.Logger = funcr.New(noopKV, funcr.Options{})
246+
var log logr.Logger = funcr.New(noopKV, funcr.Options{}) //nolint:staticcheck
247247
doError(b, log)
248248
}
249249

250250
func BenchmarkFuncrJSONLogError(b *testing.B) {
251-
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{})
251+
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{}) //nolint:staticcheck
252252
doError(b, log)
253253
}
254254

255255
func BenchmarkFuncrWithValues(b *testing.B) {
256-
var log logr.Logger = funcr.New(noopKV, funcr.Options{})
256+
var log logr.Logger = funcr.New(noopKV, funcr.Options{}) //nolint:staticcheck
257257
doWithValues(b, log)
258258
}
259259

260260
func BenchmarkFuncrWithName(b *testing.B) {
261-
var log logr.Logger = funcr.New(noopKV, funcr.Options{})
261+
var log logr.Logger = funcr.New(noopKV, funcr.Options{}) //nolint:staticcheck
262262
doWithName(b, log)
263263
}
264264

265265
func BenchmarkFuncrWithCallDepth(b *testing.B) {
266-
var log logr.Logger = funcr.New(noopKV, funcr.Options{})
266+
var log logr.Logger = funcr.New(noopKV, funcr.Options{}) //nolint:staticcheck
267267
doWithCallDepth(b, log)
268268
}
269269

270270
func BenchmarkFuncrJSONLogInfoStringerValue(b *testing.B) {
271-
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{})
271+
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{}) //nolint:staticcheck
272272
doStringerValue(b, log)
273273
}
274274

275275
func BenchmarkFuncrJSONLogInfoErrorValue(b *testing.B) {
276-
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{})
276+
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{}) //nolint:staticcheck
277277
doErrorValue(b, log)
278278
}
279279

280280
func BenchmarkFuncrJSONLogInfoMarshalerValue(b *testing.B) {
281-
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{})
281+
var log logr.Logger = funcr.NewJSON(noopJSON, funcr.Options{}) //nolint:staticcheck
282282
doMarshalerValue(b, log)
283283
}

Diff for: ‎examples/tab_logger.go

+13-9
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
// Package main implements a simple example of a logr.LogSink that logs to
18+
// stderr in a tabular format. It is not intended to be a production logger.
1719
package main
1820

1921
import (
@@ -36,23 +38,23 @@ var _ logr.LogSink = &tabLogSink{}
3638

3739
// Note that Init usually takes a pointer so it can modify the receiver to save
3840
// runtime info.
39-
func (*tabLogSink) Init(info logr.RuntimeInfo) {
41+
func (*tabLogSink) Init(_ logr.RuntimeInfo) {
4042
}
4143

42-
func (tabLogSink) Enabled(level int) bool {
44+
func (tabLogSink) Enabled(_ int) bool {
4345
return true
4446
}
4547

46-
func (l tabLogSink) Info(level int, msg string, kvs ...any) {
47-
fmt.Fprintf(l.writer, "%s\t%s\t", l.name, msg)
48+
func (l tabLogSink) Info(_ int, msg string, kvs ...any) {
49+
_, _ = fmt.Fprintf(l.writer, "%s\t%s\t", l.name, msg)
4850
for k, v := range l.keyValues {
49-
fmt.Fprintf(l.writer, "%s: %+v ", k, v)
51+
_, _ = fmt.Fprintf(l.writer, "%s: %+v ", k, v)
5052
}
5153
for i := 0; i < len(kvs); i += 2 {
52-
fmt.Fprintf(l.writer, "%s: %+v ", kvs[i], kvs[i+1])
54+
_, _ = fmt.Fprintf(l.writer, "%s: %+v ", kvs[i], kvs[i+1])
5355
}
54-
fmt.Fprintf(l.writer, "\n")
55-
l.writer.Flush()
56+
_, _ = fmt.Fprintf(l.writer, "\n")
57+
_ = l.writer.Flush()
5658
}
5759

5860
func (l tabLogSink) Error(err error, msg string, kvs ...any) {
@@ -74,7 +76,9 @@ func (l tabLogSink) WithValues(kvs ...any) logr.LogSink {
7476
newMap[k] = v
7577
}
7678
for i := 0; i < len(kvs); i += 2 {
77-
newMap[kvs[i].(string)] = kvs[i+1]
79+
k := kvs[i].(string) //nolint:forcetypeassert
80+
v := kvs[i+1]
81+
newMap[k] = v
7882
}
7983
return &tabLogSink{
8084
name: l.name,

0 commit comments

Comments
 (0)