diff --git a/Cargo.lock b/Cargo.lock index 35829f86f474..5a8a8c63ba86 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -301,7 +301,7 @@ dependencies = [ "storage-interface", "structopt 0.3.21", "tokio 0.2.24", - "tokio-util", + "tokio-util 0.3.1", "toml", ] @@ -321,7 +321,7 @@ dependencies = [ "diem-workspace-hack", "diemdb", "futures 0.3.8", - "hyper", + "hyper 0.13.9", "once_cell", "reqwest", "serde", @@ -388,7 +388,7 @@ dependencies = [ "quote 1.0.8", "regex", "rustc-hash", - "shlex", + "shlex 0.1.1", "which 3.1.1", ] @@ -638,7 +638,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" dependencies = [ - "rustc_version", + "rustc_version 0.2.3", ] [[package]] @@ -838,7 +838,7 @@ dependencies = [ "regex", "reqwest", "rusoto_autoscaling", - "rusoto_core", + "rusoto_core 0.45.0", "rusoto_s3", "rusoto_sts", "seed-peer-generator", @@ -1204,6 +1204,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "crypto-mac" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +dependencies = [ + "generic-array 0.14.4", + "subtle", +] + [[package]] name = "csv" version = "1.1.5" @@ -1666,7 +1676,7 @@ dependencies = [ "futures 0.3.8", "generate-key", "hex", - "hyper", + "hyper 0.13.9", "move-core-types", "move-vm-types", "network", @@ -1860,7 +1870,7 @@ dependencies = [ "diem-metrics-core", "diem-workspace-hack", "futures 0.3.8", - "hyper", + "hyper 0.13.9", "once_cell", "prometheus", "rusty-fork", @@ -3253,11 +3263,30 @@ dependencies = [ "indexmap", "slab", "tokio 0.2.24", - "tokio-util", + "tokio-util 0.3.1", "tracing", "tracing-futures", ] +[[package]] +name = "h2" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +dependencies = [ + "bytes 1.0.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio 1.17.0", + "tokio-util 0.7.1", + "tracing", +] + [[package]] name = "half" version = "1.6.0" @@ -3363,6 +3392,16 @@ dependencies = [ "digest 0.9.0", ] +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac 0.11.1", + "digest 0.9.0", +] + [[package]] name = "hostname" version = "0.3.1" @@ -3395,6 +3434,17 @@ dependencies = [ "http", ] +[[package]] +name = "http-body" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +dependencies = [ + "bytes 1.0.0", + "http", + "pin-project-lite 0.2.0", +] + [[package]] name = "httparse" version = "1.3.4" @@ -3432,20 +3482,44 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.2.7", "http", - "http-body", + "http-body 0.3.1", "httparse", "httpdate", "itoa", "pin-project 1.0.3", - "socket2", + "socket2 0.3.19", "tokio 0.2.24", "tower-service", "tracing", "want", ] +[[package]] +name = "hyper" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1" +dependencies = [ + "bytes 1.0.0", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.13", + "http", + "http-body 0.4.4", + "httparse", + "httpdate", + "itoa", + "pin-project 1.0.3", + "socket2 0.4.4", + "tokio 1.17.0", + "tower-service", + "tracing", + "want", +] + [[package]] name = "hyper-tls" version = "0.4.3" @@ -3453,12 +3527,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 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.0", + "hyper 0.14.5", + "native-tls", + "tokio 1.17.0", + "tokio-native-tls", +] + [[package]] name = "idna" version = "0.2.0" @@ -3847,9 +3934,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.81" +version = "0.2.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" [[package]] name = "libfuzzer-sys" @@ -3936,6 +4023,17 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +[[package]] +name = "md-5" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" +dependencies = [ + "block-buffer 0.9.0", + "digest 0.9.0", + "opaque-debug 0.3.0", +] + [[package]] name = "md5" version = "0.7.0" @@ -4013,6 +4111,20 @@ dependencies = [ "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +dependencies = [ + "libc", + "log", + "miow 0.3.7", + "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + [[package]] name = "mio-named-pipes" version = "0.1.7" @@ -4020,8 +4132,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", - "mio", - "miow 0.3.5", + "mio 0.6.23", + "miow 0.3.7", "winapi 0.3.9", ] @@ -4033,7 +4145,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] @@ -4050,11 +4162,10 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "socket2", "winapi 0.3.9", ] @@ -4515,7 +4626,7 @@ dependencies = [ "thiserror", "tokio 0.2.24", "tokio-retry", - "tokio-util", + "tokio-util 0.3.1", ] [[package]] @@ -4602,6 +4713,15 @@ dependencies = [ "version_check", ] +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi 0.3.9", +] + [[package]] name = "num" version = "0.2.1" @@ -5616,9 +5736,9 @@ dependencies = [ "futures-core", "futures-util", "http", - "http-body", - "hyper", - "hyper-tls", + "http-body 0.3.1", + "hyper 0.13.9", + "hyper-tls 0.4.3", "ipnet", "js-sys", "lazy_static", @@ -5683,15 +5803,15 @@ dependencies = [ [[package]] name = "rusoto_autoscaling" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7af1c42491edaa3b2582c6f3a0221f5ef4ed7a02c71cf1f614bb12877e1d44dd" +checksum = "4062f76beb3fff35abae1b44bf9a9e895020d3124ddd53069152686d0f979758" dependencies = [ "async-trait", - "bytes 0.5.6", + "bytes 1.0.0", "futures 0.3.8", - "rusoto_core", - "serde_urlencoded 0.6.1", + "rusoto_core 0.48.0", + "serde_urlencoded 0.7.0", "xml-rs", ] @@ -5707,22 +5827,47 @@ dependencies = [ "crc32fast", "futures 0.3.8", "http", - "hyper", - "hyper-tls", + "hyper 0.13.9", + "hyper-tls 0.4.3", "lazy_static", "log", "md5", "percent-encoding", "pin-project 0.4.27", - "rusoto_credential", - "rusoto_signature", - "rustc_version", + "rusoto_credential 0.45.0", + "rusoto_signature 0.45.0", + "rustc_version 0.2.3", "serde", "serde_json", "tokio 0.2.24", "xml-rs", ] +[[package]] +name = "rusoto_core" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1db30db44ea73551326269adcf7a2169428a054f14faf9e1768f2163494f2fa2" +dependencies = [ + "async-trait", + "base64 0.13.0", + "bytes 1.0.0", + "crc32fast", + "futures 0.3.8", + "http", + "hyper 0.14.5", + "hyper-tls 0.5.0", + "lazy_static", + "log", + "rusoto_credential 0.48.0", + "rusoto_signature 0.48.0", + "rustc_version 0.4.0", + "serde", + "serde_json", + "tokio 1.17.0", + "xml-rs", +] + [[package]] name = "rusoto_credential" version = "0.45.0" @@ -5733,16 +5878,34 @@ dependencies = [ "chrono", "dirs 2.0.2", "futures 0.3.8", - "hyper", + "hyper 0.13.9", "pin-project 0.4.27", "regex", "serde", "serde_json", - "shlex", + "shlex 0.1.1", "tokio 0.2.24", "zeroize", ] +[[package]] +name = "rusoto_credential" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee0a6c13db5aad6047b6a44ef023dbbc21a056b6dab5be3b79ce4283d5c02d05" +dependencies = [ + "async-trait", + "chrono", + "dirs-next", + "futures 0.3.8", + "hyper 0.14.5", + "serde", + "serde_json", + "shlex 1.1.0", + "tokio 1.17.0", + "zeroize", +] + [[package]] name = "rusoto_s3" version = "0.45.0" @@ -5752,7 +5915,7 @@ dependencies = [ "async-trait", "bytes 0.5.6", "futures 0.3.8", - "rusoto_core", + "rusoto_core 0.45.0", "xml-rs", ] @@ -5768,19 +5931,45 @@ dependencies = [ "hex", "hmac 0.8.1", "http", - "hyper", + "hyper 0.13.9", "log", "md5", "percent-encoding", "pin-project 0.4.27", - "rusoto_credential", - "rustc_version", + "rusoto_credential 0.45.0", + "rustc_version 0.2.3", "serde", "sha2", "time 0.2.23", "tokio 0.2.24", ] +[[package]] +name = "rusoto_signature" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ae95491c8b4847931e291b151127eccd6ff8ca13f33603eb3d0035ecb05272" +dependencies = [ + "base64 0.13.0", + "bytes 1.0.0", + "chrono", + "digest 0.9.0", + "futures 0.3.8", + "hex", + "hmac 0.11.0", + "http", + "hyper 0.14.5", + "log", + "md-5", + "percent-encoding", + "pin-project-lite 0.2.0", + "rusoto_credential 0.48.0", + "rustc_version 0.4.0", + "serde", + "sha2", + "tokio 1.17.0", +] + [[package]] name = "rusoto_sts" version = "0.45.0" @@ -5791,7 +5980,7 @@ dependencies = [ "bytes 0.5.6", "chrono", "futures 0.3.8", - "rusoto_core", + "rusoto_core 0.45.0", "serde_urlencoded 0.6.1", "tempfile", "xml-rs", @@ -5840,6 +6029,15 @@ dependencies = [ "semver 0.9.0", ] +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.7", +] + [[package]] name = "rusty-fork" version = "0.3.0" @@ -6038,6 +6236,12 @@ dependencies = [ "serde", ] +[[package]] +name = "semver" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" + [[package]] name = "semver-parser" version = "0.7.0" @@ -6290,6 +6494,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +[[package]] +name = "shlex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" + [[package]] name = "short-hex-str" version = "0.1.0" @@ -6409,7 +6619,7 @@ dependencies = [ "network-builder", "rand 0.7.3", "tokio 0.2.24", - "tokio-util", + "tokio-util 0.3.1", ] [[package]] @@ -6423,6 +6633,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +dependencies = [ + "libc", + "winapi 0.3.9", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -6534,7 +6754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" dependencies = [ "discard", - "rustc_version", + "rustc_version 0.2.3", "stdweb-derive", "stdweb-internal-macros", "stdweb-internal-runtime", @@ -7025,25 +7245,34 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.23", "mio-named-pipes", "mio-uds", "num_cpus", "pin-project-lite 0.1.11", "signal-hook-registry", "slab", - "tokio-macros", + "tokio-macros 0.2.6", "winapi 0.3.9", ] [[package]] name = "tokio" -version = "1.0.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d258221f566b6c803c7b4714abadc080172b272090cdc5e244a6d4dd13c3a6bd" +checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" dependencies = [ - "autocfg 1.0.1", + "bytes 1.0.0", + "libc", + "memchr", + "mio 0.8.2", + "num_cpus", + "once_cell", "pin-project-lite 0.2.0", + "signal-hook-registry", + "socket2 0.4.4", + "tokio-macros 1.7.0", + "winapi 0.3.9", ] [[package]] @@ -7067,6 +7296,27 @@ dependencies = [ "syn 1.0.57", ] +[[package]] +name = "tokio-macros" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.8", + "syn 1.0.57", +] + +[[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.17.0", +] + [[package]] name = "tokio-retry" version = "0.2.0" @@ -7086,7 +7336,7 @@ checksum = "e4cdeb73537e63f98adcd73138af75e3f368ccaecffaa29d7eb61b9f5a440457" dependencies = [ "futures-core", "pin-project-lite 0.2.0", - "tokio 1.0.1", + "tokio 1.17.0", ] [[package]] @@ -7098,7 +7348,7 @@ dependencies = [ "async-stream", "bytes 1.0.0", "futures-core", - "tokio 1.0.1", + "tokio 1.17.0", "tokio-stream", ] @@ -7152,6 +7402,20 @@ dependencies = [ "tokio 0.2.24", ] +[[package]] +name = "tokio-util" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +dependencies = [ + "bytes 1.0.0", + "futures-core", + "futures-sink", + "pin-project-lite 0.2.0", + "tokio 1.17.0", + "tracing", +] + [[package]] name = "toml" version = "0.5.8" @@ -7169,21 +7433,33 @@ checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" [[package]] name = "tracing" -version = "0.1.22" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ "cfg-if 1.0.0", "log", "pin-project-lite 0.2.0", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.8", + "syn 1.0.57", +] + [[package]] name = "tracing-core" -version = "0.1.17" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", ] @@ -7550,7 +7826,7 @@ dependencies = [ "futures 0.3.8", "headers", "http", - "hyper", + "hyper 0.13.9", "log", "mime", "mime_guess", @@ -7580,6 +7856,12 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.69" diff --git a/testsuite/cluster-test/Cargo.toml b/testsuite/cluster-test/Cargo.toml index 335141cef0bd..59f0bfc4983e 100644 --- a/testsuite/cluster-test/Cargo.toml +++ b/testsuite/cluster-test/Cargo.toml @@ -24,7 +24,7 @@ termion = "1.5.5" serde = { version = "1.0.117", features = ["derive"] } structopt = "0.3.21" rusoto_core = { version = "0.45.0" } -rusoto_autoscaling = { version = "0.45.0" } +rusoto_autoscaling = { version = "0.48.0" } rusoto_sts = { version = "0.45.0" } rusoto_s3 = { version = "0.45.0" } chrono = "0.4.19"