Skip to content

Commit 46ecf55

Browse files
Merge branch 'main' into EVEREST-1689
2 parents ea49f40 + fbaa140 commit 46ecf55

File tree

4 files changed

+63
-68
lines changed

4 files changed

+63
-68
lines changed

go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ require (
1515
github.com/VictoriaMetrics/operator/api v0.0.0-20240806215809-b00759d790ee
1616
github.com/aws/aws-sdk-go-v2 v1.32.8
1717
github.com/aws/aws-sdk-go-v2/config v1.28.7
18-
github.com/aws/aws-sdk-go-v2/credentials v1.17.50
19-
github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0
18+
github.com/aws/aws-sdk-go-v2/credentials v1.17.52
19+
github.com/aws/aws-sdk-go-v2/service/s3 v1.72.3
2020
github.com/go-ini/ini v1.67.0
2121
github.com/go-logr/logr v1.4.2
2222
github.com/hashicorp/go-version v1.7.0
@@ -49,14 +49,14 @@ require (
4949
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 // indirect
5050
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 // indirect
5151
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
52-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26 // indirect
52+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27 // indirect
5353
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
54-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8 // indirect
5555
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 // indirect
56-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.8 // indirect
5757
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 // indirect
5858
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.5 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.7 // indirect
6060
github.com/aws/smithy-go v1.22.1 // indirect
6161
github.com/beorn7/perks v1.0.1 // indirect
6262
github.com/blang/semver/v4 v4.0.0 // indirect

go.sum

+12-12
Original file line numberDiff line numberDiff line change
@@ -1388,8 +1388,8 @@ github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 h1:lL7IfaFzngfx0ZwU
13881388
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7/go.mod h1:QraP0UcVlQJsmHfioCrveWOC1nbiWUl3ej08h4mXWoc=
13891389
github.com/aws/aws-sdk-go-v2/config v1.28.7 h1:GduUnoTXlhkgnxTD93g1nv4tVPILbdNQOzav+Wpg7AE=
13901390
github.com/aws/aws-sdk-go-v2/config v1.28.7/go.mod h1:vZGX6GVkIE8uECSUHB6MWAUsd4ZcG2Yq/dMa4refR3M=
1391-
github.com/aws/aws-sdk-go-v2/credentials v1.17.50 h1:63pBzfU7EG4RbMMVRv4Hgm34cIaPXICCnHojKdPbTR0=
1392-
github.com/aws/aws-sdk-go-v2/credentials v1.17.50/go.mod h1:m5ThO5y87w0fiAHBt9cYXS5BVsebOeJEFCGUQeZZYLw=
1391+
github.com/aws/aws-sdk-go-v2/credentials v1.17.52 h1:I4ymSk35LHogx2Re2Wu6LOHNTRaRWkLVoJgWS5Wd40M=
1392+
github.com/aws/aws-sdk-go-v2/credentials v1.17.52/go.mod h1:vAkqKbMNUcher8fDXP2Ge2qFXKMkcD74qvk1lJRMemM=
13931393
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23 h1:IBAoD/1d8A8/1aA8g4MBVtTRHhXRiNAgwdbo/xRM2DI=
13941394
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.23/go.mod h1:vfENuCM7dofkgKpYzuzf1VT1UKkA/YL3qanfBn7HCaA=
13951395
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.27 h1:jSJjSBzw8VDIbWv+mmvBSP8ezsztMYJGH+eKqi9AmNs=
@@ -1398,24 +1398,24 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27 h1:l+X4K77Dui85pIj5fo
13981398
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.27/go.mod h1:KvZXSFEXm6x84yE8qffKvT3x8J5clWnVFXphpohhzJ8=
13991399
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
14001400
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
1401-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26 h1:GeNJsIFHB+WW5ap2Tec4K6dzcVTsRbsT1Lra46Hv9ME=
1402-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26/go.mod h1:zfgMpwHDXX2WGoG84xG2H+ZlPTkJUU4YUvx2svLQYWo=
1401+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27 h1:AmB5QxnD+fBFrg9LcqzkgF/CaYvMyU/BTlejG4t1S7Q=
1402+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.27/go.mod h1:Sai7P3xTiyv9ZUYO3IFxMnmiIP759/67iQbU4kdmkyU=
14031403
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
14041404
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
1405-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7 h1:tB4tNw83KcajNAzaIMhkhVI2Nt8fAZd5A5ro113FEMY=
1406-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7/go.mod h1:lvpyBGkZ3tZ9iSsUIcC2EWp+0ywa7aK3BLT+FwZi+mQ=
1405+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8 h1:iwYS40JnrBeA9e9aI5S6KKN4EB2zR4iUVYN0nwVivz4=
1406+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.8/go.mod h1:Fm9Mi+ApqmFiknZtGpohVcBGvpTu542VC4XO9YudRi0=
14071407
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8 h1:cWno7lefSH6Pp+mSznagKCgfDGeZRin66UvYUqAkyeA=
14081408
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.8/go.mod h1:tPD+VjU3ABTBoEJ3nctu5Nyg4P4yjqSH5bJGGkY4+XE=
1409-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7 h1:Hi0KGbrnr57bEHWM0bJ1QcBzxLrL/k2DHvGYhb8+W1w=
1410-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7/go.mod h1:wKNgWgExdjjrm4qvfbTorkvocEstaoDl4WCvGfeCy9c=
1411-
github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0 h1:SAfh4pNx5LuTafKKWR02Y+hL3A+3TX8cTKG1OIAJaBk=
1412-
github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0/go.mod h1:r+xl5yzMk9083rMR+sJ5TYj9Tihvf/l1oxzZXDgGj2Q=
1409+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.8 h1:/Mn7gTedG86nbpjT4QEKsN1D/fThiYe1qvq7WsBGNHg=
1410+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.8/go.mod h1:Ae3va9LPmvjj231ukHB6UeT8nS7wTPfC3tMZSZMwNYg=
1411+
github.com/aws/aws-sdk-go-v2/service/s3 v1.72.3 h1:WZOmJfCDV+4tYacLxpiojoAdT5sxTfB3nTqQNtZu+J4=
1412+
github.com/aws/aws-sdk-go-v2/service/s3 v1.72.3/go.mod h1:xMekrnhmJ5aqmyxtmALs7mlvXw5xRh+eYjOjvrIIFJ4=
14131413
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9 h1:YqtxripbjWb2QLyzRK9pByfEDvgg95gpC2AyDq4hFE8=
14141414
github.com/aws/aws-sdk-go-v2/service/sso v1.24.9/go.mod h1:lV8iQpg6OLOfBnqbGMBKYjilBlf633qwHnBEiMSPoHY=
14151415
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8 h1:6dBT1Lz8fK11m22R+AqfRsFn8320K0T5DTGxxOQBSMw=
14161416
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.8/go.mod h1:/kiBvRQXBc6xeJTYzhSdGvJ5vm1tjaDEjH+MSeRJnlY=
1417-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.5 h1:URp6kw3vHAnuU9pgP4K1SohwWLDzgtqA/qgeBfgBxn0=
1418-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.5/go.mod h1:+8h7PZb3yY5ftmVLD7ocEoE98hdc8PoKS0H3wfx1dlc=
1417+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.7 h1:qwGa9MA8G7mBq2YphHFaygdPe5t9OA7SvaJdwWTlEds=
1418+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.7/go.mod h1:+8h7PZb3yY5ftmVLD7ocEoE98hdc8PoKS0H3wfx1dlc=
14191419
github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
14201420
github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
14211421
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=

tools/go.mod

+13-13
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ require (
88
github.com/BurntSushi/go-sumtype v0.0.0-20221020234012-480526a59796
99
github.com/apache/skywalking-eyes v0.6.0
1010
github.com/daixiang0/gci v0.13.5
11-
github.com/golangci/golangci-lint v1.63.1
11+
github.com/golangci/golangci-lint v1.63.4
1212
github.com/reviewdog/reviewdog v0.20.3
13-
golang.org/x/tools v0.28.0
13+
golang.org/x/tools v0.29.0
1414
mvdan.cc/gofumpt v0.7.0
1515
)
1616

@@ -33,7 +33,7 @@ require (
3333
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
3434
github.com/Microsoft/go-winio v0.6.1 // indirect
3535
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
36-
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
36+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
3737
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
3838
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
3939
github.com/alexkohler/prealloc v1.0.0 // indirect
@@ -58,7 +58,7 @@ require (
5858
github.com/ckaznocha/intrange v0.3.0 // indirect
5959
github.com/cloudflare/circl v1.3.7 // indirect
6060
github.com/curioswitch/go-reassign v0.3.0 // indirect
61-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
61+
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
6262
github.com/davecgh/go-spew v1.1.1 // indirect
6363
github.com/davidmz/go-pageant v1.0.2 // indirect
6464
github.com/denis-tingaikin/go-header v0.5.0 // indirect
@@ -73,8 +73,8 @@ require (
7373
github.com/go-critic/go-critic v0.11.5 // indirect
7474
github.com/go-fed/httpsig v1.1.0 // indirect
7575
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
76-
github.com/go-git/go-billy/v5 v5.5.0 // indirect
77-
github.com/go-git/go-git/v5 v5.11.0 // indirect
76+
github.com/go-git/go-billy/v5 v5.6.0 // indirect
77+
github.com/go-git/go-git/v5 v5.13.0 // indirect
7878
github.com/go-toolsmith/astcast v1.1.0 // indirect
7979
github.com/go-toolsmith/astcopy v1.1.0 // indirect
8080
github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -131,11 +131,11 @@ require (
131131
github.com/kunwardeep/paralleltest v1.0.10 // indirect
132132
github.com/kyoh86/exportloopref v0.1.11 // indirect
133133
github.com/lasiar/canonicalheader v1.1.2 // indirect
134-
github.com/ldez/exptostd v0.3.0 // indirect
134+
github.com/ldez/exptostd v0.3.1 // indirect
135135
github.com/ldez/gomoddirectives v0.6.0 // indirect
136136
github.com/ldez/grignotin v0.7.0 // indirect
137137
github.com/ldez/tagliatelle v0.7.1 // indirect
138-
github.com/ldez/usetesting v0.4.1 // indirect
138+
github.com/ldez/usetesting v0.4.2 // indirect
139139
github.com/leonklingele/grouper v1.1.2 // indirect
140140
github.com/macabu/inamedparam v0.1.3 // indirect
141141
github.com/magiconair/properties v1.8.6 // indirect
@@ -185,13 +185,13 @@ require (
185185
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
186186
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
187187
github.com/securego/gosec/v2 v2.21.4 // indirect
188-
github.com/sergi/go-diff v1.3.1 // indirect
188+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
189189
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
190190
github.com/shopspring/decimal v1.3.1 // indirect
191191
github.com/sirupsen/logrus v1.9.3 // indirect
192192
github.com/sivchari/containedctx v1.0.3 // indirect
193193
github.com/sivchari/tenv v1.12.1 // indirect
194-
github.com/skeema/knownhosts v1.2.1 // indirect
194+
github.com/skeema/knownhosts v1.3.0 // indirect
195195
github.com/sonatard/noctx v0.1.0 // indirect
196196
github.com/sourcegraph/go-diff v0.7.0 // indirect
197197
github.com/spf13/afero v1.11.0 // indirect
@@ -229,14 +229,14 @@ require (
229229
go.uber.org/multierr v1.6.0 // indirect
230230
go.uber.org/zap v1.24.0 // indirect
231231
golang.org/x/build v0.0.0-20240906172953-ad8de1aafeaf // indirect
232-
golang.org/x/crypto v0.31.0 // indirect
232+
golang.org/x/crypto v0.32.0 // indirect
233233
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
234234
golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect
235235
golang.org/x/mod v0.22.0 // indirect
236-
golang.org/x/net v0.32.0 // indirect
236+
golang.org/x/net v0.34.0 // indirect
237237
golang.org/x/oauth2 v0.24.0 // indirect
238238
golang.org/x/sync v0.10.0 // indirect
239-
golang.org/x/sys v0.28.0 // indirect
239+
golang.org/x/sys v0.29.0 // indirect
240240
golang.org/x/text v0.21.0 // indirect
241241
golang.org/x/time v0.7.0 // indirect
242242
google.golang.org/protobuf v1.35.2 // indirect

0 commit comments

Comments
 (0)