Skip to content

Commit c4dfb6e

Browse files
rosstimothyrosstimothy
authored
Update grpc-go (#15926) (#16206)
Bumps google.golang.org/grpc to v1.49.0 which includes a fix for grpc/grpc-go#5358 which has been causing tests to fail.
1 parent 0f3de53 commit c4dfb6e

File tree

4 files changed

+117
-40
lines changed

4 files changed

+117
-40
lines changed

‎api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ require (
1919
go.opentelemetry.io/proto/otlp v0.16.0
2020
golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8
2121
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
22-
google.golang.org/grpc v1.46.0
22+
google.golang.org/grpc v1.49.0
2323
gopkg.in/yaml.v2 v2.4.0
2424
)

‎api/go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,9 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
464464
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
465465
google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
466466
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
467-
google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8=
468467
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
468+
google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
469+
google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
469470
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
470471
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
471472
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

‎go.mod

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/gravitational/teleport
33
go 1.17
44

55
require (
6-
cloud.google.com/go v0.100.2 // indirect
6+
cloud.google.com/go v0.102.0 // indirect
77
cloud.google.com/go/firestore v1.2.0
8-
cloud.google.com/go/iam v0.1.1
9-
cloud.google.com/go/storage v1.10.0
8+
cloud.google.com/go/iam v0.3.0
9+
cloud.google.com/go/storage v1.22.1
1010
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0
1111
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0
1212
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1
@@ -42,7 +42,7 @@ require (
4242
github.com/gokyle/hotp v0.0.0-20160218004637-c180d57d286b
4343
github.com/golang/protobuf v1.5.2
4444
github.com/google/btree v1.0.1
45-
github.com/google/go-cmp v0.5.7
45+
github.com/google/go-cmp v0.5.8
4646
github.com/google/gops v0.3.14
4747
github.com/google/uuid v1.3.0
4848
github.com/gorilla/websocket v1.4.2
@@ -104,18 +104,18 @@ require (
104104
go.opentelemetry.io/proto/otlp v0.16.0
105105
go.uber.org/atomic v1.7.0
106106
golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8
107-
golang.org/x/mod v0.4.2
108-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
109-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
107+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3
108+
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e
109+
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
110110
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
111111
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261
112112
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
113113
golang.org/x/text v0.3.7
114-
golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff
115-
google.golang.org/api v0.65.0
116-
google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5
117-
google.golang.org/grpc v1.46.0
118-
google.golang.org/protobuf v1.28.0
114+
golang.org/x/tools v0.1.10
115+
google.golang.org/api v0.91.0
116+
google.golang.org/genproto v0.0.0-20220808204814-fd01256a5276
117+
google.golang.org/grpc v1.49.0
118+
google.golang.org/protobuf v1.28.1
119119
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
120120
gopkg.in/ini.v1 v1.62.0
121121
gopkg.in/square/go-jose.v2 v2.5.1
@@ -126,7 +126,7 @@ require (
126126
)
127127

128128
require (
129-
cloud.google.com/go/compute v0.1.0 // indirect
129+
cloud.google.com/go/compute v1.7.0 // indirect
130130
github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0 // indirect
131131
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
132132
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
@@ -168,7 +168,7 @@ require (
168168
github.com/golang/snappy v0.0.3 // indirect
169169
github.com/google/certificate-transparency-go v1.0.21 // indirect
170170
github.com/google/gofuzz v1.1.0 // indirect
171-
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
171+
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
172172
github.com/googleapis/gnostic v0.5.5 // indirect
173173
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
174174
github.com/gorilla/handlers v1.5.1 // indirect
@@ -237,7 +237,7 @@ require (
237237
go.uber.org/multierr v1.6.0 // indirect
238238
go.uber.org/zap v1.19.0 // indirect
239239
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
240-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
240+
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
241241
google.golang.org/appengine v1.6.7 // indirect
242242
gopkg.in/inf.v0 v0.9.1 // indirect
243243
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
@@ -271,6 +271,8 @@ require (
271271
github.com/go-openapi/jsonreference v0.19.5 // indirect
272272
github.com/go-openapi/swag v0.19.14 // indirect
273273
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
274+
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
275+
github.com/googleapis/go-type-adapters v1.0.0 // indirect
274276
github.com/inconshreveable/mousetrap v1.0.0 // indirect
275277
github.com/jackc/pgtype v1.10.0 // indirect
276278
github.com/joshlf/testutil v0.0.0-20170608050642-b5d8aa79d93d // indirect

0 commit comments

Comments
 (0)