Skip to content

Commit 6843516

Browse files
authored
Merge branch 'master' into forbidigo-update
2 parents 7176f2d + 251ceaa commit 6843516

File tree

12 files changed

+513
-377
lines changed

12 files changed

+513
-377
lines changed

.golangci.reference.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1793,13 +1793,15 @@ linters-settings:
17931793
# Default: {}
17941794
rules:
17951795
# Any struct tag type can be used.
1796-
# Support string case: `camel`, `pascal`, `kebab`, `snake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower`, `header`
1796+
# Support string case: `camel`, `pascal`, `kebab`, `snake`, `upperSnake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower`, `header`
17971797
json: camel
17981798
yaml: camel
17991799
xml: camel
18001800
bson: camel
18011801
avro: snake
18021802
mapstructure: kebab
1803+
env: upperSnake
1804+
envconfig: upperSnake
18031805

18041806
tenv:
18051807
# The option `all` will run against whole test files (`_test.go`) regardless of method/function signatures.

go.mod

+17-17
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ require (
77
4d63.com/gochecknoglobals v0.2.1
88
github.com/4meepo/tagalign v1.2.2
99
github.com/Abirdcfly/dupword v0.0.11
10-
github.com/Antonboom/errname v0.1.9
11-
github.com/Antonboom/nilnil v0.1.4
10+
github.com/Antonboom/errname v0.1.10
11+
github.com/Antonboom/nilnil v0.1.5
1212
github.com/BurntSushi/toml v1.2.1
1313
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24
1414
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0
@@ -32,7 +32,7 @@ require (
3232
github.com/fatih/color v1.15.0
3333
github.com/firefart/nonamedreturns v1.0.4
3434
github.com/fzipp/gocyclo v0.6.0
35-
github.com/go-critic/go-critic v0.8.0
35+
github.com/go-critic/go-critic v0.8.1
3636
github.com/go-xmlfmt/xmlfmt v1.1.2
3737
github.com/gofrs/flock v0.8.1
3838
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2
@@ -68,25 +68,25 @@ require (
6868
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26
6969
github.com/mattn/go-colorable v0.1.13
7070
github.com/mbilski/exhaustivestruct v1.2.0
71-
github.com/mgechev/revive v1.3.1
71+
github.com/mgechev/revive v1.3.2
7272
github.com/mitchellh/go-homedir v1.1.0
7373
github.com/mitchellh/go-ps v1.0.0
7474
github.com/moricho/tparallel v0.3.1
7575
github.com/nakabonne/nestif v0.3.1
7676
github.com/nishanths/exhaustive v0.10.0
7777
github.com/nishanths/predeclared v0.2.2
78-
github.com/nunnatsa/ginkgolinter v0.11.2
79-
github.com/polyfloyd/go-errorlint v1.4.0
78+
github.com/nunnatsa/ginkgolinter v0.12.0
79+
github.com/polyfloyd/go-errorlint v1.4.2
8080
github.com/quasilyte/go-ruleguard/dsl v0.3.22
8181
github.com/ryancurrah/gomodguard v1.3.0
8282
github.com/ryanrolds/sqlclosecheck v0.4.0
8383
github.com/sanposhiho/wastedassign/v2 v2.0.7
8484
github.com/sashamelentyev/interfacebloat v1.1.0
8585
github.com/sashamelentyev/usestdlibvars v1.23.0
86-
github.com/securego/gosec/v2 v2.15.0
86+
github.com/securego/gosec/v2 v2.16.0
8787
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c
88-
github.com/shirou/gopsutil/v3 v3.23.3
89-
github.com/sirupsen/logrus v1.9.0
88+
github.com/shirou/gopsutil/v3 v3.23.4
89+
github.com/sirupsen/logrus v1.9.2
9090
github.com/sivchari/containedctx v1.0.3
9191
github.com/sivchari/tenv v1.7.1
9292
github.com/sonatard/noctx v0.0.2
@@ -96,7 +96,7 @@ require (
9696
github.com/spf13/viper v1.12.0
9797
github.com/ssgreg/nlreturn/v2 v2.2.1
9898
github.com/stbenjam/no-sprintf-host-port v0.1.1
99-
github.com/stretchr/testify v1.8.2
99+
github.com/stretchr/testify v1.8.3
100100
github.com/tdakkota/asciicheck v0.2.0
101101
github.com/tetafro/godot v1.4.11
102102
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966
@@ -112,8 +112,9 @@ require (
112112
github.com/yeya24/promlinter v0.2.0
113113
github.com/ykadowak/zerologlint v0.1.1
114114
gitlab.com/bosi/decorder v0.2.3
115-
go.tmz.dev/musttag v0.6.0
116-
golang.org/x/tools v0.8.0
115+
go.tmz.dev/musttag v0.6.1
116+
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea
117+
golang.org/x/tools v0.9.1
117118
gopkg.in/yaml.v3 v3.0.1
118119
honnef.co/go/tools v0.4.3
119120
mvdan.cc/gofumpt v0.5.0
@@ -167,7 +168,7 @@ require (
167168
github.com/quasilyte/gogrep v0.5.0 // indirect
168169
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
169170
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
170-
github.com/shoenig/go-m1cpu v0.1.4 // indirect
171+
github.com/shoenig/go-m1cpu v0.1.5 // indirect
171172
github.com/sivchari/nosnakecase v1.7.0
172173
github.com/spf13/afero v1.8.2 // indirect
173174
github.com/spf13/cast v1.5.0 // indirect
@@ -182,12 +183,11 @@ require (
182183
go.uber.org/atomic v1.7.0 // indirect
183184
go.uber.org/multierr v1.6.0 // indirect
184185
go.uber.org/zap v1.24.0 // indirect
185-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
186186
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
187187
golang.org/x/mod v0.10.0 // indirect
188-
golang.org/x/sync v0.1.0 // indirect
189-
golang.org/x/sys v0.7.0 // indirect
190-
golang.org/x/text v0.7.0 // indirect
188+
golang.org/x/sync v0.2.0 // indirect
189+
golang.org/x/sys v0.8.0 // indirect
190+
golang.org/x/text v0.9.0 // indirect
191191
google.golang.org/protobuf v1.28.0 // indirect
192192
gopkg.in/ini.v1 v1.67.0 // indirect
193193
gopkg.in/yaml.v2 v2.4.0

0 commit comments

Comments
 (0)