diff --git a/Cargo.lock b/Cargo.lock index ec3b7ec4..1d2b2906 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -739,6 +739,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.6" @@ -1297,6 +1307,20 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + [[package]] name = "hyper-timeout" version = "0.4.1" @@ -1400,6 +1424,12 @@ dependencies = [ "libc", ] +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + [[package]] name = "is-terminal" version = "0.4.9" @@ -2266,6 +2296,47 @@ dependencies = [ "bytecheck", ] +[[package]] +name = "reqwest" +version = "0.11.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + [[package]] name = "ring" version = "0.17.7" @@ -2371,6 +2442,15 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -2432,7 +2512,7 @@ dependencies = [ "serde", "serde_regex", "shuttle-actix-web", - "shuttle-runtime", + "shuttle-runtime 0.38.0", "tokio", "tracing", "tracing-subscriber", @@ -2586,14 +2666,26 @@ checksum = "7ca8b5015eaea3b3bc38078936dc21dbc46a352e736319c80e4422a77c31dcc4" dependencies = [ "actix-web", "num_cpus", - "shuttle-runtime", + "shuttle-runtime 0.35.2", ] [[package]] name = "shuttle-codegen" -version = "0.35.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b99c06b8adfb88b971c2bc2662252a6ec85f4e041c7b0add64499fbdfd71b18" +checksum = "a0d8979720bfd909ca7d7b188f55b1a266d455a5f4fc687153eae1883ba470b8" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.46", +] + +[[package]] +name = "shuttle-codegen" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1deb164f8f4040aca50e2462d2a0e6ff72acf51dbe58a598032f1da620b79abc" dependencies = [ "proc-macro-error", "proc-macro2", @@ -2603,9 +2695,9 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.35.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1ba1b036ce303eba6982c7a9d43021d121ccba84db43c3c264f8bf22b6bdb7" +checksum = "774cf8a2f4bfa3d81d286a2f90fcd9fdfafc0526470ed575c1245aa9ddc3137f" dependencies = [ "anyhow", "async-trait", @@ -2645,24 +2737,106 @@ dependencies = [ "zeroize", ] +[[package]] +name = "shuttle-common" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "530dd92ef335d91dcb77bda0d6afea7dc3c455ac6945c9f9ccebc5226bb6b9af" +dependencies = [ + "anyhow", + "async-trait", + "axum", + "bytes", + "chrono", + "comfy-table", + "crossterm 0.27.0", + "headers", + "http", + "http-body", + "hyper", + "jsonwebtoken", + "opentelemetry", + "opentelemetry-appender-tracing", + "opentelemetry-http", + "opentelemetry-otlp", + "opentelemetry_sdk", + "pin-project", + "reqwest", + "rustrict", + "semver", + "serde", + "serde_json", + "strum 0.25.0", + "thiserror", + "tokio", + "tonic 0.10.2", + "tower", + "tower-http", + "tracing", + "tracing-core", + "tracing-opentelemetry", + "tracing-subscriber", + "ttl_cache", + "url", + "uuid", + "zeroize", +] + [[package]] name = "shuttle-proto" -version = "0.35.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86275eabcc469d6749d4dc2e091f6e120f04fde813cf7002e5dc60158ce571b" +checksum = "c6a2740bb2148e6aa2ad57568ca9bf317cfd5bb241fc622fa512d9e45b046afa" dependencies = [ "futures-core", "prost 0.12.3", "prost-types", - "shuttle-common", + "shuttle-common 0.35.2", + "tonic 0.10.2", +] + +[[package]] +name = "shuttle-proto" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95532371eb7055651f4cb937b0e6522c75f9eb531e19b62b7428a05505574ba9" +dependencies = [ + "futures-core", + "prost 0.12.3", + "prost-types", + "shuttle-common 0.38.0", "tonic 0.10.2", ] [[package]] name = "shuttle-runtime" -version = "0.35.1" +version = "0.35.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d425ff8765955c524714b98c855350e1441237ee43e058c208d1552405cf3099" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "prost-types", + "serde", + "serde_json", + "shuttle-codegen 0.35.2", + "shuttle-common 0.35.2", + "shuttle-proto 0.35.2", + "shuttle-service 0.35.2", + "strfmt", + "thiserror", + "tokio", + "tokio-stream", + "tonic 0.10.2", + "tower", +] + +[[package]] +name = "shuttle-runtime" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e057c62f2f77368591117411e8de4458f6df33d0c157875c96025c2435e0811f" +checksum = "96222129180f38195d65bb65813ed5a3d72c351492c5f340c1c26e5e71e82088" dependencies = [ "anyhow", "async-trait", @@ -2671,10 +2845,10 @@ dependencies = [ "prost-types", "serde", "serde_json", - "shuttle-codegen", - "shuttle-common", - "shuttle-proto", - "shuttle-service", + "shuttle-codegen 0.38.0", + "shuttle-common 0.38.0", + "shuttle-proto 0.38.0", + "shuttle-service 0.38.0", "strfmt", "thiserror", "tokio", @@ -2686,14 +2860,29 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.35.1" +version = "0.35.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46d7b998a1137b4aa55190549b1ab71c5c834531776358599925ed23c27e4b86" +checksum = "7341769b2e27c2a6175ee71a041f7d0479c122d809fd8ab06c62864ff8fe362d" dependencies = [ "anyhow", "async-trait", "serde", - "shuttle-common", + "shuttle-common 0.35.2", + "strfmt", + "thiserror", +] + +[[package]] +name = "shuttle-service" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "778d4684362e19634d7124c3efbf08716e247d2c48498b5ad3cc03f53b23f08a" +dependencies = [ + "anyhow", + "async-trait", + "serde", + "shuttle-common 0.38.0", + "shuttle-proto 0.38.0", "strfmt", "thiserror", ] @@ -2880,6 +3069,27 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -3456,6 +3666,18 @@ dependencies = [ "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.89" @@ -3485,6 +3707,16 @@ version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +[[package]] +name = "web-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "web-time" version = "0.2.3" @@ -3682,6 +3914,16 @@ dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wyz" version = "0.5.1" diff --git a/Cargo.toml b/Cargo.toml index bd1960d9..5e5d7092 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ actix-web-grants = { version = "4.0.3" } actix-multipart = "0.6.1" actix-files = "0.6.2" shuttle-actix-web = { version = "0.35.1", optional = true } -shuttle-runtime = { version = "0.35.1", optional = true } +shuttle-runtime = { version = "0.38.0", optional = true } awc = { version = "3.3.0" } serde = "1.0.196" futures-util = "0.3.30"