diff --git a/Cargo.lock b/Cargo.lock index 039bd16..64af531 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -710,7 +710,7 @@ dependencies = [ "futures", "hostname", "http 0.2.12", - "hyper", + "hyper 0.14.28", "indexmap 2.2.6", "multer", "openapiv3", @@ -760,7 +760,7 @@ dependencies = [ "hex", "hmac", "http 0.2.12", - "hyper", + "hyper 0.14.28", "schemars", "serde", "serde_json", @@ -991,7 +991,7 @@ dependencies = [ "base64 0.13.1", "chrono", "http 0.2.12", - "hyper", + "hyper 0.14.28", "itertools 0.10.5", "mime", "serde", @@ -1012,7 +1012,7 @@ dependencies = [ "anyhow", "google-apis-common", "http 0.2.12", - "hyper", + "hyper 0.14.28", "hyper-rustls", "itertools 0.10.5", "mime", @@ -1032,7 +1032,7 @@ dependencies = [ "anyhow", "google-apis-common", "http 0.2.12", - "hyper", + "hyper 0.14.28", "hyper-rustls", "itertools 0.10.5", "mime", @@ -1052,7 +1052,7 @@ dependencies = [ "anyhow", "google-apis-common", "http 0.2.12", - "hyper", + "hyper 0.14.28", "hyper-rustls", "itertools 0.10.5", "mime", @@ -1190,6 +1190,29 @@ dependencies = [ "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.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.1", + "pin-project-lite", +] + [[package]] name = "httparse" version = "1.8.0" @@ -1214,7 +1237,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1226,6 +1249,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1234,7 +1276,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", + "hyper 0.14.28", "log", "rustls 0.21.12", "rustls-native-certs", @@ -1242,6 +1284,26 @@ dependencies = [ "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -1520,6 +1582,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "md-5" version = "0.10.6" @@ -1557,7 +1625,7 @@ dependencies = [ "lazy_static", "log", "meilisearch-index-setting-macro", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "strum", @@ -1803,7 +1871,7 @@ dependencies = [ "getrandom", "http 0.2.12", "rand", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "serde_path_to_error", @@ -1838,11 +1906,11 @@ dependencies = [ "parse_link_header", "pem 1.1.1", "percent-encoding 2.3.1", - "reqwest", + "reqwest 0.11.27", "reqwest-conditional-middleware", - "reqwest-middleware", + "reqwest-middleware 0.2.5", "reqwest-retry 0.2.3", - "reqwest-tracing", + "reqwest-tracing 0.4.8", "ring 0.16.20", "schemars", "serde", @@ -2080,6 +2148,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.63", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2188,7 +2276,7 @@ dependencies = [ "bytes", "futures-core", "percent-encoding 2.3.1", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "serde_urlencoded", @@ -2379,8 +2467,8 @@ dependencies = [ "futures-util", "h2", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls", "ipnet", "js-sys", @@ -2395,7 +2483,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-rustls 0.24.1", @@ -2407,7 +2495,42 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots", - "winreg", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.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 1.0.1", + "tokio", + "tower-service", + "url 2.5.0", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.52.0", ] [[package]] @@ -2417,8 +2540,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59e50a2e70970896c99d1b8f20ddc30a70b30d3ac6e619a03a8353b64a49b277" dependencies = [ "async-trait", - "reqwest", - "reqwest-middleware", + "reqwest 0.11.27", + "reqwest-middleware 0.2.5", "task-local-extensions", ] @@ -2431,12 +2554,27 @@ dependencies = [ "anyhow", "async-trait", "http 0.2.12", - "reqwest", + "reqwest 0.11.27", "serde", "task-local-extensions", "thiserror", ] +[[package]] +name = "reqwest-middleware" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562ceb5a604d3f7c885a792d42c199fd8af239d0a51b2fa6a78aafa092452b04" +dependencies = [ + "anyhow", + "async-trait", + "http 1.1.0", + "reqwest 0.12.5", + "serde", + "thiserror", + "tower-service", +] + [[package]] name = "reqwest-retry" version = "0.2.3" @@ -2449,10 +2587,10 @@ dependencies = [ "futures", "getrandom", "http 0.2.12", - "hyper", + "hyper 0.14.28", "parking_lot 0.11.2", - "reqwest", - "reqwest-middleware", + "reqwest 0.11.27", + "reqwest-middleware 0.2.5", "retry-policies 0.1.2", "task-local-extensions", "tokio", @@ -2472,10 +2610,10 @@ dependencies = [ "futures", "getrandom", "http 0.2.12", - "hyper", + "hyper 0.14.28", "parking_lot 0.11.2", - "reqwest", - "reqwest-middleware", + "reqwest 0.11.27", + "reqwest-middleware 0.2.5", "retry-policies 0.2.1", "task-local-extensions", "tokio", @@ -2492,13 +2630,29 @@ dependencies = [ "anyhow", "async-trait", "getrandom", - "matchit", - "reqwest", - "reqwest-middleware", + "matchit 0.7.3", + "reqwest 0.11.27", + "reqwest-middleware 0.2.5", "task-local-extensions", "tracing", ] +[[package]] +name = "reqwest-tracing" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdd9bfa64c72233d8dd99ab7883efcdefe9e16d46488ecb9228b71a2e2ceb45" +dependencies = [ + "anyhow", + "async-trait", + "getrandom", + "http 1.1.0", + "matchit 0.8.4", + "reqwest 0.12.5", + "reqwest-middleware 0.3.3", + "tracing", +] + [[package]] name = "retry-policies" version = "0.1.2" @@ -2539,7 +2693,7 @@ dependencies = [ "google-cloudkms1", "hex", "http 0.2.12", - "hyper", + "hyper 0.14.28", "hyper-rustls", "jsonwebtoken 9.3.0", "meilisearch-sdk", @@ -2550,10 +2704,10 @@ dependencies = [ "rand", "rand_core", "regex", - "reqwest", - "reqwest-middleware", + "reqwest 0.11.27", + "reqwest-middleware 0.2.5", "reqwest-retry 0.3.0", - "reqwest-tracing", + "reqwest-tracing 0.5.3", "rfd-data", "rfd-github", "rfd-model", @@ -2596,7 +2750,7 @@ dependencies = [ "oauth2", "owo-colors", "progenitor-client", - "reqwest", + "reqwest 0.11.27", "rfd-sdk", "schemars", "serde", @@ -2677,10 +2831,10 @@ dependencies = [ "octorust", "parse-rfd", "regex", - "reqwest", - "reqwest-middleware", + "reqwest 0.11.27", + "reqwest-middleware 0.2.5", "reqwest-retry 0.3.0", - "reqwest-tracing", + "reqwest-tracing 0.5.3", "rfd-data", "rfd-github", "rfd-model", @@ -2702,7 +2856,7 @@ version = "0.1.0" dependencies = [ "chrono", "progenitor-client", - "reqwest", + "reqwest 0.11.27", "schemars", "serde", "serde_json", @@ -3402,6 +3556,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 = "system-configuration" version = "0.5.1" @@ -3705,6 +3865,27 @@ 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", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + [[package]] name = "tower-service" version = "0.3.2" @@ -4360,6 +4541,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" @@ -4405,7 +4596,7 @@ dependencies = [ "base64 0.21.7", "futures", "http 0.2.12", - "hyper", + "hyper 0.14.28", "hyper-rustls", "itertools 0.12.1", "log", diff --git a/Cargo.toml b/Cargo.toml index 0448678..a282d70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ regex = "1.10.4" reqwest = { version = "0.11", default-features = false, features = ["json", "stream"] } reqwest-middleware = "0.2" reqwest-retry = "0.3.0" -reqwest-tracing = "0.4.6" +reqwest-tracing = "0.5.3" ring = "0.17.8" rsa = "0.9.6" rustfmt-wrapper = "0.2.1"