Skip to content

Commit fccf6cb

Browse files
ewbankkitewbankkit
authored
Merge pull request #1041 from hashicorp/dependabot/go_modules/tools/github.com/golangci/golangci-lint-1.58.1
Bump github.com/golangci/golangci-lint from 1.57.2 to 1.58.1 in /tools
2 parents bbf5556 + 0f77136 commit fccf6cb

File tree

10 files changed

+113
-104
lines changed

10 files changed

+113
-104
lines changed

‎.golangci.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,24 @@ linters:
1818
- exportloopref
1919
- goconst
2020
- gofmt
21-
- gomnd
2221
- gosimple
22+
- govet
2323
- ineffassign
2424
- misspell
25+
- mnd
2526
- staticcheck
2627
- tenv
2728
- unconvert
2829
- unparam
2930
- unused
3031
- typecheck
31-
- vet
3232
- whitespace
3333

3434
linters-settings:
3535
goconst:
3636
ignore-tests: true
37-
gomnd:
38-
settings:
39-
mnd:
40-
ignored-functions:
41-
- strings.SplitN
42-
- strings.SplitAfterN
43-
- os.MkdirAll
37+
mnd:
38+
ignored-functions:
39+
- strings.SplitN
40+
- strings.SplitAfterN
41+
- os.MkdirAll

