diff --git a/Cargo.lock b/Cargo.lock index 329d726a..b504dda5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -415,7 +415,7 @@ dependencies = [ "fastrand 2.0.1", "hex", "http 0.2.11", - "hyper", + "hyper 0.14.28", "ring 0.17.8", "time", "tokio", @@ -452,7 +452,7 @@ dependencies = [ "bytes", "fastrand 2.0.1", "http 0.2.11", - "http-body", + "http-body 0.4.6", "percent-encoding", "pin-project-lite", "tracing", @@ -502,7 +502,7 @@ dependencies = [ "aws-types", "bytes", "http 0.2.11", - "http-body", + "http-body 0.4.6", "once_cell", "percent-encoding", "regex-lite", @@ -652,7 +652,7 @@ dependencies = [ "crc32fast", "hex", "http 0.2.11", - "http-body", + "http-body 0.4.6", "md-5", "pin-project-lite", "sha1 0.10.6", @@ -684,7 +684,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.11", - "http-body", + "http-body 0.4.6", "once_cell", "percent-encoding", "pin-project-lite", @@ -725,8 +725,8 @@ dependencies = [ "fastrand 2.0.1", "h2", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", @@ -764,7 +764,7 @@ dependencies = [ "bytes-utils", "futures-core", "http 0.2.11", - "http-body", + "http-body 0.4.6", "itoa 1.0.10", "num-integer", "pin-project-lite", @@ -812,8 +812,8 @@ dependencies = [ "bytes", "futures-util", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "itoa 1.0.10", "matchit", "memchr", @@ -838,7 +838,7 @@ dependencies = [ "bytes", "futures-util", "http 0.2.11", - "http-body", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -1814,7 +1814,7 @@ dependencies = [ "dyn-clone", "lazy_static", "percent-encoding", - "reqwest", + "reqwest 0.11.24", "rustc_version 0.2.3", "serde", "serde_json", @@ -2374,8 +2374,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi", + "wasm-bindgen", ] [[package]] @@ -2403,11 +2405,33 @@ checksum = "644f40175857d0b8d7b6cad6cd9594284da5041387fa2ddff30ab6d8faef65eb" dependencies = [ "async-trait", "base64 0.21.7", - "google-cloud-metadata", + "google-cloud-metadata 0.3.2", "google-cloud-token", "home", - "jsonwebtoken", - "reqwest", + "jsonwebtoken 8.3.0", + "reqwest 0.11.24", + "serde", + "serde_json", + "thiserror", + "time", + "tokio", + "tracing", + "urlencoding", +] + +[[package]] +name = "google-cloud-auth" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e09ed5b2998bc8d0d3df09c859028210d4961b8fe779cfda8dc8ca4e83d5def2" +dependencies = [ + "async-trait", + "base64 0.21.7", + "google-cloud-metadata 0.5.0", + "google-cloud-token", + "home", + "jsonwebtoken 9.3.0", + "reqwest 0.12.4", "serde", "serde_json", "thiserror", @@ -2424,9 +2448,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1fec282ec73c02599c856080d3a0682c2eed9c2816bdf3c2967478e97a0e7ca" dependencies = [ "async-trait", - "google-cloud-auth", - "google-cloud-gax", - "google-cloud-pubsub", + "google-cloud-auth 0.11.0", + "google-cloud-gax 0.15.0", + "google-cloud-pubsub 0.16.0", ] [[package]] @@ -2445,6 +2469,22 @@ dependencies = [ "tracing", ] +[[package]] +name = "google-cloud-gax" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cb60314136e37de9e2a05ddb427b9c5a39c3d188de2e2f026c6af74425eef44" +dependencies = [ + "google-cloud-token", + "http 0.2.11", + "thiserror", + "tokio", + "tokio-retry", + "tonic 0.10.2", + "tower", + "tracing", +] + [[package]] name = "google-cloud-googleapis" version = "0.10.0" @@ -2456,13 +2496,35 @@ dependencies = [ "tonic 0.9.2", ] +[[package]] +name = "google-cloud-googleapis" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cd184c52aa2619ac1b16ad8b5a752e91d25be88a8cf08eaec19777dfacbe54" +dependencies = [ + "prost 0.12.3", + "prost-types 0.12.3", + "tonic 0.10.2", +] + [[package]] name = "google-cloud-metadata" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96e4ad0802d3f416f62e7ce01ac1460898ee0efc98f8b45cd4aab7611607012f" dependencies = [ - "reqwest", + "reqwest 0.11.24", + "thiserror", + "tokio", +] + +[[package]] +name = "google-cloud-metadata" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f" +dependencies = [ + "reqwest 0.12.4", "thiserror", "tokio", ] @@ -2475,8 +2537,8 @@ checksum = "2f3d6691ae02d47c3a3094a23425d10a6da2b3f892412dc82b4464f93e0e1f90" dependencies = [ "async-channel 1.9.0", "async-stream", - "google-cloud-gax", - "google-cloud-googleapis", + "google-cloud-gax 0.15.0", + "google-cloud-googleapis 0.10.0", "google-cloud-token", "prost-types 0.11.9", "thiserror", @@ -2485,6 +2547,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "google-cloud-pubsub" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a35e4a008db5cf01a5c03d3c67bd90b3cad77427ca949f3c8eddd90c4a3c932" +dependencies = [ + "async-channel 1.9.0", + "async-stream", + "google-cloud-auth 0.15.0", + "google-cloud-gax 0.17.0", + "google-cloud-googleapis 0.13.0", + "google-cloud-token", + "prost-types 0.12.3", + "thiserror", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "google-cloud-token" version = "0.1.2" @@ -2668,6 +2749,29 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", +] + [[package]] name = "httparse" version = "1.8.0" @@ -2698,7 +2802,7 @@ dependencies = [ "futures-util", "h2", "http 0.2.11", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa 1.0.10", @@ -2710,6 +2814,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "itoa 1.0.10", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.23.2" @@ -2717,7 +2840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http 0.2.11", - "hyper", + "hyper 0.14.28", "log", "rustls 0.20.9", "rustls-native-certs 0.6.3", @@ -2733,7 +2856,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.11", - "hyper", + "hyper 0.14.28", "log", "rustls 0.21.10", "rustls-native-certs 0.6.3", @@ -2747,7 +2870,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -2760,10 +2883,46 @@ 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-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2984,13 +3143,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.7", - "pem", + "pem 1.1.1", "ring 0.16.20", "serde", "serde_json", "simple_asn1", ] +[[package]] +name = "jsonwebtoken" +version = "9.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f" +dependencies = [ + "base64 0.21.7", + "js-sys", + "pem 3.0.4", + "ring 0.17.8", + "serde", + "serde_json", + "simple_asn1", +] + [[package]] name = "kafka" version = "0.10.0" @@ -3559,12 +3733,12 @@ dependencies = [ "gasket", "gasket-prometheus", "google-cloud-default", - "google-cloud-googleapis", - "google-cloud-pubsub", + "google-cloud-googleapis 0.10.0", + "google-cloud-pubsub 0.25.0", "handlebars", "hex", "indicatif", - "jsonwebtoken", + "jsonwebtoken 8.3.0", "kafka", "lapin", "merge", @@ -3574,7 +3748,7 @@ dependencies = [ "pallas", "r2d2_redis", "regex", - "reqwest", + "reqwest 0.11.24", "serde", "serde_json", "sqlx", @@ -3889,6 +4063,16 @@ dependencies = [ "base64 0.13.1", ] +[[package]] +name = "pem" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" +dependencies = [ + "base64 0.22.0", + "serde", +] + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -4171,7 +4355,7 @@ dependencies = [ "base64 0.13.1", "env_logger 0.9.3", "http 0.2.11", - "hyper", + "hyper 0.14.28", "hyper-rustls 0.23.2", "log", "num", @@ -4208,7 +4392,7 @@ checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", "heck", - "itertools 0.10.5", + "itertools 0.11.0", "log", "multimap", "once_cell", @@ -4242,7 +4426,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.52", @@ -4493,9 +4677,9 @@ dependencies = [ "futures-util", "h2", "http 0.2.11", - "http-body", - "hyper", - "hyper-tls", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -4519,7 +4703,47 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 2.1.2", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.52.0", ] [[package]] @@ -5843,8 +6067,8 @@ dependencies = [ "futures-util", "h2", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -5860,6 +6084,38 @@ dependencies = [ "webpki-roots 0.23.1", ] +[[package]] +name = "tonic" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.7", + "bytes", + "flate2", + "h2", + "http 0.2.11", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.12.3", + "rustls 0.21.10", + "rustls-pemfile 1.0.4", + "tokio", + "tokio-rustls 0.24.1", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", + "webpki-roots 0.25.4", +] + [[package]] name = "tonic" version = "0.11.0" @@ -5873,8 +6129,8 @@ dependencies = [ "bytes", "h2", "http 0.2.11", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -6764,6 +7020,12 @@ dependencies = [ "rustls-webpki 0.100.3", ] +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + [[package]] name = "webpki-roots" version = "0.26.1" @@ -7049,6 +7311,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 1.0.0", + "windows-sys 0.48.0", +] + [[package]] name = "winx" version = "0.36.3" diff --git a/Cargo.toml b/Cargo.toml index f433c42e..59d70deb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,7 @@ murmur3 = { version = "0.5.2", optional = true } openssl = { version = "0.10", optional = true, features = ["vendored"] } lapin = { version = "2.2.1", optional = true } kafka = { version = "0.10.0", optional = true } -google-cloud-pubsub = { version = "0.16.0", optional = true } +google-cloud-pubsub = { version = "0.25.0", optional = true } google-cloud-googleapis = { version = "0.10.0", optional = true } google-cloud-default = { version = "0.4.0", optional = true, features = ["pubsub"] } r2d2_redis = { version = "0.14.0", optional = true }