From e99f997b2e0991d447e46b5cabac490deb6aeb7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:39:48 +0000 Subject: [PATCH] build(deps): bump tonic from 0.10.2 to 0.12.0 Bumps [tonic](https://github.com/hyperium/tonic) from 0.10.2 to 0.12.0. - [Release notes](https://github.com/hyperium/tonic/releases) - [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/tonic/compare/v0.10.2...v0.12.0) --- updated-dependencies: - dependency-name: tonic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 362 ++++++++++++++++------- linkerd/app/Cargo.toml | 2 +- linkerd/app/core/Cargo.toml | 2 +- linkerd/app/gateway/Cargo.toml | 2 +- linkerd/app/inbound/Cargo.toml | 2 +- linkerd/app/integration/Cargo.toml | 2 +- linkerd/app/outbound/Cargo.toml | 2 +- linkerd/app/test/Cargo.toml | 2 +- linkerd/opencensus/Cargo.toml | 2 +- linkerd/proxy/api-resolve/Cargo.toml | 2 +- linkerd/proxy/client-policy/Cargo.toml | 2 +- linkerd/proxy/identity-client/Cargo.toml | 2 +- linkerd/proxy/spire-client/Cargo.toml | 2 +- linkerd/proxy/tap/Cargo.toml | 2 +- linkerd/service-profiles/Cargo.toml | 2 +- linkerd/tonic-stream/Cargo.toml | 2 +- linkerd/tonic-watch/Cargo.toml | 2 +- opencensus-proto/Cargo.toml | 2 +- spiffe-proto/Cargo.toml | 2 +- 19 files changed, 265 insertions(+), 133 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dae0e7f862..a7ff74e662 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -132,6 +132,12 @@ dependencies = [ "syn", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.3.0" @@ -140,18 +146,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "itoa", "matchit", "memchr", @@ -160,7 +165,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 1.0.1", "tower", "tower-layer", "tower-service", @@ -168,17 +173,20 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", ] @@ -723,7 +731,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", "indexmap 2.2.6", "slab", "tokio", @@ -828,6 +855,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -835,7 +873,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -867,9 +928,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.11", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -881,13 +942,34 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-balance" version = "0.1.0" dependencies = [ "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "pin-project", "tokio", "tokio-test", @@ -896,14 +978,35 @@ dependencies = [ [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ - "hyper", + "hyper 1.4.0", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.4.0", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1057,7 +1160,7 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" name = "linkerd-addr" version = "0.1.0" dependencies = [ - "http", + "http 0.2.11", "ipnet", "linkerd-dns-name", "thiserror", @@ -1081,7 +1184,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tonic", + "tonic 0.12.0", "tower", "tracing", ] @@ -1092,8 +1195,8 @@ version = "0.1.0" dependencies = [ "deflate", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "linkerd-app-core", "linkerd-app-inbound", "linkerd-tracing", @@ -1113,9 +1216,9 @@ dependencies = [ "bytes", "drain", "futures", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "ipnet", "linkerd-addr", "linkerd-conditional", @@ -1168,7 +1271,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tonic", + "tonic 0.12.0", "tower", "tracing", ] @@ -1178,7 +1281,7 @@ name = "linkerd-app-gateway" version = "0.1.0" dependencies = [ "futures", - "http", + "http 0.2.11", "linkerd-app-core", "linkerd-app-inbound", "linkerd-app-outbound", @@ -1189,7 +1292,7 @@ dependencies = [ "thiserror", "tokio", "tokio-test", - "tonic", + "tonic 0.12.0", "tower", "tower-test", "tracing", @@ -1202,8 +1305,8 @@ dependencies = [ "arbitrary", "bytes", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "libfuzzer-sys", "linkerd-app-core", "linkerd-app-test", @@ -1225,7 +1328,7 @@ dependencies = [ "thiserror", "tokio", "tokio-test", - "tonic", + "tonic 0.12.0", "tower", "tracing", ] @@ -1237,10 +1340,10 @@ dependencies = [ "bytes", "flate2", "futures", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "ipnet", "linkerd-app", "linkerd-app-admin", @@ -1259,7 +1362,7 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-stream", - "tonic", + "tonic 0.12.0", "tower", "tracing", "tracing-subscriber", @@ -1272,8 +1375,8 @@ dependencies = [ "ahash", "bytes", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "linkerd-app-core", "linkerd-app-test", "linkerd-distribute", @@ -1298,7 +1401,7 @@ dependencies = [ "thiserror", "tokio", "tokio-test", - "tonic", + "tonic 0.12.0", "tower", "tower-test", "tracing", @@ -1309,10 +1412,10 @@ name = "linkerd-app-test" version = "0.1.0" dependencies = [ "futures", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "linkerd-app-core", "linkerd-http-route", "linkerd-identity", @@ -1325,7 +1428,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tonic", + "tonic 0.12.0", "tower", "tracing", "tracing-subscriber", @@ -1437,7 +1540,7 @@ name = "linkerd-http-access-log" version = "0.1.0" dependencies = [ "futures-core", - "http", + "http 0.2.11", "humantime", "linkerd-identity", "linkerd-proxy-transport", @@ -1455,8 +1558,8 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "linkerd-error", "linkerd-stack", "pin-project", @@ -1466,7 +1569,7 @@ dependencies = [ name = "linkerd-http-classify" version = "0.1.0" dependencies = [ - "http", + "http 0.2.11", "linkerd-error", ] @@ -1480,9 +1583,9 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "linkerd-error", "linkerd-http-classify", "linkerd-metrics", @@ -1500,9 +1603,9 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", "linkerd-error", "linkerd-stack", "linkerd-tracing", @@ -1516,7 +1619,7 @@ dependencies = [ name = "linkerd-http-route" version = "0.1.0" dependencies = [ - "http", + "http 0.2.11", "linkerd2-proxy-api", "maplit", "rand", @@ -1649,8 +1752,8 @@ name = "linkerd-metrics" version = "0.1.0" dependencies = [ "deflate", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "linkerd-stack", "linkerd-system", "parking_lot", @@ -1665,14 +1768,14 @@ name = "linkerd-opencensus" version = "0.1.0" dependencies = [ "futures", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "linkerd-error", "linkerd-metrics", "opencensus-proto", "tokio", "tokio-stream", - "tonic", + "tonic 0.12.0", "tracing", ] @@ -1726,8 +1829,8 @@ name = "linkerd-proxy-api-resolve" version = "0.1.0" dependencies = [ "futures", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "linkerd-addr", "linkerd-error", "linkerd-http-h2", @@ -1738,8 +1841,8 @@ dependencies = [ "linkerd-tonic-stream", "linkerd2-proxy-api", "pin-project", - "prost", - "tonic", + "prost 0.12.6", + "tonic 0.12.0", "tower", "tracing", ] @@ -1799,7 +1902,7 @@ name = "linkerd-proxy-client-policy" version = "0.1.0" dependencies = [ "ahash", - "http", + "http 0.2.11", "ipnet", "linkerd-error", "linkerd-exp-backoff", @@ -1812,7 +1915,7 @@ dependencies = [ "prost-types", "quickcheck", "thiserror", - "tonic", + "tonic 0.12.0", ] [[package]] @@ -1848,11 +1951,11 @@ dependencies = [ "bytes", "drain", "futures", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.11", + "http-body 0.4.6", "httparse", - "hyper", + "hyper 0.14.28", "hyper-balance", "linkerd-detect", "linkerd-duplex", @@ -1880,7 +1983,7 @@ name = "linkerd-proxy-identity-client" version = "0.1.0" dependencies = [ "futures", - "http-body", + "http-body 0.4.6", "linkerd-dns-name", "linkerd-error", "linkerd-identity", @@ -1891,7 +1994,7 @@ dependencies = [ "pin-project", "thiserror", "tokio", - "tonic", + "tonic 0.12.0", "tracing", ] @@ -1912,7 +2015,7 @@ dependencies = [ name = "linkerd-proxy-server-policy" version = "0.1.0" dependencies = [ - "http", + "http 0.2.11", "ipnet", "linkerd-http-route", "linkerd2-proxy-api", @@ -1939,7 +2042,7 @@ dependencies = [ "thiserror", "tokio", "tokio-test", - "tonic", + "tonic 0.12.0", "tower", "tracing", "x509-parser", @@ -1950,8 +2053,8 @@ name = "linkerd-proxy-tap" version = "0.1.0" dependencies = [ "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.28", "ipnet", "linkerd-conditional", "linkerd-error", @@ -1968,7 +2071,7 @@ dependencies = [ "rand", "thiserror", "tokio", - "tonic", + "tonic 0.12.0", "tower", "tracing", ] @@ -2051,8 +2154,8 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.6", "linkerd-addr", "linkerd-dns-name", "linkerd-error", @@ -2069,7 +2172,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tonic", + "tonic 0.12.0", "tower", "tracing", ] @@ -2169,7 +2272,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tonic", + "tonic 0.12.0", "tracing", ] @@ -2184,7 +2287,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tonic", + "tonic 0.12.0", "tower-test", "tracing", ] @@ -2197,7 +2300,7 @@ dependencies = [ "bytes", "futures", "hex", - "http", + "http 0.2.11", "linkerd-error", "linkerd-stack", "rand", @@ -2232,7 +2335,7 @@ dependencies = [ "linkerd-error", "linkerd-io", "linkerd-stack", - "prost", + "prost 0.12.6", "prost-build", "tokio", "tokio-test", @@ -2275,14 +2378,14 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65678e4c506a7e5fdf1a664c629a9b658afa70e254dffcd24df72e937b2c0159" dependencies = [ - "h2", - "http", + "h2 0.3.26", + "http 0.2.11", "ipnet", - "prost", + "prost 0.12.6", "prost-types", "quickcheck", "thiserror", - "tonic", + "tonic 0.10.2", ] [[package]] @@ -2500,9 +2603,9 @@ name = "opencensus-proto" version = "0.1.0" dependencies = [ "bytes", - "prost", + "prost 0.12.6", "prost-types", - "tonic", + "tonic 0.12.0", "tonic-build", ] @@ -2619,7 +2722,7 @@ dependencies = [ "nix", "once_cell", "parking_lot", - "prost", + "prost 0.12.6", "prost-build", "prost-derive", "sha2", @@ -2710,6 +2813,15 @@ dependencies = [ "prost-derive", ] +[[package]] +name = "prost" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac47baaef3631368888abc13a62cb6d42b88bfd5c3fc6f920a9cbe4d7d3ddc9d" +dependencies = [ + "bytes", +] + [[package]] name = "prost-build" version = "0.12.6" @@ -2724,7 +2836,7 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost", + "prost 0.12.6", "prost-types", "regex", "syn", @@ -2750,7 +2862,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost", + "prost 0.12.6", ] [[package]] @@ -3110,9 +3222,9 @@ name = "spiffe-proto" version = "0.1.0" dependencies = [ "bytes", - "prost", + "prost 0.12.6", "prost-types", - "tonic", + "tonic 0.12.0", "tonic-build", ] @@ -3168,6 +3280,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synstructure" version = "0.13.1" @@ -3307,16 +3425,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.3.0" @@ -3381,20 +3489,44 @@ name = "tonic" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +dependencies = [ + "async-trait", + "base64 0.21.7", + "bytes", + "http 0.2.11", + "http-body 0.4.6", + "percent-encoding", + "pin-project", + "prost 0.12.6", + "tokio", + "tokio-stream", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f738b6a169a29bca4e39656db89c44a08e09c5b700b896ee9e7459f0652e81dd" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64 0.22.0", "bytes", - "h2", - "http", - "http-body", - "hyper", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.0", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", - "prost", + "prost 0.13.0", + "socket2", "tokio", "tokio-stream", "tower", diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml index af443530a3..2d5bf1de9e 100644 --- a/linkerd/app/Cargo.toml +++ b/linkerd/app/Cargo.toml @@ -31,6 +31,6 @@ regex = "1" thiserror = "1" tokio = { version = "1", features = ["rt"] } tokio-stream = { version = "0.1", features = ["time", "sync"] } -tonic = { version = "0.10", default-features = false, features = ["prost"] } +tonic = { version = "0.12", default-features = false, features = ["prost"] } tower = "0.4" tracing = "0.1" diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml index f18c234a7a..fb57543927 100644 --- a/linkerd/app/core/Cargo.toml +++ b/linkerd/app/core/Cargo.toml @@ -26,7 +26,7 @@ serde_json = "1" thiserror = "1" tokio = { version = "1", features = ["macros", "sync", "parking_lot"] } tokio-stream = { version = "0.1", features = ["time"] } -tonic = { version = "0.10", default-features = false, features = ["prost"] } +tonic = { version = "0.12", default-features = false, features = ["prost"] } tracing = "0.1" parking_lot = "0.12" pin-project = "1" diff --git a/linkerd/app/gateway/Cargo.toml b/linkerd/app/gateway/Cargo.toml index 86603399ab..b152a4e6f5 100644 --- a/linkerd/app/gateway/Cargo.toml +++ b/linkerd/app/gateway/Cargo.toml @@ -16,7 +16,7 @@ linkerd-proxy-client-policy = { path = "../../proxy/client-policy" } once_cell = "1" thiserror = "1" tokio = { version = "1", features = ["sync"] } -tonic = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } tower = { version = "0.4", default-features = false } tracing = "0.1" diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml index cad07a4f26..363beeecea 100644 --- a/linkerd/app/inbound/Cargo.toml +++ b/linkerd/app/inbound/Cargo.toml @@ -36,7 +36,7 @@ parking_lot = "0.12" rangemap = "1" thiserror = "1" tokio = { version = "1", features = ["sync"] } -tonic = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } tower = { version = "0.4", features = ["util"] } tracing = "0.1" diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml index 3d083fb4be..2e650ac629 100644 --- a/linkerd/app/integration/Cargo.toml +++ b/linkerd/app/integration/Cargo.toml @@ -48,7 +48,7 @@ tokio-stream = { version = "0.1", features = ["sync"] } tokio-rustls = "0.24" rustls-pemfile = "1.0" tower = { version = "0.4", default-features = false } -tonic = { version = "0.10", features = ["transport"], default-features = false } +tonic = { version = "0.12", features = ["transport"], default-features = false } tracing = "0.1" tracing-subscriber = { version = "0.3", default-features = false, features = [ "fmt", diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml index 0d4a68c889..82c26141c7 100644 --- a/linkerd/app/outbound/Cargo.toml +++ b/linkerd/app/outbound/Cargo.toml @@ -26,7 +26,7 @@ parking_lot = "0.12" prometheus-client = "0.22" thiserror = "1" tokio = { version = "1", features = ["sync"] } -tonic = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } tower = { version = "0.4", features = ["util"] } tracing = "0.1" pin-project = "1" diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml index 1afee2908c..fb12bdbdd3 100644 --- a/linkerd/app/test/Cargo.toml +++ b/linkerd/app/test/Cargo.toml @@ -29,7 +29,7 @@ regex = "1" tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] } tokio-test = "0.4" tokio-stream = { version = "0.1", features = ["sync"] } -tonic = { version = "0.10", default-features = false, optional = true } +tonic = { version = "0.12", default-features = false, optional = true } tower = { version = "0.4", default-features = false } tracing = "0.1" thiserror = "1" diff --git a/linkerd/opencensus/Cargo.toml b/linkerd/opencensus/Cargo.toml index 65d1b45eed..b4013bbaa9 100644 --- a/linkerd/opencensus/Cargo.toml +++ b/linkerd/opencensus/Cargo.toml @@ -13,7 +13,7 @@ http-body = "0.4" linkerd-error = { path = "../error" } linkerd-metrics = { path = "../metrics" } opencensus-proto = { path = "../../opencensus-proto" } -tonic = { version = "0.10", default-features = false, features = [ +tonic = { version = "0.12", default-features = false, features = [ "prost", "codegen", ] } diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml index 449a6b12f1..cf3ba91ff1 100644 --- a/linkerd/proxy/api-resolve/Cargo.toml +++ b/linkerd/proxy/api-resolve/Cargo.toml @@ -24,6 +24,6 @@ http = "0.2" http-body = "0.4" pin-project = "1" prost = "0.12" -tonic = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } tower = { version = "0.4", default-features = false } tracing = "0.1" diff --git a/linkerd/proxy/client-policy/Cargo.toml b/linkerd/proxy/client-policy/Cargo.toml index 7877924075..ca3c5e0927 100644 --- a/linkerd/proxy/client-policy/Cargo.toml +++ b/linkerd/proxy/client-policy/Cargo.toml @@ -20,7 +20,7 @@ ipnet = "2" http = "0.2" once_cell = { version = "1" } prost-types = { version = "0.12", optional = true } -tonic = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } thiserror = { version = "1", optional = true } linkerd-error = { path = "../../error" } diff --git a/linkerd/proxy/identity-client/Cargo.toml b/linkerd/proxy/identity-client/Cargo.toml index 3d199200d9..1fd3171e30 100644 --- a/linkerd/proxy/identity-client/Cargo.toml +++ b/linkerd/proxy/identity-client/Cargo.toml @@ -18,6 +18,6 @@ parking_lot = "0.12" pin-project = "1" thiserror = "1" tokio = { version = "1", features = ["time", "sync"] } -tonic = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } tracing = "0.1" http-body = "0.4" diff --git a/linkerd/proxy/spire-client/Cargo.toml b/linkerd/proxy/spire-client/Cargo.toml index 300d7d6dc0..8efaa0a71b 100644 --- a/linkerd/proxy/spire-client/Cargo.toml +++ b/linkerd/proxy/spire-client/Cargo.toml @@ -16,7 +16,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" } linkerd-exp-backoff = { path = "../../exp-backoff" } linkerd-stack = { path = "../../stack" } tokio = { version = "1", features = ["time", "sync"] } -tonic = "0.10" +tonic = "0.12" tower = "0.4" tracing = "0.1" x509-parser = "0.16.0" diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml index ac437fb270..2f64cba1ff 100644 --- a/linkerd/proxy/tap/Cargo.toml +++ b/linkerd/proxy/tap/Cargo.toml @@ -25,7 +25,7 @@ rand = { version = "0.8" } thiserror = "1" tokio = { version = "1", features = ["time"] } tower = { version = "0.4", default-features = false } -tonic = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } tracing = "0.1" pin-project = "1" diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml index ccc9af5e70..f3713fb865 100644 --- a/linkerd/service-profiles/Cargo.toml +++ b/linkerd/service-profiles/Cargo.toml @@ -20,7 +20,7 @@ prost-types = "0.12" regex = "1" tokio = { version = "1", features = ["macros", "rt", "sync", "time"] } tokio-stream = { version = "0.1", features = ["sync"] } -tonic = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } tower = { version = "0.4.13", features = ["retry", "util"] } thiserror = "1" tracing = "0.1" diff --git a/linkerd/tonic-stream/Cargo.toml b/linkerd/tonic-stream/Cargo.toml index 1a0ffc7655..3ce10b44d3 100644 --- a/linkerd/tonic-stream/Cargo.toml +++ b/linkerd/tonic-stream/Cargo.toml @@ -10,7 +10,7 @@ publish = false futures = { version = "0.3", default-features = false } linkerd-stack = { path = "../stack" } pin-project = "1" -tonic = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } tokio = { version = "1", features = ["time"] } tracing = "0.1" diff --git a/linkerd/tonic-watch/Cargo.toml b/linkerd/tonic-watch/Cargo.toml index 1f3ecfe527..71fdacfd41 100644 --- a/linkerd/tonic-watch/Cargo.toml +++ b/linkerd/tonic-watch/Cargo.toml @@ -13,7 +13,7 @@ Provides a utility for creating robust watches from a service that returns a str futures = { version = "0.3", default-features = false } linkerd-error = { path = "../error" } linkerd-stack = { path = "../stack" } -tonic = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } tokio = { version = "1", features = ["macros", "rt", "sync", "time"] } tracing = "0.1" diff --git a/opencensus-proto/Cargo.toml b/opencensus-proto/Cargo.toml index c339c66335..5304a956e0 100644 --- a/opencensus-proto/Cargo.toml +++ b/opencensus-proto/Cargo.toml @@ -17,7 +17,7 @@ prost = "0.12" prost-types = "0.12" [dependencies.tonic] -version = "0.10" +version = "0.12" default-features = false features = ["prost", "codegen"] diff --git a/spiffe-proto/Cargo.toml b/spiffe-proto/Cargo.toml index 9e1790e63c..ccb7271a57 100644 --- a/spiffe-proto/Cargo.toml +++ b/spiffe-proto/Cargo.toml @@ -12,7 +12,7 @@ prost = "0.12" prost-types = "0.12" [dependencies.tonic] -version = "0.10" +version = "0.12" default-features = false features = ["prost", "codegen"]