diff --git a/Cargo.lock b/Cargo.lock index 90cc0ef..126b58d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -291,6 +291,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + [[package]] name = "cc" version = "1.0.65" @@ -348,16 +354,6 @@ dependencies = [ "bitflags 1.2.1", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" -dependencies = [ - "cfg-if 0.1.10", - "wasm-bindgen", -] - [[package]] name = "const-random" version = "0.1.12" @@ -851,12 +847,31 @@ dependencies = [ "http 0.2.1", "indexmap", "slab", - "tokio", - "tokio-util", + "tokio 0.2.24", + "tokio-util 0.3.1", "tracing", "tracing-futures", ] +[[package]] +name = "h2" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78" +dependencies = [ + "bytes 1.0.1", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.1", + "indexmap", + "slab", + "tokio 1.3.0", + "tokio-util 0.6.4", + "tracing", +] + [[package]] name = "handlebars" version = "3.5.3" @@ -963,6 +978,16 @@ dependencies = [ "http 0.2.1", ] +[[package]] +name = "http-body" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" +dependencies = [ + "bytes 1.0.1", + "http 0.2.1", +] + [[package]] name = "httparse" version = "1.3.4" @@ -991,15 +1016,39 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.2.7", "http 0.2.1", - "http-body", + "http-body 0.3.1", "httparse", "httpdate", "itoa", "pin-project 1.0.2", "socket2", - "tokio", + "tokio 0.2.24", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" +dependencies = [ + "bytes 1.0.1", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.1", + "http 0.2.1", + "http-body 0.4.0", + "httparse", + "httpdate", + "itoa", + "pin-project 1.0.2", + "socket2", + "tokio 1.3.0", "tower-service", "tracing", "want", @@ -1012,12 +1061,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper", + "hyper 0.13.9", "native-tls", - "tokio", + "tokio 0.2.24", "tokio-tls", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.0.1", + "hyper 0.14.4", + "native-tls", + "tokio 1.3.0", + "tokio-native-tls", +] + [[package]] name = "hyperx" version = "0.13.2" @@ -1211,14 +1273,14 @@ dependencies = [ "log 0.4.14", "openssl", "pem", - "reqwest", + "reqwest 0.10.10", "serde", "serde_json", "serde_yaml", "static_assertions", "thiserror", "time 0.2.23", - "tokio", + "tokio 0.2.24", "url 2.2.1", ] @@ -1250,7 +1312,7 @@ dependencies = [ "serde", "smallvec", "snafu", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -1267,7 +1329,7 @@ dependencies = [ "futures", "hostname", "http 0.2.1", - "hyper", + "hyper 0.13.9", "iovec", "json-patch", "k8s-openapi", @@ -1278,20 +1340,20 @@ dependencies = [ "lazy_static", "lazycell", "log 0.4.14", - "mio", - "miow", + "mio 0.6.22", + "miow 0.2.1", "notify", "oci-distribution", "prost", "prost-types", "rcgen", - "reqwest", + "reqwest 0.10.10", "serde", "serde_json", "serde_yaml", "structopt", "thiserror", - "tokio", + "tokio 0.2.24", "tonic", "tonic-build", "tower", @@ -1437,12 +1499,25 @@ dependencies = [ "kernel32-sys", "libc", "log 0.4.14", - "miow", + "miow 0.2.1", "net2", "slab", "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a" +dependencies = [ + "libc", + "log 0.4.14", + "miow 0.3.6", + "ntapi", + "winapi 0.3.9", +] + [[package]] name = "mio-extras" version = "2.0.6" @@ -1451,7 +1526,7 @@ checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" dependencies = [ "lazycell", "log 0.4.14", - "mio", + "mio 0.6.22", "slab", ] @@ -1463,7 +1538,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.22", ] [[package]] @@ -1478,6 +1553,16 @@ dependencies = [ "ws2_32-sys", ] +[[package]] +name = "miow" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +dependencies = [ + "socket2", + "winapi 0.3.9", +] + [[package]] name = "multimap" version = "0.8.2" @@ -1504,9 +1589,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f" +checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" dependencies = [ "lazy_static", "libc", @@ -1557,12 +1642,21 @@ dependencies = [ "fsevent-sys", "inotify", "libc", - "mio", + "mio 0.6.22", "mio-extras", "walkdir", "winapi 0.3.9", ] +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num-integer" version = "0.1.44" @@ -1603,10 +1697,10 @@ dependencies = [ "lazy_static", "log 0.4.14", "regex", - "reqwest", + "reqwest 0.10.10", "serde", "serde_json", - "tokio", + "tokio 0.2.24", "www-authenticate", ] @@ -2333,9 +2427,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.9" +version = "0.10.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb15d6255c792356a0f578d8a645c677904dc02e862bebe2ecc18e0c01b9a0ce" +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" dependencies = [ "async-compression", "base64 0.13.0", @@ -2344,9 +2438,9 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.1", - "http-body", - "hyper", - "hyper-tls", + "http-body 0.3.1", + "hyper 0.13.9", + "hyper-tls 0.4.3", "ipnet", "js-sys", "lazy_static", @@ -2359,12 +2453,46 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.0", - "tokio", + "tokio 0.2.24", "tokio-tls", "url 2.2.1", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-bindgen-test", + "web-sys", + "winreg", +] + +[[package]] +name = "reqwest" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf12057f289428dbf5c591c74bf10392e4a8003f993405a902f20117019022d4" +dependencies = [ + "base64 0.13.0", + "bytes 1.0.1", + "encoding_rs", + "futures-core", + "futures-util", + "http 0.2.1", + "http-body 0.4.0", + "hyper 0.14.4", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", + "lazy_static", + "log 0.4.14", + "mime", + "native-tls", + "percent-encoding 2.1.0", + "pin-project-lite 0.2.0", + "serde", + "serde_json", + "serde_urlencoded 0.7.0", + "tokio 1.3.0", + "tokio-native-tls", + "url 2.2.1", + "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", "winreg", ] @@ -2730,7 +2858,7 @@ dependencies = [ "phf", "pnet", "regex", - "reqwest", + "reqwest 0.11.2", "rstest", "serde", "serde_derive", @@ -2742,7 +2870,7 @@ dependencies = [ "strum_macros", "tar", "thiserror", - "tokio", + "tokio 0.2.24", "url 2.2.1", ] @@ -3121,7 +3249,7 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.22", "mio-uds", "pin-project-lite 0.1.11", "signal-hook-registry", @@ -3130,6 +3258,20 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "tokio" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d56477f6ed99e10225f38f9f75f872f29b8b8bd8c0b946f63345bb144e9eeda" +dependencies = [ + "autocfg 1.0.1", + "bytes 1.0.1", + "libc", + "memchr", + "mio 0.7.9", + "pin-project-lite 0.2.0", +] + [[package]] name = "tokio-macros" version = "0.2.6" @@ -3141,6 +3283,16 @@ dependencies = [ "syn 1.0.60", ] +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio 1.3.0", +] + [[package]] name = "tokio-rustls" version = "0.14.1" @@ -3149,7 +3301,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls", - "tokio", + "tokio 0.2.24", "webpki", ] @@ -3160,7 +3312,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio", + "tokio 0.2.24", ] [[package]] @@ -3172,7 +3324,7 @@ dependencies = [ "futures-util", "log 0.4.14", "pin-project 0.4.27", - "tokio", + "tokio 0.2.24", "tungstenite", ] @@ -3187,7 +3339,21 @@ dependencies = [ "futures-sink", "log 0.4.14", "pin-project-lite 0.1.11", - "tokio", + "tokio 0.2.24", +] + +[[package]] +name = "tokio-util" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec31e5cc6b46e653cf57762f36f71d5e6386391d88a72fd6db4508f8f676fb29" +dependencies = [ + "bytes 1.0.1", + "futures-core", + "futures-sink", + "log 0.4.14", + "pin-project-lite 0.2.0", + "tokio 1.3.0", ] [[package]] @@ -3203,14 +3369,14 @@ dependencies = [ "futures-core", "futures-util", "http 0.2.1", - "http-body", - "hyper", + "http-body 0.3.1", + "hyper 0.13.9", "percent-encoding 2.1.0", "pin-project 0.4.27", "prost", "prost-derive", - "tokio", - "tokio-util", + "tokio 0.2.24", + "tokio-util 0.3.1", "tower", "tower-balance", "tower-load", @@ -3262,7 +3428,7 @@ dependencies = [ "pin-project 0.4.27", "rand 0.7.3", "slab", - "tokio", + "tokio 0.2.24", "tower-discover", "tower-layer", "tower-load", @@ -3280,7 +3446,7 @@ checksum = "c4887dc2a65d464c8b9b66e0e4d51c2fd6cf5b3373afc72805b0a60bce00446a" dependencies = [ "futures-core", "pin-project 0.4.27", - "tokio", + "tokio 0.2.24", "tower-layer", "tower-service", "tracing", @@ -3311,7 +3477,7 @@ checksum = "92c3040c5dbed68abffaa0d4517ac1a454cd741044f33ab0eefab6b8d1361404" dependencies = [ "futures-core", "pin-project 0.4.27", - "tokio", + "tokio 0.2.24", "tower-layer", "tower-load", "tower-service", @@ -3326,7 +3492,7 @@ dependencies = [ "futures-core", "log 0.4.14", "pin-project 0.4.27", - "tokio", + "tokio 0.2.24", "tower-discover", "tower-service", ] @@ -3349,7 +3515,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce50370d644a0364bf4877ffd4f76404156a248d104e2cc234cd391ea5cdc965" dependencies = [ - "tokio", + "tokio 0.2.24", "tower-service", ] @@ -3363,7 +3529,7 @@ dependencies = [ "futures-util", "indexmap", "log 0.4.14", - "tokio", + "tokio 0.2.24", "tower-service", ] @@ -3375,7 +3541,7 @@ checksum = "e6727956aaa2f8957d4d9232b308fe8e4e65d99db30f42b225646e86c9b6a952" dependencies = [ "futures-core", "pin-project 0.4.27", - "tokio", + "tokio 0.2.24", "tower-layer", "tower-service", ] @@ -3393,7 +3559,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "127b8924b357be938823eaaec0608c482d40add25609481027b96198b2e4b31e" dependencies = [ "pin-project 0.4.27", - "tokio", + "tokio 0.2.24", "tower-layer", "tower-service", ] @@ -3685,7 +3851,7 @@ dependencies = [ "futures", "headers", "http 0.2.1", - "hyper", + "hyper 0.13.9", "log 0.4.14", "mime", "mime_guess", @@ -3695,7 +3861,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.6.1", - "tokio", + "tokio 0.2.24", "tokio-rustls", "tokio-tungstenite", "tower-service", @@ -3784,30 +3950,6 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307" -[[package]] -name = "wasm-bindgen-test" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d1cdc8b98a557f24733d50a1199c4b0635e465eecba9c45b214544da197f64" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fb9c67be7439ee8ab1b7db502a49c05e51e2835b66796c705134d9b8e1a585" -dependencies = [ - "proc-macro2 1.0.24", - "quote 1.0.7", -] - [[package]] name = "web-sys" version = "0.3.45" diff --git a/Cargo.toml b/Cargo.toml index 9f1136b..884f426 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ log = "0.4" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" -reqwest = "0.10" +reqwest = { version = "0.11", features = ["json"] } flate2 = "1.0" tar = "0.4" handlebars = "3.5"