Skip to content

Commit 36612d6

Browse files
thaJeztahthaJeztah
committed
go.mod: remove replace and update github.com/gogo/googleapis v1.4.1
gogo/googleapis has a single dependency (github.com/gogo/protobuf), which is currently the same version as we use, and we have a separate replace for that dependency, so removing this override should not make a difference there. gogo/googleapis v1.4.1 Includes updated protos with the gogo/protobuf fixes for [CVE-2021-3121](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3121) Change logs and diffs for each release: - v1.3.3 generate grpc service for google/longrunning/operations.proto full diff: gogo/googleapis@v1.3.2...v1.3.3 - v1.4.0 Add google geo type full diff: gogo/googleapis@v1.3.3...v1.4.0 - v1.4.1 This release contains sources generated with the version of gogo/protobuf containing a fix for the "skippy peanut butter" issue. full diff: gogo/googleapis@v1.4.0...v1.4.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent f8585d6 commit 36612d6

File tree

11 files changed

+780
-260
lines changed

11 files changed

+780
-260
lines changed

‎go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/docker/go-units v0.4.0
2828
github.com/emicklei/go-restful/v3 v3.7.3
2929
github.com/fsnotify/fsnotify v1.5.1
30-
github.com/gogo/googleapis v1.4.0
30+
github.com/gogo/googleapis v1.4.1
3131
github.com/gogo/protobuf v1.3.2
3232
github.com/google/go-cmp v0.5.6
3333
github.com/google/uuid v1.2.0
@@ -135,7 +135,6 @@ require (
135135

136136
// When updating replace rules, make sure to also update the rules in integration/client/go.mod and api/go.mod
137137
replace (
138-
github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
139138
// urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092
140139
github.com/urfave/cli => github.com/urfave/cli v1.22.1
141140
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63

‎go.sum‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,10 @@ github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
411411
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
412412
github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro=
413413
github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
414-
github.com/gogo/googleapis v1.3.2 h1:kX1es4djPJrsDhY7aZKJy7aZasdcB5oSOEphMjSB53c=
415-
github.com/gogo/googleapis v1.3.2/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
414+
github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU=
415+
github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
416+
github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
417+
github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
416418
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
417419
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
418420
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=

‎integration/client/go.mod‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ replace (
3131
// Replace rules below must be kept in sync with the main go.mod file at the
3232
// root, because that's the actual version expected by the "containerd/containerd"
3333
// dependency above.
34-
github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
3534
// urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092
3635
github.com/urfave/cli => github.com/urfave/cli v1.22.1
3736
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63

‎integration/client/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
261261
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
262262
github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro=
263263
github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
264-
github.com/gogo/googleapis v1.3.2 h1:kX1es4djPJrsDhY7aZKJy7aZasdcB5oSOEphMjSB53c=
265-
github.com/gogo/googleapis v1.3.2/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c=
264+
github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
265+
github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
266266
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
267267
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
268268
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=

‎vendor/github.com/gogo/googleapis/google/rpc/code.pb.go‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/gogo/googleapis/google/rpc/code.proto‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)