From 24d33b2abb599333f37eb3074db4d2c6f6d391fd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 2 Sep 2023 02:07:14 +0000 Subject: [PATCH] Update Rust crate tonic to 0.10 --- Cargo.lock | 72 ++++++++++++++++++++++++++++++-------------- gaia-stub/Cargo.toml | 2 +- gaia-tmtc/Cargo.toml | 2 +- tmtc-c2a/Cargo.toml | 2 +- 4 files changed, 52 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6434db8b..4c7e404e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -555,9 +555,9 @@ dependencies = [ name = "gaia-stub" version = "0.5.0" dependencies = [ - "prost", + "prost 0.11.8", "prost-types", - "tonic", + "tonic 0.10.0", "tonic-build", ] @@ -574,7 +574,7 @@ dependencies = [ "serde", "tokio", "tokio-stream", - "tonic", + "tonic 0.10.0", "tracing", ] @@ -607,9 +607,9 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "h2" -version = "0.3.13" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1185,6 +1185,15 @@ dependencies = [ "prost-derive", ] +[[package]] +name = "prost" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa8473a65b88506c106c28ae905ca4a2b83a2993640467a41bb3080627ddfd2c" +dependencies = [ + "bytes", +] + [[package]] name = "prost-build" version = "0.11.8" @@ -1199,7 +1208,7 @@ dependencies = [ "multimap", "petgraph", "prettyplease", - "prost", + "prost 0.11.8", "prost-types", "regex", "syn 1.0.109", @@ -1226,7 +1235,7 @@ version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88" dependencies = [ - "prost", + "prost 0.11.8", ] [[package]] @@ -1846,7 +1855,7 @@ dependencies = [ "http", "itertools 0.11.0", "kble-socket", - "prost", + "prost 0.11.8", "prost-types", "sentry", "sentry-tracing", @@ -1856,7 +1865,7 @@ dependencies = [ "tlmcmddb", "tokio", "tokio-tungstenite", - "tonic", + "tonic 0.10.0", "tonic-build", "tonic-health", "tonic-reflection", @@ -1974,13 +1983,33 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38bd8e87955eb13c1986671838177d6792cdc52af9bffced0d2c8a9a7f741ab3" dependencies = [ - "async-stream", "async-trait", - "axum", "base64 0.21.0", "bytes", "futures-core", "futures-util", + "http", + "http-body", + "percent-encoding", + "pin-project", + "prost 0.11.8", + "tokio-stream", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5469afaf78a11265c343a88969045c1568aa8ecc6c787dbf756e92e70f199861" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.0", + "bytes", "h2", "http", "http-body", @@ -1988,7 +2017,7 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", + "prost 0.12.0", "rustls-pemfile", "tokio", "tokio-rustls 0.24.0", @@ -1997,7 +2026,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "webpki-roots 0.23.0", + "webpki-roots 0.25.2", ] [[package]] @@ -2020,10 +2049,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "952d35d8f23b6d61e85eee6d4799a6364e10bfe759b97d9cf489b3da9b1fd341" dependencies = [ "async-stream", - "prost", + "prost 0.11.8", "tokio", "tokio-stream", - "tonic", + "tonic 0.9.1", ] [[package]] @@ -2032,11 +2061,11 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c6980583b9694a05bb2deb0678f72c44564ff52b91cd22642f2f992cd8dd02f" dependencies = [ - "prost", + "prost 0.11.8", "prost-types", "tokio", "tokio-stream", - "tonic", + "tonic 0.9.1", ] [[package]] @@ -2052,7 +2081,7 @@ dependencies = [ "http-body", "hyper", "pin-project", - "tonic", + "tonic 0.9.1", "tower-http", "tower-layer", "tower-service", @@ -2422,12 +2451,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.23.0" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa54963694b65584e170cf5dc46aeb4dcaa5584e652ff5f3952e56d66aff0125" -dependencies = [ - "rustls-webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "which" diff --git a/gaia-stub/Cargo.toml b/gaia-stub/Cargo.toml index 74d890ce..dcb3e5fa 100644 --- a/gaia-stub/Cargo.toml +++ b/gaia-stub/Cargo.toml @@ -7,7 +7,7 @@ license = "MPL-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tonic = "0.9" +tonic = "0.10" prost = "0.11" prost-types = "0.11" diff --git a/gaia-tmtc/Cargo.toml b/gaia-tmtc/Cargo.toml index 9d582533..4439b93c 100644 --- a/gaia-tmtc/Cargo.toml +++ b/gaia-tmtc/Cargo.toml @@ -14,7 +14,7 @@ chrono = "0.4" tracing = "0.1" tokio = { version = "1", features = ["sync"] } tokio-stream = { version = "0.1", features = ["sync"] } -tonic = "0.9" +tonic = "0.10" prost-types = "0.11" gaia-stub = { path = "../gaia-stub" } serde = { version = "1", features = ["derive"] } diff --git a/tmtc-c2a/Cargo.toml b/tmtc-c2a/Cargo.toml index 4cc84910..9805a91a 100644 --- a/tmtc-c2a/Cargo.toml +++ b/tmtc-c2a/Cargo.toml @@ -23,7 +23,7 @@ tower-http = { version = "0.4", features = ["trace", "cors"] } tokio = { version = "1", features = ["full"] } prost = "0.11" prost-types = "0.11" -tonic = { version = "0.9", features = ["tls", "tls-roots-common", "tls-webpki-roots"] } +tonic = { version = "0.10", features = ["tls", "tls-roots-common", "tls-webpki-roots"] } tonic-health = "0.9" tonic-reflection = "0.9" tonic-web = "0.9"