Skip to content

Commit 1c23072

Browse files
dependabot[bot]tobio
dependabot[bot]
and
tobio
authored
Bump github.com/golangci/golangci-lint from 1.59.1 to 1.60.1 in /tools (#714)
* Bump github.com/golangci/golangci-lint from 1.59.1 to 1.60.1 in /tools Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.59.1 to 1.60.1. - [Release notes](https://github.com/golangci/golangci-lint/releases) - [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md) - [Commits](golangci/golangci-lint@v1.59.1...v1.60.1) --- updated-dependencies: - dependency-name: github.com/golangci/golangci-lint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * go mod tidy * lint --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Toby Brain <toby.brain@elastic.co>
1 parent ae975fa commit 1c23072

File tree

6 files changed

+96
-97
lines changed

6 files changed

+96
-97
lines changed

‎internal/fleet/agent_policy_resource_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package fleet_test
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"testing"
78

@@ -139,7 +140,7 @@ func checkResourceAgentPolicyDestroy(s *terraform.State) error {
139140
}
140141
packagePolicy, diag := fleet.ReadAgentPolicy(context.Background(), fleetClient, rs.Primary.ID)
141142
if diag.HasError() {
142-
return fmt.Errorf(diag[0].Summary)
143+
return errors.New(diag[0].Summary)
143144
}
144145
if packagePolicy != nil {
145146
return fmt.Errorf("agent policy id=%v still exists, but it should have been removed", rs.Primary.ID)
@@ -165,14 +166,14 @@ func checkResourceAgentPolicySkipDestroy(s *terraform.State) error {
165166
}
166167
packagePolicy, diag := fleet.ReadAgentPolicy(context.Background(), fleetClient, rs.Primary.ID)
167168
if diag.HasError() {
168-
return fmt.Errorf(diag[0].Summary)
169+
return errors.New(diag[0].Summary)
169170
}
170171
if packagePolicy == nil {
171172
return fmt.Errorf("agent policy id=%v does not exist, but should still exist when skip_destroy is true", rs.Primary.ID)
172173
}
173174

174175
if diag = fleet.DeleteAgentPolicy(context.Background(), fleetClient, rs.Primary.ID); diag.HasError() {
175-
return fmt.Errorf(diag[0].Summary)
176+
return errors.New(diag[0].Summary)
176177
}
177178
}
178179
return nil

‎internal/fleet/fleet_server_host_resource_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package fleet_test
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"testing"
78

@@ -103,7 +104,7 @@ func checkResourceFleetServerHostDestroy(s *terraform.State) error {
103104
}
104105
packagePolicy, diag := fleet.ReadFleetServerHost(context.Background(), fleetClient, rs.Primary.ID)
105106
if diag.HasError() {
106-
return fmt.Errorf(diag[0].Summary)
107+
return errors.New(diag[0].Summary)
107108
}
108109
if packagePolicy != nil {
109110
return fmt.Errorf("FleetServerHost id=%v still exists, but it should have been removed", rs.Primary.ID)

‎internal/fleet/integration_policy_resource_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package fleet_test
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"testing"
78

@@ -72,15 +73,15 @@ func checkResourceIntegrationPolicyDestroy(s *terraform.State) error {
7273
case "elasticstack_fleet_integration_policy":
7374
integrationPolicy, diag := fleet.ReadPackagePolicy(context.Background(), fleetClient, rs.Primary.ID)
7475
if diag.HasError() {
75-
return fmt.Errorf(diag[0].Summary)
76+
return errors.New(diag[0].Summary)
7677
}
7778
if integrationPolicy != nil {
7879
return fmt.Errorf("integration policy id=%v still exists, but it should have been removed", rs.Primary.ID)
7980
}
8081
case "elasticstack_fleet_agent_policy":
8182
agentPolicy, diag := fleet.ReadAgentPolicy(context.Background(), fleetClient, rs.Primary.ID)
8283
if diag.HasError() {
83-
return fmt.Errorf(diag[0].Summary)
84+
return errors.New(diag[0].Summary)
8485
}
8586
if agentPolicy != nil {
8687
return fmt.Errorf("agent policy id=%v still exists, but it should have been removed", rs.Primary.ID)
@@ -134,7 +135,7 @@ resource "elasticstack_fleet_integration_policy" "test_policy" {
134135
"enabled": true,
135136
"vars": {
136137
"listen_address": "localhost",
137-
"listen_port": 8080,
138+
"listen_port": 8080,
138139
"data_stream.dataset": "tcp.generic",
139140
"tags": [],
140141
"syslog_options": "field: message\n#format: auto\n#timezone: Local\n",
@@ -189,7 +190,7 @@ resource "elasticstack_fleet_integration_policy" "test_policy" {
189190
"enabled": true,
190191
"vars": {
191192
"listen_address": "localhost",
192-
"listen_port": 8085,
193+
"listen_port": 8085,
193194
"data_stream.dataset": "tcp.generic",
194195
"tags": [],
195196
"syslog_options": "field: message\n#format: auto\n#timezone: Local\n",

‎internal/fleet/output_resource_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package fleet_test
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"testing"
78

@@ -226,7 +227,7 @@ func checkResourceOutputDestroy(s *terraform.State) error {
226227
}
227228
packagePolicy, diag := fleet.ReadOutput(context.Background(), fleetClient, rs.Primary.ID)
228229
if diag.HasError() {
229-
return fmt.Errorf(diag[0].Summary)
230+
return errors.New(diag[0].Summary)
230231
}
231232
if packagePolicy != nil {
232233
return fmt.Errorf("output id=%v still exists, but it should have been removed", rs.Primary.ID)

‎tools/go.mod‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module github.com/elastic/terraform-provider-elasticstack/tools
22

3-
go 1.22
3+
go 1.22.1
44

5-
toolchain go1.22.2
5+
toolchain go1.22.5
66

77
require (
88
github.com/client9/misspell v0.3.4
99
github.com/deepmap/oapi-codegen/v2 v2.1.0
10-
github.com/golangci/golangci-lint v1.59.1
10+
github.com/golangci/golangci-lint v1.60.1
1111
github.com/goreleaser/goreleaser v1.26.2
1212
github.com/hashicorp/terraform-plugin-docs v0.18.0
1313
go.uber.org/mock v0.4.0
@@ -28,7 +28,7 @@ require (
2828
github.com/AlekSi/pointer v1.2.0 // indirect
2929
github.com/Antonboom/errname v0.1.13 // indirect
3030
github.com/Antonboom/nilnil v0.1.9 // indirect
31-
github.com/Antonboom/testifylint v1.3.1 // indirect
31+
github.com/Antonboom/testifylint v1.4.3 // indirect
3232
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
3333
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
3434
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
@@ -46,10 +46,10 @@ require (
4646
github.com/Azure/go-autorest/logger v0.2.1 // indirect
4747
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
4848
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
49-
github.com/BurntSushi/toml v1.4.0 // indirect
50-
github.com/Crocmagnon/fatcontext v0.2.2 // indirect
49+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
50+
github.com/Crocmagnon/fatcontext v0.4.0 // indirect
5151
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
52-
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
52+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
5353
github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
5454
github.com/Masterminds/goutils v1.1.1 // indirect
5555
github.com/Masterminds/semver/v3 v3.2.1 // indirect
@@ -106,7 +106,7 @@ require (
106106
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect
107107
github.com/blizzy78/varnamelen v0.8.0 // indirect
108108
github.com/bluesky-social/indigo v0.0.0-20240411170459-440932307e0d // indirect
109-
github.com/bombsimon/wsl/v4 v4.2.1 // indirect
109+
github.com/bombsimon/wsl/v4 v4.4.1 // indirect
110110
github.com/breml/bidichk v0.2.7 // indirect
111111
github.com/breml/errchkjson v0.3.6 // indirect
112112
github.com/buger/jsonparser v1.1.1 // indirect
@@ -134,7 +134,7 @@ require (
134134
github.com/cloudflare/circl v1.3.8 // indirect
135135
github.com/containerd/console v1.0.4 // indirect
136136
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
137-
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
137+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
138138
github.com/curioswitch/go-reassign v0.2.0 // indirect
139139
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
140140
github.com/daixiang0/gci v0.13.4 // indirect
@@ -196,7 +196,7 @@ require (
196196
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
197197
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
198198
github.com/gobwas/glob v0.2.3 // indirect
199-
github.com/gofrs/flock v0.8.1 // indirect
199+
github.com/gofrs/flock v0.12.1 // indirect
200200
github.com/gogo/protobuf v1.3.2 // indirect
201201
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
202202
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
@@ -266,7 +266,7 @@ require (
266266
github.com/jgautheron/goconst v1.7.1 // indirect
267267
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
268268
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
269-
github.com/jjti/go-spancheck v0.6.1 // indirect
269+
github.com/jjti/go-spancheck v0.6.2 // indirect
270270
github.com/jmespath/go-jmespath v0.4.0 // indirect
271271
github.com/josharian/intern v1.0.0 // indirect
272272
github.com/julz/importas v0.1.0 // indirect
@@ -299,15 +299,15 @@ require (
299299
github.com/mattn/go-localereader v0.0.1 // indirect
300300
github.com/mattn/go-mastodon v0.0.8 // indirect
301301
github.com/mattn/go-runewidth v0.0.15 // indirect
302-
github.com/mgechev/revive v1.3.7 // indirect
302+
github.com/mgechev/revive v1.3.9 // indirect
303303
github.com/minio/sha256-simd v1.0.1 // indirect
304304
github.com/mitchellh/copystructure v1.2.0 // indirect
305305
github.com/mitchellh/go-homedir v1.1.0 // indirect
306306
github.com/mitchellh/mapstructure v1.5.0 // indirect
307307
github.com/mitchellh/reflectwalk v1.0.2 // indirect
308308
github.com/moby/docker-image-spec v1.3.1 // indirect
309309
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
310-
github.com/moricho/tparallel v0.3.1 // indirect
310+
github.com/moricho/tparallel v0.3.2 // indirect
311311
github.com/mr-tron/base58 v1.2.0 // indirect
312312
github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirect
313313
github.com/muesli/cancelreader v0.2.2 // indirect
@@ -339,7 +339,7 @@ require (
339339
github.com/pkg/errors v0.9.1 // indirect
340340
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
341341
github.com/polydawn/refmt v0.89.1-0.20221221234430-40501e09de1f // indirect
342-
github.com/polyfloyd/go-errorlint v1.5.2 // indirect
342+
github.com/polyfloyd/go-errorlint v1.6.0 // indirect
343343
github.com/posener/complete v1.2.3 // indirect
344344
github.com/prometheus/client_golang v1.19.0 // indirect
345345
github.com/prometheus/client_model v0.6.0 // indirect
@@ -353,14 +353,14 @@ require (
353353
github.com/rivo/uniseg v0.4.7 // indirect
354354
github.com/russross/blackfriday v1.6.0 // indirect
355355
github.com/russross/blackfriday/v2 v2.1.0 // indirect
356-
github.com/ryancurrah/gomodguard v1.3.2 // indirect
356+
github.com/ryancurrah/gomodguard v1.3.3 // indirect
357357
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
358358
github.com/sagikazarmark/locafero v0.4.0 // indirect
359359
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
360360
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
361361
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
362362
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
363-
github.com/sashamelentyev/usestdlibvars v1.26.0 // indirect
363+
github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect
364364
github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e // indirect
365365
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
366366
github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect
@@ -372,7 +372,7 @@ require (
372372
github.com/sigstore/sigstore v1.8.3 // indirect
373373
github.com/sirupsen/logrus v1.9.3 // indirect
374374
github.com/sivchari/containedctx v1.0.3 // indirect
375-
github.com/sivchari/tenv v1.7.1 // indirect
375+
github.com/sivchari/tenv v1.10.0 // indirect
376376
github.com/skeema/knownhosts v1.2.2 // indirect
377377
github.com/slack-go/slack v0.13.0 // indirect
378378
github.com/sonatard/noctx v0.0.2 // indirect
@@ -381,15 +381,14 @@ require (
381381
github.com/spaolacci/murmur3 v1.1.0 // indirect
382382
github.com/spf13/afero v1.11.0 // indirect
383383
github.com/spf13/cast v1.6.0 // indirect
384-
github.com/spf13/cobra v1.8.0 // indirect
384+
github.com/spf13/cobra v1.8.1 // indirect
385385
github.com/spf13/pflag v1.0.5 // indirect
386386
github.com/spf13/viper v1.18.2 // indirect
387387
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
388388
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
389389
github.com/stretchr/objx v0.5.2 // indirect
390390
github.com/stretchr/testify v1.9.0 // indirect
391391
github.com/subosito/gotenv v1.6.0 // indirect
392-
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
393392
github.com/tdakkota/asciicheck v0.2.0 // indirect
394393
github.com/tetafro/godot v1.4.16 // indirect
395394
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
@@ -401,7 +400,7 @@ require (
401400
github.com/ulikunitz/xz v0.5.12 // indirect
402401
github.com/ultraware/funlen v0.1.0 // indirect
403402
github.com/ultraware/whitespace v0.1.1 // indirect
404-
github.com/uudashr/gocognit v1.1.2 // indirect
403+
github.com/uudashr/gocognit v1.1.3 // indirect
405404
github.com/vbatts/tar-split v0.11.5 // indirect
406405
github.com/wagoodman/go-partybus v0.0.0-20230516145632-8ccac152c651 // indirect
407406
github.com/wagoodman/go-progress v0.0.0-20220614130704-4b1c25a33c7c // indirect
@@ -419,7 +418,7 @@ require (
419418
gitlab.com/bosi/decorder v0.4.2 // indirect
420419
gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect
421420
go-simpler.org/musttag v0.12.2 // indirect
422-
go-simpler.org/sloglint v0.7.1 // indirect
421+
go-simpler.org/sloglint v0.7.2 // indirect
423422
go.mongodb.org/mongo-driver v1.14.0 // indirect
424423
go.opencensus.io v0.24.0 // indirect
425424
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
@@ -432,18 +431,18 @@ require (
432431
go.uber.org/multierr v1.11.0 // indirect
433432
go.uber.org/zap v1.27.0 // indirect
434433
gocloud.dev v0.37.0 // indirect
435-
golang.org/x/crypto v0.24.0 // indirect
434+
golang.org/x/crypto v0.26.0 // indirect
436435
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
437436
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
438-
golang.org/x/mod v0.18.0 // indirect
439-
golang.org/x/net v0.26.0 // indirect
437+
golang.org/x/mod v0.20.0 // indirect
438+
golang.org/x/net v0.28.0 // indirect
440439
golang.org/x/oauth2 v0.20.0 // indirect
441-
golang.org/x/sync v0.7.0 // indirect
442-
golang.org/x/sys v0.21.0 // indirect
443-
golang.org/x/term v0.21.0 // indirect
444-
golang.org/x/text v0.16.0 // indirect
440+
golang.org/x/sync v0.8.0 // indirect
441+
golang.org/x/sys v0.23.0 // indirect
442+
golang.org/x/term v0.23.0 // indirect
443+
golang.org/x/text v0.17.0 // indirect
445444
golang.org/x/time v0.5.0 // indirect
446-
golang.org/x/tools v0.22.0 // indirect
445+
golang.org/x/tools v0.24.0 // indirect
447446
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
448447
google.golang.org/api v0.172.0 // indirect
449448
google.golang.org/genproto v0.0.0-20240311173647-c811ad7063a7 // indirect
@@ -459,7 +458,7 @@ require (
459458
gopkg.in/yaml.v2 v2.4.0 // indirect
460459
gopkg.in/yaml.v3 v3.0.1 // indirect
461460
gotest.tools/v3 v3.1.0 // indirect
462-
honnef.co/go/tools v0.4.7 // indirect
461+
honnef.co/go/tools v0.5.0 // indirect
463462
lukechampine.com/blake3 v1.2.1 // indirect
464463
mvdan.cc/gofumpt v0.6.0 // indirect
465464
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect

0 commit comments

Comments
 (0)