diff --git a/Cargo.lock b/Cargo.lock index e90b72b3..73a9a666 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -231,6 +231,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" + [[package]] name = "base64ct" version = "1.6.0" @@ -695,7 +701,7 @@ dependencies = [ "futures", "hostname", "http 0.2.11", - "hyper", + "hyper 0.14.28", "indexmap 2.2.3", "multer", "openapiv3", @@ -745,7 +751,7 @@ dependencies = [ "hex", "hmac", "http 0.2.11", - "hyper", + "hyper 0.14.28", "schemars", "serde", "serde_json", @@ -976,7 +982,7 @@ dependencies = [ "base64 0.13.1", "chrono", "http 0.2.11", - "hyper", + "hyper 0.14.28", "itertools 0.10.5", "mime", "serde", @@ -997,7 +1003,7 @@ dependencies = [ "anyhow", "google-apis-common", "http 0.2.11", - "hyper", + "hyper 0.14.28", "hyper-rustls", "itertools 0.10.5", "mime", @@ -1017,7 +1023,7 @@ dependencies = [ "anyhow", "google-apis-common", "http 0.2.11", - "hyper", + "hyper 0.14.28", "hyper-rustls", "itertools 0.10.5", "mime", @@ -1037,7 +1043,7 @@ dependencies = [ "anyhow", "google-apis-common", "http 0.2.11", - "hyper", + "hyper 0.14.28", "hyper-rustls", "itertools 0.10.5", "mime", @@ -1181,6 +1187,29 @@ dependencies = [ "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.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "httparse" version = "1.8.0" @@ -1205,7 +1234,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.11", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1217,6 +1246,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1225,7 +1273,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.11", - "hyper", + "hyper 0.14.28", "log", "rustls 0.21.10", "rustls-native-certs", @@ -1233,6 +1281,26 @@ dependencies = [ "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -1532,7 +1600,7 @@ dependencies = [ "lazy_static", "log", "meilisearch-index-setting-macro", - "reqwest", + "reqwest 0.11.24", "serde", "serde_json", "strum", @@ -1780,7 +1848,7 @@ dependencies = [ "getrandom", "http 0.2.11", "rand", - "reqwest", + "reqwest 0.11.24", "serde", "serde_json", "serde_path_to_error", @@ -1815,9 +1883,9 @@ dependencies = [ "parse_link_header", "pem 1.1.1", "percent-encoding 2.3.1", - "reqwest", + "reqwest 0.11.24", "reqwest-conditional-middleware", - "reqwest-middleware", + "reqwest-middleware 0.2.4", "reqwest-retry 0.2.3", "reqwest-tracing", "ring 0.16.20", @@ -2057,6 +2125,26 @@ dependencies = [ "sha2", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "pin-project-lite" version = "0.2.13" @@ -2165,7 +2253,7 @@ dependencies = [ "bytes", "futures-core", "percent-encoding 2.3.1", - "reqwest", + "reqwest 0.11.24", "serde", "serde_json", "serde_urlencoded", @@ -2356,8 +2444,8 @@ dependencies = [ "futures-util", "h2", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls", "ipnet", "js-sys", @@ -2384,7 +2472,42 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots", - "winreg", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.0", + "bytes", + "futures-core", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding 2.3.1", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower-service", + "url 2.5.0", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.52.0", ] [[package]] @@ -2394,8 +2517,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59e50a2e70970896c99d1b8f20ddc30a70b30d3ac6e619a03a8353b64a49b277" dependencies = [ "async-trait", - "reqwest", - "reqwest-middleware", + "reqwest 0.11.24", + "reqwest-middleware 0.2.4", "task-local-extensions", ] @@ -2408,12 +2531,27 @@ dependencies = [ "anyhow", "async-trait", "http 0.2.11", - "reqwest", + "reqwest 0.11.24", "serde", "task-local-extensions", "thiserror", ] +[[package]] +name = "reqwest-middleware" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209efb52486ad88136190094ee214759ef7507068b27992256ed6610eb71a01" +dependencies = [ + "anyhow", + "async-trait", + "http 1.0.0", + "reqwest 0.12.4", + "serde", + "thiserror", + "tower-service", +] + [[package]] name = "reqwest-retry" version = "0.2.3" @@ -2426,10 +2564,10 @@ dependencies = [ "futures", "getrandom", "http 0.2.11", - "hyper", + "hyper 0.14.28", "parking_lot 0.11.2", - "reqwest", - "reqwest-middleware", + "reqwest 0.11.24", + "reqwest-middleware 0.2.4", "retry-policies 0.1.2", "task-local-extensions", "tokio", @@ -2439,22 +2577,21 @@ dependencies = [ [[package]] name = "reqwest-retry" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f" +checksum = "40f342894422862af74c50e1e9601cf0931accc9c6981e5eb413c46603b616b5" dependencies = [ "anyhow", "async-trait", "chrono", "futures", "getrandom", - "http 0.2.11", - "hyper", + "http 1.0.0", + "hyper 1.3.1", "parking_lot 0.11.2", - "reqwest", - "reqwest-middleware", - "retry-policies 0.2.1", - "task-local-extensions", + "reqwest 0.12.4", + "reqwest-middleware 0.3.0", + "retry-policies 0.3.0", "tokio", "tracing", "wasm-timer", @@ -2470,8 +2607,8 @@ dependencies = [ "async-trait", "getrandom", "matchit", - "reqwest", - "reqwest-middleware", + "reqwest 0.11.24", + "reqwest-middleware 0.2.4", "task-local-extensions", "tracing", ] @@ -2489,9 +2626,9 @@ dependencies = [ [[package]] name = "retry-policies" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" +checksum = "493b4243e32d6eedd29f9a398896e35c6943a123b55eec97dcaee98310d25810" dependencies = [ "anyhow", "chrono", @@ -2516,7 +2653,7 @@ dependencies = [ "google-cloudkms1", "hex", "http 0.2.11", - "hyper", + "hyper 0.14.28", "hyper-rustls", "jsonwebtoken 9.2.0", "meilisearch-sdk", @@ -2527,9 +2664,9 @@ dependencies = [ "rand", "rand_core", "regex", - "reqwest", - "reqwest-middleware", - "reqwest-retry 0.3.0", + "reqwest 0.11.24", + "reqwest-middleware 0.2.4", + "reqwest-retry 0.5.0", "reqwest-tracing", "rfd-data", "rfd-github", @@ -2572,7 +2709,7 @@ dependencies = [ "oauth2", "owo-colors", "progenitor-client", - "reqwest", + "reqwest 0.11.24", "rfd-sdk", "schemars", "serde", @@ -2650,9 +2787,9 @@ dependencies = [ "octorust", "parse-rfd", "regex", - "reqwest", - "reqwest-middleware", - "reqwest-retry 0.3.0", + "reqwest 0.11.24", + "reqwest-middleware 0.2.4", + "reqwest-retry 0.5.0", "reqwest-tracing", "rfd-data", "rfd-github", @@ -2694,7 +2831,7 @@ version = "0.1.0" dependencies = [ "chrono", "progenitor-client", - "reqwest", + "reqwest 0.11.24", "schemars", "serde", "serde_json", @@ -3694,6 +3831,28 @@ dependencies = [ "walkdir", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -3718,6 +3877,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4340,6 +4500,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "xtask" version = "0.0.0" @@ -4385,7 +4555,7 @@ dependencies = [ "base64 0.21.7", "futures", "http 0.2.11", - "hyper", + "hyper 0.14.28", "hyper-rustls", "itertools 0.12.1", "log", diff --git a/Cargo.toml b/Cargo.toml index 08f95c36..fdaa1f22 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ rand_core = "0.6" regex = "1.10.4" reqwest = { version = "0.11", default-features = false, features = ["json", "stream"] } reqwest-middleware = "0.2" -reqwest-retry = "0.3.0" +reqwest-retry = "0.5.0" reqwest-tracing = "0.4.6" ring = "0.17.8" rsa = "0.9.6"