diff --git a/Cargo.lock b/Cargo.lock index d1f77b4c..0005ac96 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -800,7 +800,7 @@ dependencies = [ "http-body 0.4.6", "http-body 1.0.1", "httparse", - "hyper", + "hyper 0.14.28", "hyper-rustls", "once_cell", "pin-project-lite", @@ -878,18 +878,19 @@ dependencies = [ [[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 0.2.11", - "http-body 0.4.6", - "hyper", + "http 1.0.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-util", "itoa", "matchit", "memchr", @@ -901,28 +902,33 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00" dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.11", - "http-body 0.4.6", + "http 1.0.0", + "http-body 1.0.1", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -935,7 +941,7 @@ dependencies = [ "futures-util", "http 0.2.11", "http-body 0.4.6", - "hyper", + "hyper 0.14.28", "tokio", "tower-service", ] @@ -2032,7 +2038,7 @@ dependencies = [ "ethers", "hex", "hex-literal", - "hyper", + "hyper 0.14.28", "rand", "retry", "serde", @@ -3179,6 +3185,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.0.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -3187,7 +3212,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.11", - "hyper", + "hyper 0.14.28", "log", "rustls", "rustls-native-certs", @@ -3202,12 +3227,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.28", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "tokio", +] + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -3720,7 +3760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" dependencies = [ "base64 0.21.7", - "hyper", + "hyper 0.14.28", "hyper-tls", "indexmap 2.2.2", "ipnet", @@ -3768,7 +3808,7 @@ dependencies = [ "chrono", "clap 4.4.18", "ethers", - "hyper", + "hyper 0.14.28", "oz-api", "serde", "serde_json", @@ -4266,7 +4306,7 @@ dependencies = [ "chrono", "cognitoauth", "ethers", - "hyper", + "hyper 0.14.28", "reqwest", "serde", "serde_json", @@ -5018,7 +5058,7 @@ dependencies = [ "h2", "http 0.2.11", "http-body 0.4.6", - "hyper", + "hyper 0.14.28", "hyper-rustls", "hyper-tls", "ipnet", @@ -5034,7 +5074,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -5753,7 +5793,7 @@ dependencies = [ "hex-literal", "humantime", "humantime-serde", - "hyper", + "hyper 0.14.28", "indoc", "lazy_static 1.4.0", "maplit", @@ -6233,6 +6273,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 = "sysctl" version = "0.5.5" diff --git a/Cargo.toml b/Cargo.toml index 17a22371..98daa80f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ default = [] anyhow = { version = "1.0.68" } async-stream = "0.3.3" async-trait = "0.1.64" -axum = "0.6.4" +axum = "0.7.5" axum-server = "0.4.4" bytes = "1.4.0" chrono = { version = "0.4.19", features = ["serde"] } diff --git a/crates/micro-oz/Cargo.toml b/crates/micro-oz/Cargo.toml index 2e0d7f79..b56c1c60 100644 --- a/crates/micro-oz/Cargo.toml +++ b/crates/micro-oz/Cargo.toml @@ -8,7 +8,7 @@ publish = false anyhow = "1.0.72" async-trait = "0.1.71" -axum = "0.6.19" +axum = "0.7.5" chrono = "0.4.26" clap = { version = "4.3.14", features = ["env", "derive"] } ethers = { version = "2.0.10", features = ["openssl"] }