‎aws_config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func GetAwsConfig(ctx context.Context, c *Config) (context.Context, aws.Config,
8989
staticCreds bool
9090
)
9191
if c.AccessKey != "" || c.SecretKey != "" || c.Token != "" {
92-
params := make([]string, 0, 3) //nolint:gomnd
92+
params := make([]string, 0, 3) //nolint:mnd
9393
if c.AccessKey != "" {
9494
params = append(params, "access key")
9595
}

‎configtesting/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ sso_registration_scopes = sso:account:access
152152

153153
defer os.Remove(file.Name())
154154

155-
err = os.WriteFile(file.Name(), []byte(tc.SharedConfigurationFile), 0600) //nolint:gomnd
155+
err = os.WriteFile(file.Name(), []byte(tc.SharedConfigurationFile), 0600) //nolint:mnd
156156

157157
if err != nil {
158158
t.Fatalf("unexpected error writing shared configuration file: %s", err)
@@ -259,7 +259,7 @@ region = us-east-1
259259

260260
defer os.Remove(file.Name())
261261

262-
err = os.WriteFile(file.Name(), []byte(tc.SharedConfigurationFile), 0600) //nolint:gomnd
262+
err = os.WriteFile(file.Name(), []byte(tc.SharedConfigurationFile), 0600) //nolint:mnd
263263

264264
if err != nil {
265265
t.Fatalf("unexpected error writing shared configuration file: %s", err)

‎configtesting/file_parsing.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ sso_start_url = https://d-123456789a.awsapps.com/start#
152152

153153
defer os.Remove(file.Name())
154154

155-
err = os.WriteFile(file.Name(), []byte(tc.SharedConfigurationFile), 0600) //nolint:gomnd
155+
err = os.WriteFile(file.Name(), []byte(tc.SharedConfigurationFile), 0600) //nolint:mnd
156156

157157
if err != nil {
158158
t.Fatalf("unexpected error writing shared configuration file: %s", err)

‎logging/hc_logger.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func flattenFields(fields ...map[string]any) []any {
5353
for _, m := range fields {
5454
totalLen = len(m)
5555
}
56-
f := make([]any, 0, totalLen*2) //nolint:gomnd
56+
f := make([]any, 0, totalLen*2) //nolint:mnd
5757

5858
for _, m := range fields {
5959
for k, v := range m {

‎logging/http.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ func normalizeHeaderName(k string) string {
230230
}
231231

232232
func authorizationHeaderAttribute(v string) (attribute.KeyValue, bool) {
233-
parts := regexp.MustCompile(`\s+`).Split(v, 2) //nolint:gomnd
234-
if len(parts) != 2 { //nolint:gomnd
233+
parts := regexp.MustCompile(`\s+`).Split(v, 2) //nolint:mnd
234+
if len(parts) != 2 { //nolint:mnd
235235
return attribute.KeyValue{}, false
236236
}
237237
scheme := parts[0]
@@ -271,7 +271,7 @@ func authorizationHeaderAttribute(v string) (attribute.KeyValue, bool) {
271271
func resendCountAttribute(v string) (kv attribute.KeyValue, ok bool) {
272272
re := regexp.MustCompile(`attempt=(\d+);`)
273273
match := re.FindStringSubmatch(v)
274-
if len(match) != 2 { //nolint:gomnd
274+
if len(match) != 2 { //nolint:mnd
275275
return
276276
}
277277

‎servicemocks/mock.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ func SsoCredentialsApiMock() (func(), string) {
488488
w.Write([]byte(fmt.Sprintf( //nolint:errcheck
489489
ssoCredentialsResponse,
490490
time.Now().
491-
Add(15*time.Minute). //nolint:gomnd
491+
Add(15*time.Minute). //nolint:mnd
492492
UnixNano()/int64(time.Millisecond))))
493493
}))
494494

‎servicemocks/setup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func SsoTestSetup(t *testing.T, ssoKey string) (err error) {
199199
}()
200200

201201
_, err = tokenFile.WriteString(fmt.Sprintf(ssoTokenCacheFile, time.Now().
202-
Add(15*time.Minute). //nolint:gomnd
202+
Add(15*time.Minute). //nolint:mnd
203203
Format(time.RFC3339)))
204204
if err != nil {
205205
return err

‎tools/go.mod‎

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@ module github.com/hashicorp/aws-sdk-go-base/tools
33
go 1.21
44

55
require (
6-
github.com/golangci/golangci-lint v1.57.2
6+
github.com/golangci/golangci-lint v1.58.1
77
github.com/pavius/impi v0.0.3
88
)
99

1010
require (
1111
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
1212
4d63.com/gochecknoglobals v0.2.1 // indirect
13-
github.com/4meepo/tagalign v1.3.3 // indirect
13+
github.com/4meepo/tagalign v1.3.4 // indirect
1414
github.com/Abirdcfly/dupword v0.0.14 // indirect
15-
github.com/Antonboom/errname v0.1.12 // indirect
16-
github.com/Antonboom/nilnil v0.1.7 // indirect
15+
github.com/Antonboom/errname v0.1.13 // indirect
16+
github.com/Antonboom/nilnil v0.1.8 // indirect
1717
github.com/Antonboom/testifylint v1.2.0 // indirect
1818
github.com/BurntSushi/toml v1.3.2 // indirect
19+
github.com/Crocmagnon/fatcontext v0.2.2 // indirect
1920
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
2021
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
21-
github.com/Masterminds/semver v1.5.0 // indirect
22+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
2223
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
2324
github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
2425
github.com/alexkohler/nakedret/v2 v2.0.4 // indirect
@@ -33,25 +34,25 @@ require (
3334
github.com/breml/bidichk v0.2.7 // indirect
3435
github.com/breml/errchkjson v0.3.6 // indirect
3536
github.com/butuzov/ireturn v0.3.0 // indirect
36-
github.com/butuzov/mirror v1.1.0 // indirect
37+
github.com/butuzov/mirror v1.2.0 // indirect
3738
github.com/catenacyber/perfsprint v0.7.1 // indirect
3839
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
3940
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4041
github.com/charithe/durationcheck v0.0.10 // indirect
4142
github.com/chavacava/garif v0.1.0 // indirect
42-
github.com/ckaznocha/intrange v0.1.1 // indirect
43+
github.com/ckaznocha/intrange v0.1.2 // indirect
4344
github.com/curioswitch/go-reassign v0.2.0 // indirect
44-
github.com/daixiang0/gci v0.12.3 // indirect
45+
github.com/daixiang0/gci v0.13.4 // indirect
4546
github.com/davecgh/go-spew v1.1.1 // indirect
4647
github.com/denis-tingaikin/go-header v0.5.0 // indirect
4748
github.com/ettle/strcase v0.2.0 // indirect
4849
github.com/fatih/color v1.16.0 // indirect
4950
github.com/fatih/structtag v1.2.0 // indirect
50-
github.com/firefart/nonamedreturns v1.0.4 // indirect
51+
github.com/firefart/nonamedreturns v1.0.5 // indirect
5152
github.com/fsnotify/fsnotify v1.5.4 // indirect
5253
github.com/fzipp/gocyclo v0.6.0 // indirect
53-
github.com/ghostiam/protogetter v0.3.5 // indirect
54-
github.com/go-critic/go-critic v0.11.2 // indirect
54+
github.com/ghostiam/protogetter v0.3.6 // indirect
55+
github.com/go-critic/go-critic v0.11.3 // indirect
5556
github.com/go-logr/logr v1.4.1 // indirect
5657
github.com/go-toolsmith/astcast v1.1.0 // indirect
5758
github.com/go-toolsmith/astcopy v1.1.0 // indirect
@@ -67,9 +68,10 @@ require (
6768
github.com/golang/protobuf v1.5.3 // indirect
6869
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
6970
github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
70-
github.com/golangci/misspell v0.4.1 // indirect
71+
github.com/golangci/misspell v0.5.1 // indirect
72+
github.com/golangci/modinfo v0.3.4 // indirect
7173
github.com/golangci/plugin-module-register v0.1.1 // indirect
72-
github.com/golangci/revgrep v0.5.2 // indirect
74+
github.com/golangci/revgrep v0.5.3 // indirect
7375
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
7476
github.com/google/go-cmp v0.6.0 // indirect
7577
github.com/gordonklaus/ineffassign v0.1.0 // indirect
@@ -84,18 +86,19 @@ require (
8486
github.com/jgautheron/goconst v1.7.1 // indirect
8587
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
8688
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
87-
github.com/jjti/go-spancheck v0.5.3 // indirect
89+
github.com/jjti/go-spancheck v0.6.1 // indirect
8890
github.com/julz/importas v0.1.0 // indirect
89-
github.com/karamaru-alpha/copyloopvar v1.0.10 // indirect
91+
github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
9092
github.com/kisielk/errcheck v1.7.0 // indirect
9193
github.com/kisielk/gotool v1.0.0 // indirect
9294
github.com/kkHAIKE/contextcheck v1.1.5 // indirect
9395
github.com/kulti/thelper v0.6.3 // indirect
9496
github.com/kunwardeep/paralleltest v1.0.10 // indirect
9597
github.com/kyoh86/exportloopref v0.1.11 // indirect
98+
github.com/lasiar/canonicalheader v1.0.6 // indirect
9699
github.com/ldez/gomoddirectives v0.2.4 // indirect
97100
github.com/ldez/tagliatelle v0.5.0 // indirect
98-
github.com/leonklingele/grouper v1.1.1 // indirect
101+
github.com/leonklingele/grouper v1.1.2 // indirect
99102
github.com/lufeee/execinquery v1.2.1 // indirect
100103
github.com/macabu/inamedparam v0.1.3 // indirect
101104
github.com/magiconair/properties v1.8.6 // indirect
@@ -117,18 +120,19 @@ require (
117120
github.com/nunnatsa/ginkgolinter v0.16.2 // indirect
118121
github.com/olekukonko/tablewriter v0.0.5 // indirect
119122
github.com/pelletier/go-toml v1.9.5 // indirect
120-
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
123+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
121124
github.com/pmezard/go-difflib v1.0.0 // indirect
122-
github.com/polyfloyd/go-errorlint v1.4.8 // indirect
125+
github.com/polyfloyd/go-errorlint v1.5.1 // indirect
123126
github.com/prometheus/client_golang v1.12.1 // indirect
124127
github.com/prometheus/client_model v0.2.0 // indirect
125128
github.com/prometheus/common v0.32.1 // indirect
126129
github.com/prometheus/procfs v0.7.3 // indirect
127130
github.com/quasilyte/go-ruleguard v0.4.2 // indirect
131+
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
128132
github.com/quasilyte/gogrep v0.5.0 // indirect
129133
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
130134
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
131-
github.com/ryancurrah/gomodguard v1.3.1 // indirect
135+
github.com/ryancurrah/gomodguard v1.3.2 // indirect
132136
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
133137
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
134138
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
@@ -160,33 +164,32 @@ require (
160164
github.com/tomarrell/wrapcheck/v2 v2.8.3 // indirect
161165
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
162166
github.com/ultraware/funlen v0.1.0 // indirect
163-
github.com/ultraware/whitespace v0.1.0 // indirect
167+
github.com/ultraware/whitespace v0.1.1 // indirect
164168
github.com/uudashr/gocognit v1.1.2 // indirect
165169
github.com/xen0n/gosmopolitan v1.2.2 // indirect
166170
github.com/yagipy/maintidx v1.0.0 // indirect
167-
github.com/yeya24/promlinter v0.2.0 // indirect
171+
github.com/yeya24/promlinter v0.3.0 // indirect
168172
github.com/ykadowak/zerologlint v0.1.5 // indirect
169-
gitlab.com/bosi/decorder v0.4.1 // indirect
170-
go-simpler.org/musttag v0.9.0 // indirect
171-
go-simpler.org/sloglint v0.5.0 // indirect
173+
gitlab.com/bosi/decorder v0.4.2 // indirect
174+
go-simpler.org/musttag v0.12.1 // indirect
175+
go-simpler.org/sloglint v0.6.0 // indirect
172176
go.uber.org/atomic v1.7.0 // indirect
173177
go.uber.org/automaxprocs v1.5.3 // indirect
174178
go.uber.org/multierr v1.6.0 // indirect
175179
go.uber.org/zap v1.24.0 // indirect
176180
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
177181
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
178-
golang.org/x/mod v0.16.0 // indirect
179-
golang.org/x/net v0.25.0 // indirect
180-
golang.org/x/sync v0.6.0 // indirect
182+
golang.org/x/mod v0.17.0 // indirect
183+
golang.org/x/sync v0.7.0 // indirect
181184
golang.org/x/sys v0.20.0 // indirect
182185
golang.org/x/text v0.15.0 // indirect
183-
golang.org/x/tools v0.19.0 // indirect
186+
golang.org/x/tools v0.21.0 // indirect
184187
google.golang.org/protobuf v1.33.0 // indirect
185188
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
186189
gopkg.in/ini.v1 v1.67.0 // indirect
187190
gopkg.in/yaml.v2 v2.4.0 // indirect
188191
gopkg.in/yaml.v3 v3.0.1 // indirect
189192
honnef.co/go/tools v0.4.7 // indirect
190193
mvdan.cc/gofumpt v0.6.0 // indirect
191-
mvdan.cc/unparam v0.0.0-20240104100049-c549a3470d14 // indirect
194+
mvdan.cc/unparam v0.0.0-20240427195214-063aff900ca1 // indirect
192195
)

0 commit comments

Comments
 (0)