diff --git a/Cargo.lock b/Cargo.lock index 4d0ccb0..6a22fce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -288,40 +288,13 @@ dependencies = [ "fs_extra", ] -[[package]] -name = "axum" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" -dependencies = [ - "async-trait", - "axum-core 0.4.5", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "itoa", - "matchit 0.7.3", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower 0.5.2", - "tower-layer", - "tower-service", -] - [[package]] name = "axum" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871" dependencies = [ - "axum-core 0.5.5", + "axum-core", "bytes", "form_urlencoded", "futures-util", @@ -331,7 +304,7 @@ dependencies = [ "hyper", "hyper-util", "itoa", - "matchit 0.8.4", + "matchit", "memchr", "mime", "percent-encoding", @@ -348,26 +321,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum-core" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper", - "tower-layer", - "tower-service", -] - [[package]] name = "axum-core" version = "0.5.5" @@ -396,7 +349,7 @@ dependencies = [ "anyhow", "assert-json-diff", "auto-future", - "axum 0.8.6", + "axum", "bytes", "bytesize", "cookie", @@ -943,13 +896,13 @@ name = "envoy-data-plane-api" version = "0.1.0" dependencies = [ "glob", - "prost", + "prost 0.14.1", "prost-build", "prost-reflect", "serde", "serde_json", "serde_yaml", - "tonic", + "tonic 0.14.2", "tonic-build", "tonic-health", ] @@ -1830,12 +1783,6 @@ dependencies = [ "regex-automata", ] -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - [[package]] name = "matchit" version = "0.8.4" @@ -2060,13 +2007,13 @@ dependencies = [ "opentelemetry-http", "opentelemetry-proto", "opentelemetry_sdk", - "prost", + "prost 0.13.5", "reqwest", "serde", "serde_json", "thiserror 2.0.17", "tokio", - "tonic", + "tonic 0.12.3", "tracing", ] @@ -2080,9 +2027,9 @@ dependencies = [ "hex", "opentelemetry", "opentelemetry_sdk", - "prost", + "prost 0.13.5", "serde", - "tonic", + "tonic 0.12.3", ] [[package]] @@ -2135,7 +2082,7 @@ dependencies = [ "orion-error", "orion-format", "orion-interner", - "prost", + "prost 0.14.1", "prost-types", "regex", "serde", @@ -2322,7 +2269,7 @@ version = "0.1.0" dependencies = [ "abort-on-drop", "affinity", - "axum 0.8.6", + "axum", "axum-test", "caps", "compact_str", @@ -2648,23 +2595,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" dependencies = [ "bytes", - "prost-derive", + "prost-derive 0.13.5", +] + +[[package]] +name = "prost" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" +dependencies = [ + "bytes", + "prost-derive 0.14.1", ] [[package]] name = "prost-build" -version = "0.13.5" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" +checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1" dependencies = [ "heck", - "itertools 0.14.0", + "itertools 0.10.5", "log", "multimap", "once_cell", "petgraph", "prettyplease", - "prost", + "prost 0.14.1", "prost-types", "regex", "syn", @@ -2678,7 +2635,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-derive" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" +dependencies = [ + "anyhow", + "itertools 0.10.5", "proc-macro2", "quote", "syn", @@ -2686,13 +2656,12 @@ dependencies = [ [[package]] name = "prost-reflect" -version = "0.14.7" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5edd582b62f5cde844716e66d92565d7faf7ab1445c8cebce6e00fba83ddb2" +checksum = "89a3ac73ec9a9118131a4594c9d336631a07852220a1d0ae03ee36b04503a063" dependencies = [ "base64 0.22.1", - "once_cell", - "prost", + "prost 0.14.1", "prost-reflect-derive", "prost-types", "serde", @@ -2701,9 +2670,9 @@ dependencies = [ [[package]] name = "prost-reflect-derive" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fce6b22f15cc8d8d400a2b98ad29202b33bd56c7d9ddd815bc803a807ecb65" +checksum = "7b6d90e29fa6c0d13c2c19ba5e4b3fb0efbf5975d27bcf4e260b7b15455bcabe" dependencies = [ "proc-macro2", "quote", @@ -2712,11 +2681,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.13.5" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" +checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72" dependencies = [ - "prost", + "prost 0.14.1", ] [[package]] @@ -3674,12 +3643,9 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ - "async-stream", "async-trait", - "axum 0.7.9", "base64 0.22.1", "bytes", - "h2", "http", "http-body", "http-body-util", @@ -3688,8 +3654,7 @@ dependencies = [ "hyper-util", "percent-encoding", "pin-project", - "prost", - "socket2 0.5.10", + "prost 0.13.5", "tokio", "tokio-stream", "tower 0.4.13", @@ -3698,31 +3663,69 @@ dependencies = [ "tracing", ] +[[package]] +name = "tonic" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203" +dependencies = [ + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "socket2 0.6.1", + "sync_wrapper", + "tokio", + "tokio-stream", + "tower 0.5.2", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tonic-build" -version = "0.12.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" +checksum = "4c40aaccc9f9eccf2cd82ebc111adc13030d23e887244bc9cfa5d1d636049de3" dependencies = [ "prettyplease", "proc-macro2", - "prost-build", - "prost-types", "quote", "syn", ] [[package]] name = "tonic-health" -version = "0.12.3" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eaf34ddb812120f5c601162d5429933c9b527d901ab0e7f930d3147e33a09b2" +checksum = "2a82868bf299e0a1d2e8dce0dc33a46c02d6f045b2c1f1d6cc8dc3d0bf1812ef" dependencies = [ - "async-stream", - "prost", + "prost 0.14.1", "tokio", "tokio-stream", - "tonic", + "tonic 0.14.2", + "tonic-prost", +] + +[[package]] +name = "tonic-prost" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67" +dependencies = [ + "bytes", + "prost 0.14.1", + "tonic 0.14.2", ] [[package]] @@ -3753,9 +3756,12 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", + "indexmap 2.11.4", "pin-project-lite", + "slab", "sync_wrapper", "tokio", + "tokio-util", "tower-layer", "tower-service", "tracing", diff --git a/Cargo.toml b/Cargo.toml index e2ac900..f70cf03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,9 +51,9 @@ http-body = "1.0" http-body-util = "0.1.0" num_cpus = "1" ppp = "2.3" -prost = "0.13" -prost-build = "^0.13" -prost-reflect = { version = "0.14", features = ["derive", "serde"] } +prost = "0.14" +prost-build = "^0.14" +prost-reflect = { version = "0.16", features = ["derive", "serde"] } regex = "1.10.2" serde = { version = "1", features = ["derive", "rc"] } serde_json = { version = "1" } @@ -61,9 +61,9 @@ serde_yaml = "0.9.34" thiserror = "1.0.57" tokio = { version = "1.37", features = ["full"] } tokio-stream = { version = "0.1.15", features = ["net", "sync"] } -tonic = "^0.12" -tonic-build = "^0.12" -tonic-health = "^0.12" +tonic = "^0.14" +tonic-build = "^0.14" +tonic-health = "^0.14" tower = { version = "0.5.1", features = ["make"] } tracing = "0.1" tracing-subscriber = "0.3" diff --git a/orion-configuration/Cargo.toml b/orion-configuration/Cargo.toml index cbfddc7..3627b45 100644 --- a/orion-configuration/Cargo.toml +++ b/orion-configuration/Cargo.toml @@ -32,8 +32,8 @@ orion-data-plane-api = { workspace = true, optional = true } orion-error.workspace = true orion-format.workspace = true orion-interner.workspace = true -prost = "0.13.0" -prost-types = "0.13.0" +prost = "0.14.1" +prost-types = "0.14.1" regex.workspace = true serde = { workspace = true, features = ["rc"] } serde_json.workspace = true