Commit 25e283f
committed
protobuf: recompile using gogoproto 1.2 from CRDB master
Generated Protobufs have been a mix of gogoproto 1.2 and 1.3 types,
since different packages have been compiled with different Protobuf
compilers. This was in part because `Makefile.update-protos` only
covered `errorspb/*.proto`, with other Protobufs compiled ad hoc. This
was problematic since CockroachDB currently uses gogoproto 1.2 and thus
could not make use of the 1.3-generated types.
This patch changes `Makefile.update-protos` to compile all Protobufs in
the repo, and recompiles all Protobufs using the current Protobuf
compiler used in CockroachDB.
Note in particular that this downgrades generated Protobufs for
`extgrpc`, `exthttp`, and `grpc` from gogoproto 1.3 to 1.2, which might
be considered a breaking change.
This also addresses [CVE-2021-3121](https://nvd.nist.gov/vuln/detail/CVE-2021-3121).1 parent 4c16368 commit 25e283f
File tree
17 files changed
+611
-244
lines changed- errbase/internal
- errorspb
- extgrpc
- exthttp
- grpc
- markers/internal
17 files changed
+611
-244
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
27 | 36 | | |
28 | 37 | | |
29 | 38 | | |
30 | 39 | | |
31 | 40 | | |
32 | 41 | | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
41 | 53 | | |
42 | 54 | | |
43 | 55 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | | - | |
19 | 17 | | |
20 | 18 | | |
21 | 19 | | |
| |||
0 commit comments