diff --git a/Cargo.lock b/Cargo.lock index 50d3825fe..289e02beb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -159,17 +159,17 @@ dependencies = [ "aws-http", "aws-sdk-sso", "aws-sdk-sts", - "aws-smithy-async", + "aws-smithy-async 0.56.1", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.56.1", "aws-smithy-http-tower", "aws-smithy-json", - "aws-smithy-types", + "aws-smithy-types 0.56.1", "aws-types", "bytes", "fastrand", "hex", - "http", + "http 0.2.11", "hyper", "ring", "time", @@ -185,8 +185,8 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70a66ac8ef5fa9cf01c2d999f39d16812e90ec1467bd382cbbb74ba23ea86201" dependencies = [ - "aws-smithy-async", - "aws-smithy-types", + "aws-smithy-async 0.56.1", + "aws-smithy-types 0.56.1", "fastrand", "tokio", "tracing", @@ -200,11 +200,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e626370f9ba806ae4c439e49675fd871f5767b093075cdf4fef16cac42ba900" dependencies = [ "aws-credential-types", - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-http 0.56.1", + "aws-smithy-types 0.56.1", "aws-types", "bytes", - "http", + "http 0.2.11", "http-body", "lazy_static", "percent-encoding", @@ -221,14 +221,14 @@ dependencies = [ "aws-credential-types", "aws-http", "aws-sigv4", - "aws-smithy-async", + "aws-smithy-async 0.56.1", "aws-smithy-eventstream", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", + "aws-smithy-http 0.56.1", + "aws-smithy-runtime-api 0.56.1", + "aws-smithy-types 0.56.1", "aws-types", "fastrand", - "http", + "http 0.2.11", "percent-encoding", "tracing", "uuid", @@ -244,19 +244,19 @@ dependencies = [ "aws-http", "aws-runtime", "aws-sigv4", - "aws-smithy-async", + "aws-smithy-async 0.56.1", "aws-smithy-checksums", "aws-smithy-client", "aws-smithy-eventstream", - "aws-smithy-http", + "aws-smithy-http 0.56.1", "aws-smithy-json", "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", + "aws-smithy-runtime-api 0.56.1", + "aws-smithy-types 0.56.1", "aws-smithy-xml", "aws-types", "bytes", - "http", + "http 0.2.11", "http-body", "once_cell", "percent-encoding", @@ -275,16 +275,16 @@ dependencies = [ "aws-credential-types", "aws-http", "aws-runtime", - "aws-smithy-async", + "aws-smithy-async 0.56.1", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.56.1", "aws-smithy-json", "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", + "aws-smithy-runtime-api 0.56.1", + "aws-smithy-types 0.56.1", "aws-types", "bytes", - "http", + "http 0.2.11", "regex", "tokio-stream", "tracing", @@ -299,17 +299,17 @@ dependencies = [ "aws-credential-types", "aws-http", "aws-runtime", - "aws-smithy-async", + "aws-smithy-async 0.56.1", "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-http 0.56.1", "aws-smithy-json", "aws-smithy-query", "aws-smithy-runtime", - "aws-smithy-runtime-api", - "aws-smithy-types", + "aws-smithy-runtime-api 0.56.1", + "aws-smithy-types 0.56.1", "aws-smithy-xml", "aws-types", - "http", + "http 0.2.11", "regex", "tracing", ] @@ -321,12 +321,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7b28f4910bb956b7ab320b62e98096402354eca976c587d1eeccd523d9bac03" dependencies = [ "aws-smithy-eventstream", - "aws-smithy-http", + "aws-smithy-http 0.56.1", "bytes", "form_urlencoded", "hex", "hmac", - "http", + "http 0.2.11", "once_cell", "percent-encoding", "regex", @@ -347,19 +347,30 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "aws-smithy-async" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ec441341e019c441aa78472ed6d206cfe198026c495277a95ac5bebda520742" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + [[package]] name = "aws-smithy-checksums" version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afb15946af1b8d3beeff53ad991d9bff68ac22426b6d40372b958a75fa61eaed" dependencies = [ - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-http 0.56.1", + "aws-smithy-types 0.56.1", "bytes", "crc32c", "crc32fast", "hex", - "http", + "http 0.2.11", "http-body", "md-5", "pin-project-lite", @@ -374,13 +385,13 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c27b2756264c82f830a91cb4d2d485b2d19ad5bea476d9a966e03d27f27ba59a" dependencies = [ - "aws-smithy-async", - "aws-smithy-http", + "aws-smithy-async 0.56.1", + "aws-smithy-http 0.56.1", "aws-smithy-http-tower", - "aws-smithy-types", + "aws-smithy-types 0.56.1", "bytes", "fastrand", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -398,7 +409,7 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "850233feab37b591b7377fd52063aa37af615687f5896807abe7f49bd4e1d25b" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.56.1", "bytes", "crc32fast", ] @@ -410,11 +421,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54cdcf365d8eee60686885f750a34c190e513677db58bbc466c44c588abf4199" dependencies = [ "aws-smithy-eventstream", - "aws-smithy-types", + "aws-smithy-types 0.56.1", "bytes", "bytes-utils", "futures-core", - "http", + "http 0.2.11", "http-body", "hyper", "once_cell", @@ -426,16 +437,36 @@ dependencies = [ "tracing", ] +[[package]] +name = "aws-smithy-http" +version = "0.60.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85d6a0619f7b67183067fa3b558f94f90753da2df8c04aeb7336d673f804b0b8" +dependencies = [ + "aws-smithy-runtime-api 1.1.6", + "aws-smithy-types 1.1.6", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.11", + "http-body", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + [[package]] name = "aws-smithy-http-tower" version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "822de399d0ce62829a69dfa8c5cd08efdbe61a7426b953e2268f8b8b52a607bd" dependencies = [ - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-http 0.56.1", + "aws-smithy-types 0.56.1", "bytes", - "http", + "http 0.2.11", "http-body", "pin-project-lite", "tower", @@ -448,7 +479,7 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb1e7ab8fa7ad10c193af7ae56d2420989e9f4758bf03601a342573333ea34f" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.56.1", ] [[package]] @@ -457,7 +488,7 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28556a3902091c1f768a34f6c998028921bdab8d47d92586f363f14a4a32d047" dependencies = [ - "aws-smithy-types", + "aws-smithy-types 0.56.1", "urlencoding", ] @@ -467,14 +498,14 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "745e096b3553e7e0f40622aa04971ce52765af82bebdeeac53aa6fc82fe801e6" dependencies = [ - "aws-smithy-async", + "aws-smithy-async 0.56.1", "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-runtime-api", - "aws-smithy-types", + "aws-smithy-http 0.56.1", + "aws-smithy-runtime-api 0.56.1", + "aws-smithy-types 0.56.1", "bytes", "fastrand", - "http", + "http 0.2.11", "http-body", "once_cell", "pin-project-lite", @@ -489,11 +520,27 @@ version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93d0ae0c9cfd57944e9711ea610b48a963fb174a53aabacc08c5794a594b1d02" dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-types", + "aws-smithy-async 0.56.1", + "aws-smithy-http 0.56.1", + "aws-smithy-types 0.56.1", + "bytes", + "http 0.2.11", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180898ed701a773fb3fadbd94b9e9559125cf88eeb1815ab99e35d4f5f34f7fb" +dependencies = [ + "aws-smithy-async 1.1.6", + "aws-smithy-types 1.1.6", "bytes", - "http", + "http 0.2.11", + "http 1.0.0", + "pin-project-lite", "tokio", "tracing", ] @@ -512,6 +559,27 @@ dependencies = [ "time", ] +[[package]] +name = "aws-smithy-types" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897f1db4020ad91f2c2421945ec49b7e3eb81cc3fea99e8b5dd5be721e697fed" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.11", + "http-body", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", +] + [[package]] name = "aws-smithy-xml" version = "0.56.1" @@ -528,11 +596,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85aa0451bf8af1bf22a4f028d5d28054507a14be43cb8ac0597a8471fba9edfe" dependencies = [ "aws-credential-types", - "aws-smithy-async", + "aws-smithy-async 0.56.1", "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-types", - "http", + "aws-smithy-http 0.56.1", + "aws-smithy-types 0.56.1", + "http 0.2.11", "rustc_version", "tracing", ] @@ -548,7 +616,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", + "http 0.2.11", "http-body", "hyper", "itoa", @@ -574,7 +642,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", + "http 0.2.11", "http-body", "mime", "rustversion", @@ -842,7 +910,7 @@ dependencies = [ "async-trait", "aws-config", "aws-sdk-s3", - "aws-smithy-http", + "aws-smithy-http 0.60.5", "base64", "bazelfe-protos", "byteorder", @@ -852,7 +920,7 @@ dependencies = [ "dashmap", "flume", "futures", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-tls", @@ -1578,7 +1646,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 2.0.0", "slab", "tokio", @@ -1645,6 +1713,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -1652,7 +1731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] @@ -1685,7 +1764,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "httparse", "httpdate", @@ -1705,7 +1784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ "futures-util", - "http", + "http 0.2.11", "hyper", "log", "rustls", @@ -3328,7 +3407,7 @@ dependencies = [ "base64", "bytes", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-timeout", diff --git a/bzl-remote-core/Cargo.toml b/bzl-remote-core/Cargo.toml index 7e2d1ef77..ddc58cfe2 100644 --- a/bzl-remote-core/Cargo.toml +++ b/bzl-remote-core/Cargo.toml @@ -54,7 +54,7 @@ sled = "0.34.7" memmap2 = "0.9.4" aws-sdk-s3 = "0.34.0" aws-config = "0.56.1" -aws-smithy-http = "0.56.1" +aws-smithy-http = "0.60.5" redis = { version = "0.24.0", features = ["tokio-comp", "connection-manager"] } urlencoding = "2.1.3" http = "0.2.11"