Skip to content

Commit 4993a6c

Browse files
authored
Merge branch 'main' into dependabot/go_modules/tools/golang.org/x/net-0.23.0
2 parents deabac3 + 7b2c459 commit 4993a6c

File tree

4 files changed

+62
-214
lines changed

4 files changed

+62
-214
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ require (
2626
github.com/prometheus/procfs v0.11.1 // indirect
2727
go.uber.org/atomic v1.7.0 // indirect
2828
go.uber.org/multierr v1.6.0 // indirect
29-
google.golang.org/protobuf v1.31.0 // indirect
29+
google.golang.org/protobuf v1.33.0 // indirect
3030
gopkg.in/yaml.v3 v3.0.1 // indirect
3131
)

go.sum

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
1212
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1313
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1414
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
15-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
16-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1715
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
1816
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
1917
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -33,9 +31,13 @@ github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwa
3331
github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY=
3432
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
3533
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
34+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
35+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
3636
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
37-
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
38-
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
37+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
38+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
39+
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
40+
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
3941
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
4042
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
4143
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
@@ -49,11 +51,10 @@ golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
4951
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5052
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
5153
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
52-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
53-
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
54-
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
55-
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
54+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
55+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
5656
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5757
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
58+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
5859
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
5960
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

tools/go.mod

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ require (
1717

1818
require (
1919
4d63.com/gochecknoglobals v0.1.0 // indirect
20-
cloud.google.com/go v0.100.2 // indirect
21-
cloud.google.com/go/compute v1.6.1 // indirect
22-
cloud.google.com/go/datastore v1.6.0 // indirect
20+
cloud.google.com/go v0.110.0 // indirect
21+
cloud.google.com/go/compute v1.19.1 // indirect
22+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
23+
cloud.google.com/go/datastore v1.11.0 // indirect
2324
github.com/Abirdcfly/dupword v0.0.7 // indirect
2425
github.com/Antonboom/errname v0.1.7 // indirect
2526
github.com/Antonboom/nilnil v0.1.1 // indirect
@@ -40,7 +41,7 @@ require (
4041
github.com/breml/bidichk v0.2.3 // indirect
4142
github.com/breml/errchkjson v0.3.0 // indirect
4243
github.com/butuzov/ireturn v0.1.1 // indirect
43-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
44+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4445
github.com/charithe/durationcheck v0.0.9 // indirect
4546
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
4647
github.com/curioswitch/go-reassign v0.2.0 // indirect
@@ -69,7 +70,7 @@ require (
6970
github.com/gofrs/flock v0.8.1 // indirect
7071
github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
7172
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
72-
github.com/golang/protobuf v1.5.2 // indirect
73+
github.com/golang/protobuf v1.5.3 // indirect
7374
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
7475
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
7576
github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
@@ -83,7 +84,8 @@ require (
8384
github.com/google/go-github/v39 v39.2.0 // indirect
8485
github.com/google/go-github/v41 v41.0.0 // indirect
8586
github.com/google/go-querystring v1.1.0 // indirect
86-
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
87+
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
88+
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
8789
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
8890
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
8991
github.com/gostaticanalysis/comment v1.4.2 // indirect
@@ -169,8 +171,8 @@ require (
169171
github.com/spf13/viper v1.13.0 // indirect
170172
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
171173
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
172-
github.com/stretchr/objx v0.4.0 // indirect
173-
github.com/stretchr/testify v1.8.0 // indirect
174+
github.com/stretchr/objx v0.5.0 // indirect
175+
github.com/stretchr/testify v1.8.1 // indirect
174176
github.com/subosito/gotenv v1.4.1 // indirect
175177
github.com/tdakkota/asciicheck v0.1.1 // indirect
176178
github.com/tetafro/godot v1.4.11 // indirect
@@ -186,7 +188,7 @@ require (
186188
github.com/yagipy/maintidx v1.0.0 // indirect
187189
github.com/yeya24/promlinter v0.2.0 // indirect
188190
gitlab.com/bosi/decorder v0.2.3 // indirect
189-
go.opencensus.io v0.23.0 // indirect
191+
go.opencensus.io v0.24.0 // indirect
190192
go.uber.org/atomic v1.7.0 // indirect
191193
go.uber.org/multierr v1.6.0 // indirect
192194
go.uber.org/zap v1.17.0 // indirect
@@ -196,17 +198,17 @@ require (
196198
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
197199
golang.org/x/mod v0.13.0 // indirect
198200
golang.org/x/net v0.23.0 // indirect
199-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
201+
golang.org/x/oauth2 v0.7.0 // indirect
200202
golang.org/x/sync v0.4.0 // indirect
201203
golang.org/x/sys v0.18.0 // indirect
202204
golang.org/x/text v0.14.0 // indirect
203205
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
204-
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
205-
google.golang.org/api v0.81.0 // indirect
206+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
207+
google.golang.org/api v0.114.0 // indirect
206208
google.golang.org/appengine v1.6.7 // indirect
207-
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
208-
google.golang.org/grpc v1.46.2 // indirect
209-
google.golang.org/protobuf v1.28.0 // indirect
209+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
210+
google.golang.org/grpc v1.56.3 // indirect
211+
google.golang.org/protobuf v1.33.0 // indirect
210212
gopkg.in/ini.v1 v1.67.0 // indirect
211213
gopkg.in/yaml.v2 v2.4.0 // indirect
212214
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)