diff --git a/Cargo.lock b/Cargo.lock index 6f23fc99f5..3850d5f668 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1738,7 +1738,7 @@ dependencies = [ "linkerd-tonic-stream", "linkerd2-proxy-api", "pin-project", - "prost", + "prost 0.12.6", "tonic", "tower", "tracing", @@ -1809,7 +1809,7 @@ dependencies = [ "linkerd2-proxy-api", "maplit", "once_cell", - "prost-types", + "prost-types 0.13.1", "quickcheck", "thiserror", "tonic", @@ -1917,7 +1917,7 @@ dependencies = [ "linkerd-http-route", "linkerd2-proxy-api", "maplit", - "prost-types", + "prost-types 0.13.1", "quickcheck", "thiserror", ] @@ -1963,7 +1963,7 @@ dependencies = [ "linkerd2-proxy-api", "parking_lot", "pin-project", - "prost-types", + "prost-types 0.13.1", "quickcheck", "rand", "thiserror", @@ -2063,7 +2063,7 @@ dependencies = [ "linkerd-tonic-watch", "linkerd2-proxy-api", "once_cell", - "prost-types", + "prost-types 0.13.1", "quickcheck", "regex", "thiserror", @@ -2232,7 +2232,7 @@ dependencies = [ "linkerd-error", "linkerd-io", "linkerd-stack", - "prost", + "prost 0.12.6", "prost-build", "tokio", "tokio-test", @@ -2278,8 +2278,8 @@ dependencies = [ "h2", "http", "ipnet", - "prost", - "prost-types", + "prost 0.12.6", + "prost-types 0.12.6", "quickcheck", "thiserror", "tonic", @@ -2500,8 +2500,8 @@ name = "opencensus-proto" version = "0.1.0" dependencies = [ "bytes", - "prost", - "prost-types", + "prost 0.12.6", + "prost-types 0.13.1", "tonic", "tonic-build", ] @@ -2619,9 +2619,9 @@ dependencies = [ "nix", "once_cell", "parking_lot", - "prost", + "prost 0.12.6", "prost-build", - "prost-derive", + "prost-derive 0.12.6", "sha2", "smallvec", "symbolic-demangle", @@ -2707,7 +2707,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.12.6", +] + +[[package]] +name = "prost" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +dependencies = [ + "bytes", + "prost-derive 0.13.1", ] [[package]] @@ -2724,8 +2734,8 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost", - "prost-types", + "prost 0.12.6", + "prost-types 0.12.6", "regex", "syn", "tempfile", @@ -2744,13 +2754,35 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "prost-types" version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost", + "prost 0.12.6", +] + +[[package]] +name = "prost-types" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" +dependencies = [ + "prost 0.13.1", ] [[package]] @@ -3110,8 +3142,8 @@ name = "spiffe-proto" version = "0.1.0" dependencies = [ "bytes", - "prost", - "prost-types", + "prost 0.12.6", + "prost-types 0.13.1", "tonic", "tonic-build", ] @@ -3394,7 +3426,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", + "prost 0.12.6", "tokio", "tokio-stream", "tower", diff --git a/linkerd/proxy/client-policy/Cargo.toml b/linkerd/proxy/client-policy/Cargo.toml index 7877924075..3cf02cbed1 100644 --- a/linkerd/proxy/client-policy/Cargo.toml +++ b/linkerd/proxy/client-policy/Cargo.toml @@ -19,7 +19,7 @@ ahash = "0.8" ipnet = "2" http = "0.2" once_cell = { version = "1" } -prost-types = { version = "0.12", optional = true } +prost-types = { version = "0.13", optional = true } tonic = { version = "0.10", default-features = false } thiserror = { version = "1", optional = true } diff --git a/linkerd/proxy/server-policy/Cargo.toml b/linkerd/proxy/server-policy/Cargo.toml index 314286d051..430da5f797 100644 --- a/linkerd/proxy/server-policy/Cargo.toml +++ b/linkerd/proxy/server-policy/Cargo.toml @@ -12,7 +12,7 @@ proto = ["linkerd-http-route/proto", "linkerd2-proxy-api", "prost-types"] [dependencies] ipnet = "2" http = "0.2" -prost-types = { version = "0.12", optional = true } +prost-types = { version = "0.13", optional = true } thiserror = "1" linkerd-http-route = { path = "../../http/route" } diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml index ac437fb270..ea0737d1a6 100644 --- a/linkerd/proxy/tap/Cargo.toml +++ b/linkerd/proxy/tap/Cargo.toml @@ -20,7 +20,7 @@ linkerd-proxy-http = { path = "../http" } linkerd-stack = { path = "../../stack" } linkerd-tls = { path = "../../tls" } parking_lot = "0.12" -prost-types = "0.12" +prost-types = "0.13" rand = { version = "0.8" } thiserror = "1" tokio = { version = "1", features = ["time"] } diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml index ccc9af5e70..f41c8834c5 100644 --- a/linkerd/service-profiles/Cargo.toml +++ b/linkerd/service-profiles/Cargo.toml @@ -16,7 +16,7 @@ http = "0.2" http-body = "0.4" linkerd2-proxy-api = { version = "0.13", features = ["destination"] } once_cell = "1.17" -prost-types = "0.12" +prost-types = "0.13" regex = "1" tokio = { version = "1", features = ["macros", "rt", "sync", "time"] } tokio-stream = { version = "0.1", features = ["sync"] } diff --git a/opencensus-proto/Cargo.toml b/opencensus-proto/Cargo.toml index c339c66335..6ad301673b 100644 --- a/opencensus-proto/Cargo.toml +++ b/opencensus-proto/Cargo.toml @@ -14,7 +14,7 @@ Vendored from https://github.com/census-instrumentation/opencensus-proto/. [dependencies] bytes = "1" prost = "0.12" -prost-types = "0.12" +prost-types = "0.13" [dependencies.tonic] version = "0.10" diff --git a/spiffe-proto/Cargo.toml b/spiffe-proto/Cargo.toml index 9e1790e63c..5bd0f4380a 100644 --- a/spiffe-proto/Cargo.toml +++ b/spiffe-proto/Cargo.toml @@ -9,7 +9,7 @@ publish = false [dependencies] bytes = "1" prost = "0.12" -prost-types = "0.12" +prost-types = "0.13" [dependencies.tonic] version = "0.10"