From 6acaccc121434c92ae3dd4275fd35d505ce2cafa Mon Sep 17 00:00:00 2001 From: kamilkisiela <8167190+kamilkisiela@users.noreply.github.com> Date: Thu, 4 Dec 2025 14:04:50 +0000 Subject: [PATCH] Update apollo-router to version 2.9.0 --- configs/cargo/Cargo.lock | 162 ++++++++++++--------------------------- 1 file changed, 51 insertions(+), 111 deletions(-) diff --git a/configs/cargo/Cargo.lock b/configs/cargo/Cargo.lock index 24fe2fb4e9..bb4c39215b 100644 --- a/configs/cargo/Cargo.lock +++ b/configs/cargo/Cargo.lock @@ -12,7 +12,7 @@ dependencies = [ "fallible-iterator", "gimli", "memmap2", - "object 0.37.3", + "object", "rustc-demangle", "smallvec", "typed-arena", @@ -92,9 +92,9 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "apollo-compiler" -version = "1.30.0" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e4c0116cde9e3e5679806cf91c464d9efb7f1e231abffc505e0f6d4b911260" +checksum = "a66f8eefe0ed21932dcc31eeca614cc8337bdc9ec7d4b2fb200b2a1539ba5c92" dependencies = [ "ahash", "apollo-parser", @@ -122,9 +122,9 @@ dependencies = [ [[package]] name = "apollo-federation" -version = "2.8.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a3f1d7d9123e5d30952e3e6cc7a39f3b14b07e1d941cf4cff66ebf1ecaa490" +checksum = "6b26138e298ecff0fb0b972175a93174d7d87d74cdc646af6a7932dc435d86c8" dependencies = [ "apollo-compiler", "derive_more", @@ -171,9 +171,9 @@ dependencies = [ [[package]] name = "apollo-router" -version = "2.8.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8caeab0404cb06fc1d5066ae24e21f50116d7583d5886e51f6de65b99064de" +checksum = "4d5b4da5efb2fb56a7076ded5912eb829005d1c3c2fec35359855f689db3fc57" dependencies = [ "addr2line", "ahash", @@ -192,7 +192,6 @@ dependencies = [ "aws-smithy-runtime-api", "aws-types", "axum 0.8.6", - "axum-extra", "base64 0.22.1", "blake3", "bloomfilter", @@ -200,7 +199,6 @@ dependencies = [ "buildstructor", "bytes", "bytesize", - "chrono", "ci_info", "clap", "console", @@ -235,7 +233,7 @@ dependencies = [ "itoa", "jsonpath-rust", "jsonpath_lib", - "jsonschema 0.33.0", + "jsonschema 0.36.0", "jsonwebtoken", "libc", "linkme", @@ -250,7 +248,6 @@ dependencies = [ "notify", "nu-ansi-term", "num-traits", - "object 0.36.7", "oci-client", "once_cell", "opentelemetry", @@ -996,29 +993,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum-extra" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9963ff19f40c6102c76756ef0a46004c0d58957d87259fc9208ff8441c12ab96" -dependencies = [ - "axum 0.8.6", - "axum-core 0.5.5", - "bytes", - "futures-util", - "headers", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "serde_core", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "base64" version = "0.13.1" @@ -1148,9 +1122,9 @@ dependencies = [ [[package]] name = "borrow-or-share" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eeab4423108c5d7c744f4d234de88d18d636100093ae04caf4825134b9c3a32" +checksum = "dc0b364ead1874514c8c2855ab558056ebfeb775653e7ae45ff72f28f8f3166c" [[package]] name = "brotli" @@ -2086,6 +2060,17 @@ dependencies = [ "serde", ] +[[package]] +name = "fluent-uri" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc74ac4d8359ae70623506d512209619e5cf8f347124910440dbc221714b328e" +dependencies = [ + "borrow-or-share", + "ref-cast", + "serde", +] + [[package]] name = "fnv" version = "1.0.7" @@ -2149,6 +2134,7 @@ dependencies = [ "rustls", "rustls-native-certs", "semver", + "serde_json", "socket2 0.5.10", "tokio", "tokio-rustls", @@ -2514,30 +2500,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "headers" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3314d5adb5d94bcdf56771f2e50dbbc80bb4bdf88967526706205ac9eff24eb" -dependencies = [ - "base64 0.22.1", - "bytes", - "headers-core", - "http 1.3.1", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" -dependencies = [ - "http 1.3.1", -] - [[package]] name = "heck" version = "0.4.1" @@ -2613,7 +2575,7 @@ dependencies = [ [[package]] name = "hive-apollo-router-plugin" -version = "2.3.3" +version = "2.3.4" dependencies = [ "anyhow", "apollo-router", @@ -2647,7 +2609,7 @@ dependencies = [ [[package]] name = "hive-console-sdk" -version = "0.2.0" +version = "0.2.1" dependencies = [ "anyhow", "async-trait", @@ -3261,9 +3223,9 @@ dependencies = [ [[package]] name = "jsonschema" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d46662859bc5f60a145b75f4632fbadc84e829e45df6c5de74cfc8e05acb96b5" +checksum = "cd94c1d7bfa9d30b5d4268df9fe8c5ed13fa600a6bd0dae02b04db86d575fc8a" dependencies = [ "ahash", "base64 0.22.1", @@ -3271,17 +3233,18 @@ dependencies = [ "email_address", "fancy-regex 0.16.2", "fraction", + "getrandom 0.3.4", "idna", "itoa", "num-cmp", "num-traits", - "once_cell", "percent-encoding", - "referencing 0.33.0", + "referencing 0.36.0", "regex", "regex-syntax", "serde", "serde_json", + "unicode-general-category", "uuid-simd", ] @@ -3511,9 +3474,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "mediatype" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f490ea2ae935dd8ac89c472d4df28c7f6b87cc20767e1b21fd5ed6a16e7f61e4" +checksum = "120fa187be19d9962f0926633453784691731018a2bf936ddb4e29101b79c4a7" [[package]] name = "memchr" @@ -3887,17 +3850,6 @@ dependencies = [ "objc2-core-foundation", ] -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "flate2", - "memchr", - "ruzstd 0.7.3", -] - [[package]] name = "object" version = "0.37.3" @@ -3906,7 +3858,7 @@ checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "flate2", "memchr", - "ruzstd 0.8.1", + "ruzstd", ] [[package]] @@ -4486,7 +4438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" dependencies = [ "heck 0.5.0", - "itertools 0.14.0", + "itertools 0.11.0", "log", "multimap 0.10.1", "once_cell", @@ -4506,7 +4458,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.108", @@ -4751,7 +4703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40a64b3a635fad9000648b4d8a59c8710c523ab61a23d392a7d91d47683f5adc" dependencies = [ "ahash", - "fluent-uri", + "fluent-uri 0.3.2", "once_cell", "parking_lot 0.12.5", "percent-encoding", @@ -4760,13 +4712,14 @@ dependencies = [ [[package]] name = "referencing" -version = "0.33.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9c261f7ce75418b3beadfb3f0eb1299fe8eb9640deba45ffa2cb783098697d" +checksum = "ba1cb02ef237bd757aba02cd648a4ffa628cd8e5852e2b9bb89aabf93dc5dcc7" dependencies = [ "ahash", - "fluent-uri", - "once_cell", + "fluent-uri 0.4.1", + "getrandom 0.3.4", + "hashbrown 0.16.0", "parking_lot 0.12.5", "percent-encoding", "serde_json", @@ -4935,9 +4888,9 @@ dependencies = [ [[package]] name = "rhai" -version = "1.21.0" +version = "1.23.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce4d759a4729a655ddfdbb3ff6e77fb9eadd902dae12319455557796e435d2a6" +checksum = "f4e35aaaa439a5bda2f8d15251bc375e4edfac75f9865734644782c9701b5709" dependencies = [ "ahash", "bitflags 2.10.0", @@ -4954,9 +4907,9 @@ dependencies = [ [[package]] name = "rhai_codegen" -version = "2.2.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b" +checksum = "d4322a2a4e8cf30771dd9f27f7f37ca9ac8fe812dddd811096a98483080dabe6" dependencies = [ "proc-macro2", "quote", @@ -5138,22 +5091,13 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -[[package]] -name = "ruzstd" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f" -dependencies = [ - "twox-hash 1.6.3", -] - [[package]] name = "ruzstd" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c" dependencies = [ - "twox-hash 2.1.2", + "twox-hash", ] [[package]] @@ -6260,16 +6204,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] - [[package]] name = "twox-hash" version = "2.1.2" @@ -6353,6 +6287,12 @@ version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" +[[package]] +name = "unicode-general-category" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f" + [[package]] name = "unicode-ident" version = "1.0.20"