diff --git a/Cargo.lock b/Cargo.lock index aa12ba0653..ec3b742757 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,6 +147,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.4.0" @@ -155,18 +161,17 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", "itoa", "matchit", "memchr", @@ -176,24 +181,27 @@ dependencies = [ "rustversion", "serde", "sync_wrapper", - "tower", + "tower 0.5.2", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper", "tower-layer", "tower-service", ] @@ -485,7 +493,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d105028bd2b5dfcb33318fd79a445001ead36004dd8dffef1bdd7e493d8bc1e" dependencies = [ "tokio", - "tower", + "tower 0.4.13", ] [[package]] @@ -806,7 +814,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", + "indexmap 2.7.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.2.0", "indexmap 2.7.0", "slab", "tokio", @@ -911,6 +938,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.6" @@ -918,7 +956,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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.2.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.2.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -942,25 +1003,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.32" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.4.7", + "http 1.2.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] @@ -969,25 +1027,45 @@ name = "hyper-balance" version = "0.1.0" dependencies = [ "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "hyper", "pin-project", "tokio", "tokio-test", - "tower", + "tower 0.4.13", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" dependencies = [ "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", ] [[package]] @@ -1274,7 +1352,7 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" name = "linkerd-addr" version = "0.1.0" dependencies = [ - "http", + "http 1.2.0", "ipnet", "linkerd-dns-name", "thiserror 2.0.8", @@ -1299,8 +1377,8 @@ dependencies = [ "thiserror 2.0.8", "tokio", "tokio-stream", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", ] @@ -1311,8 +1389,8 @@ dependencies = [ "bytes", "deflate", "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "hyper", "linkerd-app-core", "linkerd-app-inbound", @@ -1322,7 +1400,7 @@ dependencies = [ "serde_json", "thiserror 2.0.8", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -1333,8 +1411,8 @@ dependencies = [ "bytes", "drain", "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "hyper", "ipnet", "linkerd-addr", @@ -1389,8 +1467,8 @@ dependencies = [ "thiserror 2.0.8", "tokio", "tokio-stream", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", ] @@ -1399,7 +1477,7 @@ name = "linkerd-app-gateway" version = "0.1.0" dependencies = [ "futures", - "http", + "http 1.2.0", "linkerd-app-core", "linkerd-app-inbound", "linkerd-app-outbound", @@ -1410,8 +1488,8 @@ dependencies = [ "thiserror 2.0.8", "tokio", "tokio-test", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tower-test", "tracing", ] @@ -1423,7 +1501,7 @@ dependencies = [ "arbitrary", "bytes", "futures", - "http", + "http 1.2.0", "hyper", "libfuzzer-sys", "linkerd-app-core", @@ -1446,8 +1524,8 @@ dependencies = [ "thiserror 2.0.8", "tokio", "tokio-test", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", ] @@ -1458,9 +1536,9 @@ dependencies = [ "bytes", "flate2", "futures", - "h2", - "http", - "http-body", + "h2 0.4.7", + "http 1.2.0", + "http-body 1.0.1", "hyper", "ipnet", "linkerd-app", @@ -1480,8 +1558,8 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-stream", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", "tracing-subscriber", ] @@ -1494,8 +1572,8 @@ dependencies = [ "bytes", "futures", "futures-util", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "hyper", "linkerd-app-core", "linkerd-app-test", @@ -1525,8 +1603,8 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-test", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tower-test", "tracing", ] @@ -1536,9 +1614,9 @@ name = "linkerd-app-test" version = "0.1.0" dependencies = [ "futures", - "h2", - "http", - "http-body", + "h2 0.4.7", + "http 1.2.0", + "http-body 1.0.1", "hyper", "linkerd-app-core", "linkerd-http-route", @@ -1552,8 +1630,8 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", "tracing-subscriber", ] @@ -1573,7 +1651,7 @@ dependencies = [ "linkerd-stack", "thiserror 2.0.8", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -1663,7 +1741,7 @@ name = "linkerd-http-access-log" version = "0.1.0" dependencies = [ "futures-core", - "http", + "http 1.2.0", "humantime", "linkerd-identity", "linkerd-proxy-transport", @@ -1681,8 +1759,8 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "linkerd-error", "linkerd-stack", "pin-project", @@ -1693,8 +1771,8 @@ name = "linkerd-http-classify" version = "0.1.0" dependencies = [ "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "linkerd-error", "linkerd-http-box", "linkerd-stack", @@ -1724,10 +1802,10 @@ name = "linkerd-http-insert" version = "0.1.0" dependencies = [ "futures", - "http", + "http 1.2.0", "linkerd-stack", "pin-project", - "tower", + "tower 0.4.13", ] [[package]] @@ -1736,8 +1814,8 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "hyper", "linkerd-error", "linkerd-http-classify", @@ -1746,7 +1824,7 @@ dependencies = [ "parking_lot", "pin-project", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -1754,9 +1832,9 @@ dependencies = [ name = "linkerd-http-override-authority" version = "0.1.0" dependencies = [ - "http", + "http 1.2.0", "linkerd-stack", - "tower", + "tower 0.4.13", "tracing", ] @@ -1766,8 +1844,8 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "linkerd-error", "linkerd-http-box", "linkerd-metrics", @@ -1783,11 +1861,11 @@ dependencies = [ name = "linkerd-http-retain" version = "0.1.0" dependencies = [ - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "linkerd-stack", "pin-project", - "tower", + "tower 0.4.13", ] [[package]] @@ -1796,8 +1874,8 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "hyper", "linkerd-error", "linkerd-exp-backoff", @@ -1808,7 +1886,7 @@ dependencies = [ "parking_lot", "thiserror 2.0.8", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -1816,7 +1894,7 @@ dependencies = [ name = "linkerd-http-route" version = "0.1.0" dependencies = [ - "http", + "http 1.2.0", "linkerd2-proxy-api", "maplit", "rand", @@ -1831,8 +1909,8 @@ name = "linkerd-http-stream-timeouts" version = "0.1.0" dependencies = [ "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "linkerd-error", "linkerd-stack", "parking_lot", @@ -1849,8 +1927,8 @@ dependencies = [ "bytes", "drain", "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "hyper", "linkerd-duplex", "linkerd-error", @@ -1860,7 +1938,7 @@ dependencies = [ "linkerd-stack", "pin-project", "tokio", - "tower", + "tower 0.4.13", "tracing", "try-lock", ] @@ -1869,7 +1947,7 @@ dependencies = [ name = "linkerd-http-version" version = "0.1.0" dependencies = [ - "http", + "http 1.2.0", "thiserror 2.0.8", ] @@ -1896,7 +1974,7 @@ dependencies = [ "linkerd-tracing", "parking_lot", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -1996,8 +2074,8 @@ name = "linkerd-metrics" version = "0.1.0" dependencies = [ "deflate", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "hyper", "linkerd-http-box", "linkerd-stack", @@ -2018,15 +2096,15 @@ name = "linkerd-opencensus" version = "0.1.0" dependencies = [ "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "linkerd-error", "linkerd-metrics", "linkerd-trace-context", "opencensus-proto", "tokio", "tokio-stream", - "tonic", + "tonic 0.12.3", "tracing", ] @@ -2035,8 +2113,8 @@ name = "linkerd-opentelemetry" version = "0.1.0" dependencies = [ "futures", - "http", - "http-body", + "http 0.2.11", + "http-body 1.0.1", "linkerd-error", "linkerd-metrics", "linkerd-trace-context", @@ -2045,7 +2123,7 @@ dependencies = [ "opentelemetry_sdk", "tokio", "tokio-stream", - "tonic", + "tonic 0.12.3", "tracing", ] @@ -2089,7 +2167,7 @@ dependencies = [ "rand", "tokio", "tokio-test", - "tower", + "tower 0.4.13", "tower-test", "tracing", ] @@ -2099,8 +2177,8 @@ name = "linkerd-proxy-api-resolve" version = "0.1.0" dependencies = [ "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "linkerd-addr", "linkerd-error", "linkerd-http-h2", @@ -2111,9 +2189,9 @@ dependencies = [ "linkerd-tonic-stream", "linkerd2-proxy-api", "pin-project", - "prost", - "tonic", - "tower", + "prost 0.13.4", + "tonic 0.12.3", + "tower 0.4.13", "tracing", ] @@ -2131,7 +2209,7 @@ dependencies = [ "linkerd-stack", "rand", "tokio", - "tower", + "tower 0.4.13", "tracing", ] @@ -2172,7 +2250,7 @@ name = "linkerd-proxy-client-policy" version = "0.1.0" dependencies = [ "ahash", - "http", + "http 1.2.0", "ipnet", "linkerd-error", "linkerd-exp-backoff", @@ -2184,10 +2262,10 @@ dependencies = [ "linkerd2-proxy-api", "maplit", "once_cell", - "prost-types", + "prost-types 0.13.4", "quickcheck", "thiserror 2.0.8", - "tonic", + "tonic 0.12.3", ] [[package]] @@ -2196,7 +2274,7 @@ version = "0.1.0" dependencies = [ "futures", "linkerd-error", - "tower", + "tower 0.4.13", ] [[package]] @@ -2211,7 +2289,7 @@ dependencies = [ "linkerd-stack", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tracing", ] @@ -2223,9 +2301,9 @@ dependencies = [ "bytes", "drain", "futures", - "h2", - "http", - "http-body", + "h2 0.4.7", + "http 1.2.0", + "http-body 1.0.1", "httparse", "hyper", "hyper-balance", @@ -2252,7 +2330,7 @@ dependencies = [ "thiserror 2.0.8", "tokio", "tokio-test", - "tower", + "tower 0.4.13", "tower-test", "tracing", "try-lock", @@ -2263,7 +2341,7 @@ name = "linkerd-proxy-identity-client" version = "0.1.0" dependencies = [ "futures", - "http-body", + "http-body 1.0.1", "linkerd-dns-name", "linkerd-error", "linkerd-identity", @@ -2274,7 +2352,7 @@ dependencies = [ "pin-project", "thiserror 2.0.8", "tokio", - "tonic", + "tonic 0.12.3", "tracing", ] @@ -2287,7 +2365,7 @@ dependencies = [ "linkerd-proxy-core", "pin-project", "thiserror 2.0.8", - "tower", + "tower 0.4.13", "tracing", ] @@ -2296,13 +2374,13 @@ name = "linkerd-proxy-server-policy" version = "0.1.0" dependencies = [ "governor", - "http", + "http 1.2.0", "ipnet", "linkerd-http-route", "linkerd-identity", "linkerd2-proxy-api", "maplit", - "prost-types", + "prost-types 0.13.4", "quickcheck", "thiserror 2.0.8", "tokio", @@ -2325,8 +2403,8 @@ dependencies = [ "thiserror 2.0.8", "tokio", "tokio-test", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", "x509-parser", ] @@ -2337,8 +2415,8 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "hyper", "ipnet", "linkerd-conditional", @@ -2351,13 +2429,13 @@ dependencies = [ "linkerd2-proxy-api", "parking_lot", "pin-project", - "prost-types", + "prost-types 0.13.4", "quickcheck", "rand", "thiserror 2.0.8", "tokio", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", ] @@ -2373,7 +2451,7 @@ dependencies = [ "pin-project", "rand", "tokio", - "tower", + "tower 0.4.13", ] [[package]] @@ -2404,7 +2482,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tower", + "tower 0.4.13", "tower-test", "tracing", ] @@ -2416,7 +2494,7 @@ dependencies = [ "futures", "linkerd-error", "linkerd-stack", - "tower", + "tower 0.4.13", "tracing", ] @@ -2439,8 +2517,8 @@ version = "0.1.0" dependencies = [ "bytes", "futures", - "http", - "http-body", + "http 1.2.0", + "http-body 1.0.1", "linkerd-addr", "linkerd-dns-name", "linkerd-error", @@ -2451,14 +2529,14 @@ dependencies = [ "linkerd-tonic-watch", "linkerd2-proxy-api", "once_cell", - "prost-types", + "prost-types 0.13.4", "quickcheck", "regex", "thiserror 2.0.8", "tokio", "tokio-stream", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", ] @@ -2483,7 +2561,7 @@ dependencies = [ "tokio", "tokio-test", "tokio-util", - "tower", + "tower 0.4.13", "tower-test", "tracing", ] @@ -2496,7 +2574,7 @@ dependencies = [ "parking_lot", "tokio", "tokio-test", - "tower", + "tower 0.4.13", "tower-test", ] @@ -2507,7 +2585,7 @@ dependencies = [ "futures", "linkerd-error", "linkerd-stack", - "tower", + "tower 0.4.13", "tracing", ] @@ -2537,7 +2615,7 @@ dependencies = [ "pin-project", "thiserror 2.0.8", "tokio", - "tower", + "tower 0.4.13", "tracing", "untrusted", ] @@ -2570,7 +2648,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tonic", + "tonic 0.12.3", "tracing", ] @@ -2585,7 +2663,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tonic", + "tonic 0.12.3", "tower-test", "tracing", ] @@ -2598,12 +2676,12 @@ dependencies = [ "bytes", "futures", "hex", - "http", + "http 1.2.0", "linkerd-error", "linkerd-stack", "rand", "thiserror 1.0.69", - "tower", + "tower 0.4.13", "tracing", ] @@ -2633,8 +2711,8 @@ dependencies = [ "linkerd-error", "linkerd-io", "linkerd-stack", - "prost", - "prost-build", + "prost 0.13.4", + "prost-build 0.12.6", "tokio", "tokio-test", "tracing", @@ -2677,14 +2755,14 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4682c00263191a5bfa4fbe64f6d80b22ff2b49aaa294da5aac062f5abc6eb9e" dependencies = [ - "h2", - "http", + "h2 0.3.26", + "http 0.2.11", "ipnet", - "prost", - "prost-types", + "prost 0.12.6", + "prost-types 0.12.6", "quickcheck", "thiserror 1.0.69", - "tonic", + "tonic 0.10.2", ] [[package]] @@ -2929,9 +3007,9 @@ name = "opencensus-proto" version = "0.1.0" dependencies = [ "bytes", - "prost", - "prost-types", - "tonic", + "prost 0.13.4", + "prost-types 0.13.4", + "tonic 0.12.3", "tonic-build", ] @@ -2966,8 +3044,8 @@ version = "0.1.0" dependencies = [ "opentelemetry", "opentelemetry_sdk", - "prost", - "tonic", + "prost 0.13.4", + "tonic 0.12.3", "tonic-build", ] @@ -3100,9 +3178,9 @@ dependencies = [ "nix", "once_cell", "parking_lot", - "prost", - "prost-build", - "prost-derive", + "prost 0.12.6", + "prost-build 0.12.6", + "prost-derive 0.12.6", "sha2", "smallvec", "symbolic-demangle", @@ -3190,7 +3268,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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec" +dependencies = [ + "bytes", + "prost-derive 0.13.4", ] [[package]] @@ -3207,8 +3295,28 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost", - "prost-types", + "prost 0.12.6", + "prost-types 0.12.6", + "regex", + "syn", + "tempfile", +] + +[[package]] +name = "prost-build" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0f3e5beed80eb580c68e2c600937ac2c4eedabdfd5ef1e5b7ea4f3fba84497b" +dependencies = [ + "heck", + "itertools", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost 0.13.4", + "prost-types 0.13.4", "regex", "syn", "tempfile", @@ -3227,13 +3335,35 @@ dependencies = [ "syn", ] +[[package]] +name = "prost-derive" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3" +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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2f1e56baa61e93533aebc21af4d2134b70f66275e0fcdf3cbe43d77ff7e8fc" +dependencies = [ + "prost 0.13.4", ] [[package]] @@ -3595,9 +3725,9 @@ name = "spiffe-proto" version = "0.1.0" dependencies = [ "bytes", - "prost", - "prost-types", - "tonic", + "prost 0.13.4", + "prost-types 0.13.4", + "tonic 0.12.3", "tonic-build", ] @@ -3664,9 +3794,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" [[package]] name = "synstructure" @@ -3839,16 +3969,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.4.0" @@ -3925,23 +4045,47 @@ 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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.7", + "base64 0.22.0", "bytes", - "h2", - "http", - "http-body", + "h2 0.4.7", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", "hyper", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", - "prost", + "prost 0.13.4", + "socket2", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -3949,13 +4093,14 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" +checksum = "9557ce109ea773b399c9b9e5dca39294110b74f1f342cb347a80d1fce8c26a11" dependencies = [ "prettyplease", "proc-macro2", - "prost-build", + "prost-build 0.13.4", + "prost-types 0.13.4", "quote", "syn", ] @@ -3987,6 +4132,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" diff --git a/Cargo.toml b/Cargo.toml index 5f65dfabc5..80fd7cea81 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,18 +98,18 @@ lto = true [workspace.dependencies] bytes = { version = "1" } -h2 = { version = "0.3" } -http = { version = "0.2" } -http-body = { version = "0.4" } -hyper = { version = "0.14.32", default-features = false } -prost = { version = "0.12" } -prost-types = { version = "0.12" } +h2 = { version = "0.4" } +http = { version = "1" } +http-body = { version = "1" } +hyper = { version = "1", default-features = false } +prost = { version = "0.13" } +prost-types = { version = "0.13" } tokio-rustls = { version = "0.26", default-features = false, features = [ "ring", "logging", ] } -tonic = { version = "0.10", default-features = false } -tonic-build = { version = "0.10", default-features = false } +tonic = { version = "0.12", default-features = false } +tonic-build = { version = "0.12", default-features = false } [workspace.dependencies.linkerd2-proxy-api] version = "0.15.0" diff --git a/hyper-balance/Cargo.toml b/hyper-balance/Cargo.toml index 110d9707b1..e985266eb2 100644 --- a/hyper-balance/Cargo.toml +++ b/hyper-balance/Cargo.toml @@ -10,7 +10,7 @@ publish = false futures = { version = "0.3", default-features = false } http = { workspace = true } http-body = { workspace = true } -hyper = { workspace = true, features = ["deprecated"] } +hyper = { workspace = true } pin-project = "1" tower = { version = "0.4", default-features = false, features = ["load"] } tokio = { version = "1", features = ["macros"] } diff --git a/linkerd/app/admin/Cargo.toml b/linkerd/app/admin/Cargo.toml index a800578bd1..c5a7dfe33b 100644 --- a/linkerd/app/admin/Cargo.toml +++ b/linkerd/app/admin/Cargo.toml @@ -19,7 +19,7 @@ bytes = { workspace = true } deflate = { version = "1", optional = true, features = ["gzip"] } http = { workspace = true } http-body = { workspace = true } -hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } +hyper = { workspace = true, features = ["http1", "http2"] } futures = { version = "0.3", default-features = false } pprof = { version = "0.14", optional = true, features = ["prost-codec"] } serde = "1" diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml index 02db292ac8..9c91751b4c 100644 --- a/linkerd/app/core/Cargo.toml +++ b/linkerd/app/core/Cargo.toml @@ -17,7 +17,7 @@ bytes = { workspace = true } drain = { version = "0.1", features = ["retain"] } http = { workspace = true } http-body = { workspace = true } -hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } +hyper = { workspace = true, features = ["http1", "http2"] } futures = { version = "0.3", default-features = false } ipnet = "2.10" prometheus-client = "0.22" diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml index 46d849353c..9d0d2c84ca 100644 --- a/linkerd/app/inbound/Cargo.toml +++ b/linkerd/app/inbound/Cargo.toml @@ -45,7 +45,7 @@ path = "../../proxy/server-policy" features = ["proto"] [target.'cfg(fuzzing)'.dependencies] -hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } +hyper = { workspace = true, features = ["http1", "http2"] } linkerd-app-test = { path = "../test" } arbitrary = { version = "1", features = ["derive"] } libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] } @@ -54,7 +54,7 @@ linkerd-meshtls-rustls = { path = "../../meshtls/rustls", features = [ ] } [dev-dependencies] -hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } +hyper = { workspace = true, features = ["http1", "http2"] } linkerd-app-test = { path = "../test" } linkerd-http-metrics = { path = "../../http/metrics", features = ["test-util"] } linkerd-idle-cache = { path = "../../idle-cache", features = ["test-util"] } diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml index 6b615ede73..93bf3547b2 100644 --- a/linkerd/app/integration/Cargo.toml +++ b/linkerd/app/integration/Cargo.toml @@ -23,11 +23,8 @@ h2 = { workspace = true } http = { workspace = true } http-body = { workspace = true } hyper = { workspace = true, features = [ - "backports", - "deprecated", "http1", "http2", - "stream", "client", "server", ] } diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml index cfa7103d60..f7b36067a6 100644 --- a/linkerd/app/outbound/Cargo.toml +++ b/linkerd/app/outbound/Cargo.toml @@ -54,7 +54,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" } [dev-dependencies] futures-util = "0.3" http-body = { workspace = true } -hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] } +hyper = { workspace = true, features = ["http1", "http2"] } tokio = { version = "1", features = ["macros", "sync", "time"] } tokio-rustls = { workspace = true } tokio-test = "0.4" diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml index a58afcef7e..babc2a38e3 100644 --- a/linkerd/app/test/Cargo.toml +++ b/linkerd/app/test/Cargo.toml @@ -17,7 +17,7 @@ futures = { version = "0.3", default-features = false } h2 = { workspace = true } http = { workspace = true } http-body = { workspace = true } -hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } +hyper = { workspace = true, features = ["http1", "http2"] } linkerd-app-core = { path = "../core" } linkerd-http-route = { path = "../../http/route", optional = true } linkerd-identity = { path = "../../identity" } diff --git a/linkerd/http/executor/Cargo.toml b/linkerd/http/executor/Cargo.toml index ef75f18f6a..4922ed2937 100644 --- a/linkerd/http/executor/Cargo.toml +++ b/linkerd/http/executor/Cargo.toml @@ -10,6 +10,6 @@ HTTP runtime components for Linkerd. """ [dependencies] -hyper = { workspace = true, features = ["deprecated"] } +hyper = { workspace = true } tokio = { version = "1", features = ["rt"] } tracing = "0.1" diff --git a/linkerd/http/metrics/Cargo.toml b/linkerd/http/metrics/Cargo.toml index 02c1e87a88..6ccc7e19a3 100644 --- a/linkerd/http/metrics/Cargo.toml +++ b/linkerd/http/metrics/Cargo.toml @@ -14,7 +14,7 @@ bytes = { workspace = true } futures = { version = "0.3", default-features = false } http = { workspace = true } http-body = { workspace = true } -hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } +hyper = { workspace = true, features = ["http1", "http2"] } parking_lot = "0.12" pin-project = "1" tokio = { version = "1", features = ["time"] } diff --git a/linkerd/http/retry/Cargo.toml b/linkerd/http/retry/Cargo.toml index a59da0d9ab..74f2c84ccb 100644 --- a/linkerd/http/retry/Cargo.toml +++ b/linkerd/http/retry/Cargo.toml @@ -24,6 +24,6 @@ linkerd-metrics = { path = "../../metrics" } linkerd-stack = { path = "../../stack" } [dev-dependencies] -hyper = { workspace = true, features = ["deprecated"] } +hyper = { workspace = true } linkerd-tracing = { path = "../../tracing", features = ["ansi"] } tokio = { version = "1", features = ["macros", "rt"] } diff --git a/linkerd/http/upgrade/Cargo.toml b/linkerd/http/upgrade/Cargo.toml index 1787fddb6e..39df18cc9f 100644 --- a/linkerd/http/upgrade/Cargo.toml +++ b/linkerd/http/upgrade/Cargo.toml @@ -15,7 +15,7 @@ drain = "0.1" futures = { version = "0.3", default-features = false } http = { workspace = true } http-body = { workspace = true } -hyper = { workspace = true, default-features = false, features = ["deprecated", "client"] } +hyper = { workspace = true, default-features = false, features = ["client"] } pin-project = "1" tokio = { version = "1", default-features = false } tower = { version = "0.4", default-features = false } diff --git a/linkerd/metrics/Cargo.toml b/linkerd/metrics/Cargo.toml index e4d863fca4..08d33de55b 100644 --- a/linkerd/metrics/Cargo.toml +++ b/linkerd/metrics/Cargo.toml @@ -16,7 +16,7 @@ test_util = [] deflate = { version = "1", features = ["gzip"] } http = { workspace = true } http-body = { workspace = true } -hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } +hyper = { workspace = true, features = ["http1", "http2"] } linkerd-http-box = { path = "../http/box" } linkerd-stack = { path = "../stack", optional = true } linkerd-system = { path = "../system", optional = true } diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml index 5905e94dad..96600349f4 100644 --- a/linkerd/proxy/http/Cargo.toml +++ b/linkerd/proxy/http/Cargo.toml @@ -21,14 +21,10 @@ http = { workspace = true } http-body = { workspace = true } httparse = "1" hyper = { workspace = true, features = [ - "backports", "client", - "deprecated", "http1", "http2", "server", - "stream", - "runtime", ] } hyper-balance = { path = "../../../hyper-balance" } parking_lot = "0.12" diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml index b6d7d9d23f..d599d697a0 100644 --- a/linkerd/proxy/tap/Cargo.toml +++ b/linkerd/proxy/tap/Cargo.toml @@ -10,7 +10,7 @@ publish = false bytes = { workspace = true } http = { workspace = true } http-body = { workspace = true } -hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] } +hyper = { workspace = true, features = ["http1", "http2"] } futures = { version = "0.3", default-features = false } ipnet = "2.10" linkerd2-proxy-api = { workspace = true, features = ["tap"] }