diff --git a/.circleci/config.yml b/.circleci/config.yml index 0bf07f93d..a42ffec20 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ orbs: executors: docker-rust: docker: - - image: cimg/rust:1.63.0 + - image: cimg/rust:1.64.0 image-ubuntu: machine: image: ubuntu-2204:2022.04.1 diff --git a/.gitmodules b/.gitmodules index 77e658142..9645e2053 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "examples"] path = examples - url = git@github.com:shuttle-hq/examples.git + url = git@github.com:oddgrd/examples.git + branch = feat/bump-dependencies diff --git a/Cargo.lock b/Cargo.lock index bdc080d3b..1ee00f1f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,23 +2,13 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - [[package]] name = "acme2" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453e534d4f46dcdddd7aa8619e9a664e153f34383d14710db0b0d76c2964db89" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "hyper", "openssl", "reqwest", @@ -58,7 +48,7 @@ dependencies = [ "actix-service", "actix-utils", "ahash", - "base64 0.13.0", + "base64 0.13.1", "bitflags", "brotli", "bytes 1.3.0", @@ -91,7 +81,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" dependencies = [ "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -204,9 +194,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fa9362663c8643d67b2d5eafba49e4cb2c8a053a29ed00a0bea121f17c76b13" dependencies = [ "actix-router", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -348,20 +338,11 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" -version = "1.0.62" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "arc-swap" @@ -586,9 +567,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -599,13 +580,13 @@ checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" [[package]] name = "async-trait" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" +checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -619,18 +600,9 @@ dependencies = [ "log", "pin-project-lite 0.2.9", "tokio", - "tokio-rustls 0.23.4", - "tungstenite 0.17.3", - "webpki-roots 0.22.3", -] - -[[package]] -name = "atoi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5" -dependencies = [ - "num-traits", + "tokio-rustls", + "tungstenite", + "webpki-roots", ] [[package]] @@ -663,7 +635,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -685,9 +657,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-config" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a3ad9e793335d75b2d2faad583487efcc0df9154aff06f299a5c1fc8795698" +checksum = "56a636c44c77fa18bdba56126a34d30cfe5538fe88f7d34988fa731fee143ddd" dependencies = [ "aws-http", "aws-sdk-sso", @@ -713,11 +685,12 @@ dependencies = [ [[package]] name = "aws-endpoint" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd4e9dad553017821ee529f186e033700e8d61dd5c4b60066b4d8fe805b8cfc" +checksum = "6ca8f374874f6459aaa88dc861d7f5d834ca1ff97668eae190e97266b5f6c3fb" dependencies = [ "aws-smithy-http", + "aws-smithy-types", "aws-types", "http 0.2.8", "regex", @@ -726,9 +699,9 @@ dependencies = [ [[package]] name = "aws-http" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef5a579a51d352b628b76f4855ba716be686305e5e59970c476d1ae2214e90d" +checksum = "78d41e19e779b73463f5f0c21b3aacc995f4ba783ab13a7ae9f5dfb159a551b4" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -744,9 +717,9 @@ dependencies = [ [[package]] name = "aws-sdk-rds" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59834848e38d12a46013354ea27bb44ef4686121f8cda2611daea0fea3e8eac1" +checksum = "0420bd9b4043fa26b87ee18af3b98c5cc960ff439456a091cd4dd044cbbcc046" dependencies = [ "aws-endpoint", "aws-http", @@ -767,9 +740,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f014b8ad3178b414bf732b36741325ef659fc40752f8c292400fb7c4ecb7fdd0" +checksum = "86dcb1cb71aa8763b327542ead410424515cff0cde5b753eedd2917e09c63734" dependencies = [ "aws-endpoint", "aws-http", @@ -789,9 +762,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37e45fdce84327c69fb924b9188fd889056c6afafbd494e8dd0daa400f9c082" +checksum = "fdfcf584297c666f6b472d5368a78de3bc714b6e0a53d7fbf76c3e347c292ab1" dependencies = [ "aws-endpoint", "aws-http", @@ -811,9 +784,9 @@ dependencies = [ [[package]] name = "aws-sig-auth" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6530e72945c11439e9b3c423c95a656a233d73c3a7d4acaf9789048e1bdf7da7" +checksum = "12cbe7b2be9e185c1fbce27fc9c41c66b195b32d89aa099f98768d9544221308" dependencies = [ "aws-sigv4", "aws-smithy-http", @@ -824,9 +797,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6351c3ba468b04bd819f64ea53538f5f53e3d6b366b27deabee41e73c9edb3af" +checksum = "03ff4cff8c4a101962d593ba94e72cd83891aecd423f0c6e3146bff6fb92c9e3" dependencies = [ "aws-smithy-http", "form_urlencoded", @@ -842,9 +815,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fc23ad8d050c241bdbfa74ae360be94a844ace8e218f64a2b2de77bfa9a707" +checksum = "7b3442b4c5d3fc39891a2e5e625735fba6b24694887d49c6518460fde98247a9" dependencies = [ "futures-util", "pin-project-lite 0.2.9", @@ -854,9 +827,9 @@ dependencies = [ [[package]] name = "aws-smithy-client" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e147b157f49ce77f2a86ec693a14c84b2441fa28be58ffb2febb77d5726c934" +checksum = "ff28d553714f8f54cd921227934fc13a536a1c03f106e56b362fd57e16d450ad" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -867,7 +840,7 @@ dependencies = [ "http 0.2.8", "http-body", "hyper", - "hyper-rustls 0.22.1", + "hyper-rustls", "lazy_static", "pin-project-lite 0.2.9", "tokio", @@ -877,9 +850,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc1af50eac644ab6f58e5bae29328ba3092851fc2ce648ad139134699b2b66f" +checksum = "bf58ed4fefa61dbf038e5421a521cbc2c448ef69deff0ab1d915d8a10eda5664" dependencies = [ "aws-smithy-types", "bytes 1.3.0", @@ -891,6 +864,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite 0.2.9", + "pin-utils", "tokio", "tokio-util 0.7.3", "tracing", @@ -898,9 +872,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-tower" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1bf4c4664dff2febf91f8796505c5bc8f38a0bff0d1397d1d3fdda17bd5c5d1" +checksum = "20c96d7bd35e7cf96aca1134b2f81b1b59ffe493f7c6539c051791cbbf7a42d3" dependencies = [ "aws-smithy-http", "bytes 1.3.0", @@ -913,18 +887,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e6ebc76c3c108dd2a96506bf47dc31f75420811a19f1a09907524d1451789d2" +checksum = "d8324ba98c8a94187723cc16c37aefa09504646ee65c3d2c3af495bab5ea701b" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2956f1385c4daa883907a2c81d32256af8f95834c9de1bc0613fa68db63b88c4" +checksum = "83834ed2ff69ea6f6657baf205267dc2c0abe940703503a3e5d60ce23be3d306" dependencies = [ "aws-smithy-types", "urlencoding", @@ -932,9 +906,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "352fb335ec1d57160a17a13e87aaa0a172ab780ddf58bfc85caedd3b7e47caed" +checksum = "8b02e06ea63498c43bc0217ea4d16605d4e58d85c12fc23f6572ff6d0a840c61" dependencies = [ "itoa 1.0.2", "num-integer", @@ -944,18 +918,18 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cf2807fa715a5a3296feffb06ce45252bd0dfd48f52838128c48fb339ddbf5c" +checksum = "246e9f83dd1fdf5d347fa30ae4ad30a9d1d42ce4cd74a93d94afa874646f94cd" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.47.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8140b89d76f67be2c136d7393e7e6d8edd65424eb58214839efbf4a2e4f7e8a3" +checksum = "05701d32da168b44f7ee63147781aed8723e792cc131cb9b18363b5393f17f70" dependencies = [ "aws-smithy-async", "aws-smithy-client", @@ -969,13 +943,13 @@ dependencies = [ [[package]] name = "axum" -version = "0.5.15" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de18bc5f2e9df8f52da03856bf40e29b747de5a84e43aefff90e3dc4a21529b" +checksum = "744864363a200a5e724a7e61bc8c11b6628cf2e3ec519c8a1a48e609a8156b40" dependencies = [ "async-trait", "axum-core", - "base64 0.13.0", + "base64 0.13.1", "bitflags", "bytes 1.3.0", "futures-util", @@ -989,13 +963,15 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite 0.2.9", + "rustversion", "serde", "serde_json", + "serde_path_to_error", "serde_urlencoded", - "sha-1 0.10.0", + "sha-1", "sync_wrapper", "tokio", - "tokio-tungstenite 0.17.2", + "tokio-tungstenite", "tower", "tower-http 0.3.4", "tower-layer", @@ -1004,9 +980,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.2.7" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f44a0e6200e9d11a1cdc989e4b358f6e3d354fbf48478f345a17f4e43f8635" +checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" dependencies = [ "async-trait", "bytes 1.3.0", @@ -1014,6 +990,9 @@ dependencies = [ "http 0.2.8", "http-body", "mime", + "rustversion", + "tower-layer", + "tower-service", ] [[package]] @@ -1029,10 +1008,10 @@ dependencies = [ "http-body", "hyper", "pin-project-lite 0.2.9", - "rustls 0.20.6", + "rustls", "rustls-pemfile 1.0.1", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tower-service", ] @@ -1042,12 +1021,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.12.3" @@ -1056,9 +1029,9 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "binascii" @@ -1143,7 +1116,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d82e7850583ead5f8bbef247e2a3c37a19bd576e8420cd262a6711921827e1e5" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bollard-stubs", "bytes 1.3.0", "futures-core", @@ -1203,7 +1176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d76085681585d39016f4d3841eb019201fc54d2dd0d92ad1e4fab3bfb32754" dependencies = [ "ahash", - "base64 0.13.0", + "base64 0.13.1", "hex 0.4.3", "indexmap", "lazy_static", @@ -1212,7 +1185,7 @@ dependencies = [ "serde_bytes", "serde_json", "time 0.3.11", - "uuid 1.2.1", + "uuid 1.2.2", ] [[package]] @@ -1363,7 +1336,7 @@ dependencies = [ "tar", "tempfile", "termcolor", - "toml_edit", + "toml_edit 0.14.4", "unicode-width", "unicode-xid 0.2.3", "url", @@ -1373,13 +1346,13 @@ dependencies = [ [[package]] name = "cargo-edit" -version = "0.10.4" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a055abd7d5cdb5a4e0aad89962b2f172eaad613374056cab74124ff2cf978ea7" +checksum = "e3a5eba325b274fc14e17df48888c3c45146e03be7331cdbd585c377a2bc8058" dependencies = [ "anyhow", "cargo_metadata", - "clap 3.2.17", + "clap 4.0.27", "concolor-control", "crates-index", "dirs-next", @@ -1397,7 +1370,7 @@ dependencies = [ "serde_json", "subprocess", "termcolor", - "toml_edit", + "toml_edit 0.14.4", "ureq", "url", ] @@ -1441,19 +1414,19 @@ dependencies = [ "shuttle-common", "shuttle-secrets", "shuttle-service", - "sqlx 0.6.1", + "sqlx", "tar", "tempfile", "test-context", "tokio", - "tokio-tungstenite 0.17.2", + "tokio-tungstenite", "tokiotest-httpserver", "toml", - "toml_edit", + "toml_edit 0.15.0", "tracing", "tracing-subscriber", "url", - "uuid 1.2.1", + "uuid 1.2.2", "webbrowser", ] @@ -1481,15 +1454,16 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36" +checksum = "982a0cf6a99c350d7246035613882e376d58cebe571785abc5da4f648d53ac0a" dependencies = [ "camino", "cargo-platform", "semver 1.0.14", "serde", "serde_json", + "thiserror", ] [[package]] @@ -1521,9 +1495,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", @@ -1573,23 +1547,23 @@ dependencies = [ "once_cell", "strsim", "termcolor", - "terminal_size", "textwrap", ] [[package]] name = "clap" -version = "4.0.4" +version = "4.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f78ad8e84aa8e8aa3e821857be40eb4b925ff232de430d4dd2ae6aa058cbd92" +checksum = "0acbd8d28a0a60d7108d7ae850af6ba34cf2d1257fc646980e5f97ce14275966" dependencies = [ - "atty", "bitflags", - "clap_derive 4.0.1", + "clap_derive 4.0.21", "clap_lex 0.3.0", + "is-terminal", "once_cell", "strsim", "termcolor", + "terminal_size", ] [[package]] @@ -1609,22 +1583,22 @@ checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] name = "clap_derive" -version = "4.0.1" +version = "4.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca689d7434ce44517a12a89456b2be4d1ea1cafcd8f581978c03d45f5a5c12a7" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -1667,9 +1641,9 @@ dependencies = [ [[package]] name = "combine" -version = "4.6.4" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a604e93b79d1808327a6fca85a6f2d69de66461e7620f5a4cbf5fb4d1d7c948" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ "bytes 1.3.0", "memchr", @@ -1677,9 +1651,9 @@ dependencies = [ [[package]] name = "comfy-table" -version = "6.1.0" +version = "6.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85914173c2f558d61613bfbbf1911f14e630895087a7ed2fafc0f5319e1536e7" +checksum = "e621e7e86c46fd8a14c32c6ae3cb95656621b4743a27d0cffedb831d46e7ad21" dependencies = [ "crossterm", "strum", @@ -1756,7 +1730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" dependencies = [ "aes-gcm 0.8.0", - "base64 0.13.0", + "base64 0.13.1", "hkdf 0.10.0", "hmac 0.10.1", "percent-encoding", @@ -1773,7 +1747,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" dependencies = [ "aes-gcm 0.9.4", - "base64 0.13.0", + "base64 0.13.1", "hkdf 0.12.3", "hmac 0.12.1", "percent-encoding", @@ -1817,9 +1791,9 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "crates-index" -version = "0.18.8" +version = "0.18.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2519c91ad7a6e3250a64fb71162d2db1afe7bcf826a465f84d2052fd69639b7a" +checksum = "599f67b56f40863598cb30450427049935d05de2e36c61d33c050f04d7ec8cf2" dependencies = [ "git2", "hex 0.4.3", @@ -1833,6 +1807,7 @@ dependencies = [ "serde_derive", "serde_json", "smartstring", + "toml", ] [[package]] @@ -1849,30 +1824,15 @@ dependencies = [ "url", ] -[[package]] -name = "crc" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" -dependencies = [ - "crc-catalog 1.1.1", -] - [[package]] name = "crc" version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" dependencies = [ - "crc-catalog 2.1.0", + "crc-catalog", ] -[[package]] -name = "crc-catalog" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" - [[package]] name = "crc-catalog" version = "2.1.0" @@ -1968,6 +1928,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "cruet" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e0d174765c7d11eb16f70a4213583aac2ca5ae1ebd1e233c6d5104bfb70fce3" +dependencies = [ + "once_cell", + "regex", +] + [[package]] name = "crypto-common" version = "0.1.3" @@ -2010,23 +1980,14 @@ dependencies = [ "subtle", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct 0.6.1", -] - [[package]] name = "ctor" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -2047,6 +2008,12 @@ dependencies = [ "cipher 0.3.0", ] +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + [[package]] name = "curl" version = "0.4.43" @@ -2106,10 +2073,10 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "strsim", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -2120,10 +2087,10 @@ checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "strsim", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -2134,7 +2101,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -2145,7 +2112,7 @@ checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" dependencies = [ "darling_core 0.14.1", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -2155,7 +2122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.12.1", + "hashbrown", "lock_api", "parking_lot_core 0.9.3", ] @@ -2172,9 +2139,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -2184,10 +2151,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "rustc_version 0.4.0", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -2217,10 +2184,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0" dependencies = [ "bitflags", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "proc-macro2-diagnostics", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -2302,12 +2269,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - [[package]] name = "dotenvy" version = "0.15.2" @@ -2345,9 +2306,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -2365,9 +2326,9 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -2402,6 +2363,27 @@ dependencies = [ "serde", ] +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "event-listener" version = "2.5.2" @@ -2467,9 +2449,9 @@ checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "libz-sys", @@ -2511,19 +2493,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "fqdn" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1281c1bcf107f1cc25ca345ce4688badf37c6c13c3f193cb4b9efdc057678ae2" +checksum = "3b5dd19b048b2dfde153588594b4f3da47b18afd18d171bb8d1d27741256bbaa" [[package]] name = "fuchsia-cprng" @@ -2533,9 +2514,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] name = "futures" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", @@ -2548,9 +2529,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", "futures-sink", @@ -2558,15 +2539,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-executor" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", @@ -2586,9 +2567,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-lite" @@ -2607,32 +2588,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] name = "futures-sink" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" [[package]] name = "futures-task" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-util" -version = "0.3.23" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-channel", "futures-core", @@ -2798,15 +2779,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.12.1" @@ -2816,22 +2788,13 @@ dependencies = [ "ahash", ] -[[package]] -name = "hashlink" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" -dependencies = [ - "hashbrown 0.11.2", -] - [[package]] name = "hashlink" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086" dependencies = [ - "hashbrown 0.12.1", + "hashbrown", ] [[package]] @@ -2840,7 +2803,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bitflags", "bytes 1.3.0", "headers-core", @@ -2877,6 +2840,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.3.2" @@ -2942,9 +2914,9 @@ dependencies = [ [[package]] name = "home" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" +checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408" dependencies = [ "winapi", ] @@ -3020,7 +2992,7 @@ dependencies = [ "anyhow", "async-channel", "async-std", - "base64 0.13.0", + "base64 0.13.1", "cookie 0.14.4", "futures-lite", "infer", @@ -3097,23 +3069,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hyper-rustls" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" -dependencies = [ - "ct-logs", - "futures-util", - "hyper", - "log", - "rustls 0.19.1", - "rustls-native-certs 0.5.0", - "tokio", - "tokio-rustls 0.22.0", - "webpki 0.21.4", -] - [[package]] name = "hyper-rustls" version = "0.23.0" @@ -3122,10 +3077,11 @@ checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ "http 0.2.8", "hyper", - "rustls 0.20.6", - "rustls-native-certs 0.6.2", + "log", + "rustls", + "rustls-native-certs", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", ] [[package]] @@ -3196,6 +3152,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "ignore" version = "0.4.18" @@ -3235,7 +3201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg 1.1.0", - "hashbrown 0.12.1", + "hashbrown", "serde", ] @@ -3268,19 +3234,35 @@ dependencies = [ [[package]] name = "instant-acme" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b406e5b10f83a118305a9aeff0c6942db8e63ee21cf5af8f05a3128444cb2992" +checksum = "a4c6a5dc426fcc25b99d91e4a283a8f5518339a0f63bf28588a6c5f31e089f8a" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "hyper", - "hyper-rustls 0.23.0", + "hyper-rustls", "ring", "serde", "serde_json", "thiserror", ] +[[package]] +name = "io-lifetimes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" + +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "iovec" version = "0.1.4" @@ -3308,11 +3290,23 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +[[package]] +name = "is-terminal" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae5bc6e2eb41c9def29a3e0f1306382807764b9b53112030eff57435667352d" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes 1.0.3", + "rustix 0.36.3", + "windows-sys 0.42.0", +] + [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -3331,9 +3325,9 @@ checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "jni" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" dependencies = [ "cesu8", "combine", @@ -3405,9 +3399,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libgit2-sys" @@ -3425,9 +3419,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if 1.0.0", "winapi", @@ -3486,6 +3480,18 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linux-raw-sys" +version = "0.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" + +[[package]] +name = "linux-raw-sys" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" + [[package]] name = "local-channel" version = "0.1.3" @@ -3549,6 +3555,15 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + [[package]] name = "match_cfg" version = "0.1.0" @@ -3572,9 +3587,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "matchit" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" +checksum = "3dfc802da7b1cf80aefffa0c7b2f77247c8b32206cc83c270b61264f5b360a80" [[package]] name = "md-5" @@ -3624,9 +3639,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -3640,7 +3655,7 @@ dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -3654,12 +3669,12 @@ dependencies = [ [[package]] name = "mongodb" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95afe97b0c799fdf69cd960272a2cb9662d077bd6efd84eb722bb9805d47554" +checksum = "b5a1df476ac9541b0e4fdc8e2cc48884e66c92c933cd17a1fd75e68caf75752e" dependencies = [ "async-trait", - "base64 0.13.0", + "base64 0.13.1", "bitflags", "bson", "chrono", @@ -3676,12 +3691,12 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "rustc_version_runtime", - "rustls 0.20.6", + "rustls", "rustls-pemfile 0.3.0", "serde", "serde_bytes", "serde_with", - "sha-1 0.10.0", + "sha-1", "sha2 0.10.2", "socket2", "stringprep", @@ -3689,13 +3704,13 @@ dependencies = [ "take_mut", "thiserror", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tokio-util 0.7.3", "trust-dns-proto", "trust-dns-resolver", "typed-builder", "uuid 0.8.2", - "webpki-roots 0.22.3", + "webpki-roots", ] [[package]] @@ -3763,62 +3778,12 @@ dependencies = [ "tempfile", ] -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - [[package]] name = "ndk-context" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling 0.13.4", - "proc-macro-crate", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - [[package]] name = "net2" version = "0.2.37" @@ -3840,6 +3805,16 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -3861,49 +3836,37 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] [[package]] -name = "num_enum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.7" +name = "num_threads" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" dependencies = [ - "proc-macro-crate", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "libc", ] [[package]] -name = "num_threads" -version = "0.1.6" +name = "objc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ - "libc", + "malloc_buf", ] [[package]] name = "once_cell" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "opaque-debug" @@ -3942,9 +3905,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -4092,6 +4055,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking" version = "2.0.0" @@ -4143,7 +4112,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -4184,10 +4153,10 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "proc-macro2-diagnostics", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -4196,14 +4165,14 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", ] [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "petgraph" @@ -4217,22 +4186,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -4270,9 +4239,9 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "poem" -version = "1.3.40" +version = "1.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d0fec4acc8779b696e3ff25527884fb17cda6cf59a249c57aa1af1e2f65b36" +checksum = "dc88a96f338947991534ac756e28bd05665a7dd40ad9c0c143cc5503ef5635e8" dependencies = [ "async-trait", "bytes 1.3.0", @@ -4296,19 +4265,18 @@ dependencies = [ "tokio-stream", "tokio-util 0.7.3", "tracing", - "typed-headers", ] [[package]] name = "poem-derive" -version = "1.3.40" +version = "1.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee7e20b5c7c573862cbc21e8f85682cc1f04766a318691837e8aa27df66857e6" +checksum = "d9bfb3ddf3eb162c2a2dc4dbdc610eaf56417cd4000fcda2686ccb354e2a1b2b" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -4364,14 +4332,14 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "pretty_assertions" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" dependencies = [ - "ansi_term", "ctor", "diff", "output_vt100", + "yansi", ] [[package]] @@ -4380,8 +4348,8 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1516508b396cefe095485fdce673007422f5e48e82934b7b423dc26aa5e6a4" dependencies = [ - "proc-macro2 1.0.43", - "syn 1.0.99", + "proc-macro2 1.0.47", + "syn 1.0.104", ] [[package]] @@ -4401,9 +4369,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", "version_check", ] @@ -4413,7 +4381,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "version_check", ] @@ -4435,9 +4403,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] @@ -4448,18 +4416,18 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", "version_check", "yansi", ] [[package]] name = "prost" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" +checksum = "a0841812012b2d4a6145fae9a6af1534873c32aa67fff26bd09f8fa42c83f95a" dependencies = [ "bytes 1.3.0", "prost-derive", @@ -4467,9 +4435,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" +checksum = "1d8b442418ea0822409d9e7d047cbf1e7e9e1760b172bf9982cf29d517c93511" dependencies = [ "bytes 1.3.0", "heck", @@ -4478,9 +4446,11 @@ dependencies = [ "log", "multimap", "petgraph", + "prettyplease", "prost", "prost-types", "regex", + "syn 1.0.104", "tempfile", "which", ] @@ -4493,9 +4463,9 @@ checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -4535,7 +4505,7 @@ version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", ] [[package]] @@ -4737,6 +4707,15 @@ dependencies = [ "rand_core 0.6.3", ] +[[package]] +name = "raw-window-handle" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" +dependencies = [ + "cty", +] + [[package]] name = "rayon" version = "1.5.3" @@ -4817,9 +4796,9 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a043824e29c94169374ac5183ac0ed43f5724dc4556b19568007486bd840fa1f" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -4859,11 +4838,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.11" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" +checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bytes 1.3.0", "encoding_rs", "futures-core", @@ -4872,44 +4851,43 @@ dependencies = [ "http 0.2.8", "http-body", "hyper", - "hyper-rustls 0.23.0", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", - "lazy_static", "log", "mime", "mime_guess", "native-tls", + "once_cell", "percent-encoding", "pin-project-lite 0.2.9", - "rustls 0.20.6", + "rustls", "rustls-pemfile 1.0.1", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls 0.23.4", + "tokio-rustls", "tokio-util 0.7.3", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.22.3", + "webpki-roots", "winreg 0.10.1", ] [[package]] name = "reqwest-middleware" -version = "0.1.6" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69539cea4148dce683bec9dc95be3f0397a9bb2c248a49c8296a9d21659a8cdd" +checksum = "4a1c03e9011a8c59716ad13115550469e081e2e9892656b0ba6a47c907921894" dependencies = [ "anyhow", "async-trait", - "futures", "http 0.2.8", "reqwest", "serde", @@ -4919,9 +4897,9 @@ dependencies = [ [[package]] name = "reqwest-retry" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce246a729eaa6aff5e215aee42845bf5fed9893cc6cd51aeeb712f34e04dd9f3" +checksum = "e29d842a94e8ab9b581fd3b906053872aef2fb3e474cbd88712047895d2deee4" dependencies = [ "anyhow", "async-trait", @@ -5040,10 +5018,10 @@ dependencies = [ "devise", "glob", "indexmap", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "rocket_http", - "syn 1.0.99", + "syn 1.0.104", "unicode-xid 0.2.3", ] @@ -5133,40 +5111,43 @@ dependencies = [ ] [[package]] -name = "rustls" -version = "0.19.1" +name = "rustix" +version = "0.35.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ - "base64 0.13.0", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", + "bitflags", + "errno", + "io-lifetimes 0.7.5", + "libc", + "linux-raw-sys 0.0.46", + "windows-sys 0.42.0", ] [[package]] -name = "rustls" -version = "0.20.6" +name = "rustix" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e" dependencies = [ - "log", - "ring", - "sct 0.7.0", - "webpki 0.22.0", + "bitflags", + "errno", + "io-lifetimes 1.0.3", + "libc", + "linux-raw-sys 0.1.3", + "windows-sys 0.42.0", ] [[package]] -name = "rustls-native-certs" -version = "0.5.0" +name = "rustls" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" +checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" dependencies = [ - "openssl-probe", - "rustls 0.19.1", - "schannel", - "security-framework", + "log", + "ring", + "sct", + "webpki", ] [[package]] @@ -5181,13 +5162,22 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +dependencies = [ + "base64 0.13.1", +] + [[package]] name = "rustls-pemfile" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", ] [[package]] @@ -5196,14 +5186,14 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", ] [[package]] name = "rustrict" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ab6d404f2f6170969bf27865e33d708cbfed94a3b5def842c77394178bd7881" +checksum = "294846357ffbadaaa82996006626376f97b6327a3990da95458bbcb7c9f2e116" dependencies = [ "bitflags", "doc-comment", @@ -5217,9 +5207,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" [[package]] name = "ryu" @@ -5235,25 +5225,25 @@ checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" [[package]] name = "salvo" -version = "0.34.3" +version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d5860968c3504a1d13618078d2c833b23b2c7b194ce23e999891953d04b20c" +checksum = "b290f01b3b881afd34408b5823cb44f6717ed6b93a6e16a0113e9a49645ea8a7" dependencies = [ "salvo_core", ] [[package]] name = "salvo_core" -version = "0.34.3" +version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e104409bf6168999cae0d11d4340fdcb333592ddce2a5bd2c45e300e6a8e6f68" +checksum = "2fea63014bacaaaef1eaa1f28d90921cfbbee73a379974fca30fc698f64a8853" dependencies = [ - "Inflector", "async-compression", "async-trait", - "base64 0.13.0", + "base64 0.13.1", "bytes 1.3.0", "cookie 0.16.0", + "cruet", "encoding_rs", "enumflags2", "fastrand", @@ -5285,17 +5275,17 @@ dependencies = [ [[package]] name = "salvo_macros" -version = "0.34.3" +version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1fe2ec840671e1427625d4dfb1c00177c64052fe0bfacf26964ab6d75446f45" +checksum = "b305a54f28b92483eabbfc91dd39bba62c840095b5513e83d31582c7e6bd8d44" dependencies = [ - "Inflector", + "cruet", "darling 0.14.1", "proc-macro-crate", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "regex", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -5314,7 +5304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "windows-sys", + "windows-sys 0.36.1", ] [[package]] @@ -5329,16 +5319,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "sct" version = "0.7.0" @@ -5398,9 +5378,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.143" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" +checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc" dependencies = [ "serde_derive", ] @@ -5426,13 +5406,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.143" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" +checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -5455,9 +5435,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" +checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" dependencies = [ "indexmap", "itoa 1.0.2", @@ -5465,6 +5445,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_path_to_error" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" +dependencies = [ + "serde", +] + [[package]] name = "serde_qs" version = "0.8.5" @@ -5505,9 +5494,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -5518,7 +5507,7 @@ checksum = "82fd5e7b5858ad96e99d440138f34f5b98e1b959ebcd3a1036203b30e78eb788" dependencies = [ "async-trait", "async-tungstenite", - "base64 0.13.0", + "base64 0.13.1", "bitflags", "bytes 1.3.0", "cfg-if 1.0.0", @@ -5538,19 +5527,6 @@ dependencies = [ "url", ] -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha-1" version = "0.10.0" @@ -5632,7 +5608,7 @@ name = "shuttle-admin" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.0.4", + "clap 4.0.27", "dirs", "reqwest", "serde", @@ -5650,9 +5626,9 @@ version = "0.7.2" dependencies = [ "pretty_assertions", "proc-macro-error", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", "trybuild", ] @@ -5674,7 +5650,7 @@ dependencies = [ "serde_json", "strum", "tracing", - "uuid 1.2.1", + "uuid 1.2.2", ] [[package]] @@ -5709,7 +5685,7 @@ dependencies = [ "shuttle-common", "shuttle-proto", "shuttle-service", - "sqlx 0.6.1", + "sqlx", "strum", "tar", "tempdir", @@ -5722,7 +5698,7 @@ dependencies = [ "tracing", "tracing-opentelemetry", "tracing-subscriber", - "uuid 1.2.1", + "uuid 1.2.2", ] [[package]] @@ -5734,10 +5710,10 @@ dependencies = [ "async-trait", "axum", "axum-server", - "base64 0.13.0", + "base64 0.13.1", "bollard", "chrono", - "clap 4.0.4", + "clap 4.0.27", "colored", "fqdn", "futures", @@ -5754,13 +5730,13 @@ dependencies = [ "portpicker", "rand 0.8.5", "rcgen", - "rustls 0.20.6", + "rustls", "rustls-pemfile 1.0.1", "serde", "serde_json", "shuttle-common", "snailquote", - "sqlx 0.5.13", + "sqlx", "strum", "tempfile", "tokio", @@ -5769,7 +5745,7 @@ dependencies = [ "tracing", "tracing-opentelemetry", "tracing-subscriber", - "uuid 1.2.1", + "uuid 1.2.2", ] [[package]] @@ -5788,7 +5764,6 @@ version = "0.7.3" dependencies = [ "aws-config", "aws-sdk-rds", - "aws-smithy-types", "clap 3.2.17", "ctor", "fqdn", @@ -5799,7 +5774,7 @@ dependencies = [ "rand 0.8.5", "serde_json", "shuttle-proto", - "sqlx 0.6.1", + "sqlx", "thiserror", "tokio", "tonic", @@ -5843,7 +5818,7 @@ dependencies = [ "serenity", "shuttle-codegen", "shuttle-common", - "sqlx 0.6.1", + "sqlx", "sync_wrapper", "thiserror", "thruster", @@ -5852,7 +5827,7 @@ dependencies = [ "tower", "tracing", "tracing-subscriber", - "uuid 1.2.1", + "uuid 1.2.2", "warp", ] @@ -5913,9 +5888,9 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smartstring" @@ -5977,9 +5952,9 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.1.8" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" +checksum = "f87e292b4291f154971a43c3774364e2cbcaec599d3f5bf6fa9d122885dbc38a" dependencies = [ "itertools", "nom", @@ -5988,85 +5963,28 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551873805652ba0d912fec5bbb0f8b4cdd96baf8e2ebf5970e5671092966019b" -dependencies = [ - "sqlx-core 0.5.13", - "sqlx-macros 0.5.13", -] - -[[package]] -name = "sqlx" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "788841def501aabde58d3666fcea11351ec3962e6ea75dbcd05c84a71d68bcd1" -dependencies = [ - "sqlx-core 0.6.1", - "sqlx-macros 0.6.1", -] - -[[package]] -name = "sqlx-core" -version = "0.5.13" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" +checksum = "9249290c05928352f71c077cc44a464d880c63f26f7534728cca008e135c0428" dependencies = [ - "ahash", - "atoi 0.4.0", - "bitflags", - "byteorder", - "bytes 1.3.0", - "crc 2.1.0", - "crossbeam-queue", - "either", - "event-listener", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "hashlink 0.7.0", - "hex 0.4.3", - "indexmap", - "itoa 1.0.2", - "libc", - "libsqlite3-sys", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.19.1", - "serde", - "serde_json", - "sha2 0.10.2", - "smallvec", - "sqlformat", - "sqlx-rt 0.5.13", - "stringprep", - "thiserror", - "tokio-stream", - "url", - "webpki 0.21.4", - "webpki-roots 0.21.1", + "sqlx-core", + "sqlx-macros", ] [[package]] name = "sqlx-core" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c21d3b5e7cadfe9ba7cdc1295f72cc556c750b4419c27c219c0693198901f8e" +checksum = "dcbc16ddba161afc99e14d1713a453747a2b07fc097d2009f4c300ec99286105" dependencies = [ "ahash", - "atoi 1.0.0", - "base64 0.13.0", + "atoi", + "base64 0.13.1", "bitflags", "byteorder", "bytes 1.3.0", "chrono", - "crc 3.0.0", + "crc", "crossbeam-queue", "dirs", "dotenvy", @@ -6078,7 +5996,7 @@ dependencies = [ "futures-executor", "futures-intrusive", "futures-util", - "hashlink 0.8.0", + "hashlink", "hex 0.4.3", "hkdf 0.12.3", "hmac 0.12.1", @@ -6095,75 +6013,44 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha-1 0.10.0", + "sha1 0.10.4", "sha2 0.10.2", "smallvec", "sqlformat", - "sqlx-rt 0.6.1", + "sqlx-rt", "stringprep", "thiserror", "tokio-stream", "url", - "uuid 1.2.1", + "uuid 1.2.2", "whoami", ] [[package]] name = "sqlx-macros" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1" -dependencies = [ - "dotenv", - "either", - "heck", - "once_cell", - "proc-macro2 1.0.43", - "quote 1.0.21", - "serde_json", - "sha2 0.10.2", - "sqlx-core 0.5.13", - "sqlx-rt 0.5.13", - "syn 1.0.99", - "url", -] - -[[package]] -name = "sqlx-macros" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4adfd2df3557bddd3b91377fc7893e8fa899e9b4061737cbade4e1bb85f1b45c" +checksum = "b850fa514dc11f2ee85be9d055c512aa866746adfacd1cb42d867d68e6a5b0d9" dependencies = [ "dotenvy", "either", "heck", "once_cell", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "serde_json", "sha2 0.10.2", - "sqlx-core 0.6.1", - "sqlx-rt 0.6.1", - "syn 1.0.99", + "sqlx-core", + "sqlx-rt", + "syn 1.0.104", "url", ] [[package]] name = "sqlx-rt" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae" -dependencies = [ - "once_cell", - "tokio", - "tokio-rustls 0.22.0", -] - -[[package]] -name = "sqlx-rt" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be52fc7c96c136cedea840ed54f7d446ff31ad670c9dea95ebcb998530971a3" +checksum = "24c5b2d25fa654cc5f841750b8e1cdedbe21189bf9a9382ee90bfa9dd3562396" dependencies = [ "native-tls", "once_cell", @@ -6224,11 +6111,11 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "serde", "serde_derive", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -6238,13 +6125,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" dependencies = [ "base-x", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "serde", "serde_derive", "serde_json", "sha1 0.6.1", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -6294,10 +6181,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4faebde00e8ff94316c01800f9054fd2ba77d30d9e922541913051d1d978918b" dependencies = [ "heck", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "rustversion", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -6338,11 +6225,11 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.99" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "unicode-ident", ] @@ -6423,12 +6310,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.17" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a" dependencies = [ - "libc", - "winapi", + "rustix 0.35.13", + "windows-sys 0.42.0", ] [[package]] @@ -6449,7 +6336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8901a55b0a7a06ebc4a674dcca925170da8e613fa3b163a1df804ed10afb154d" dependencies = [ "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -6467,28 +6354,25 @@ name = "textwrap" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" -dependencies = [ - "terminal_size", -] [[package]] name = "thiserror" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -6502,9 +6386,9 @@ dependencies = [ [[package]] name = "thruster" -version = "1.2.6" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc22b1c2267be6d1769c6d787936201341f03c915456ed8a8db8d40d665215f" +checksum = "910effe6fa8063f44f9f2f4d15d758270a679562414235c6781bf3b606b72682" dependencies = [ "async-trait", "bytes 0.5.6", @@ -6630,10 +6514,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", "standback", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -6653,9 +6537,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.1" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3" dependencies = [ "autocfg 1.1.0", "bytes 1.3.0", @@ -6663,7 +6547,6 @@ dependencies = [ "memchr", "mio", "num_cpus", - "once_cell", "parking_lot 0.12.1", "pin-project-lite 0.2.9", "signal-hook-registry", @@ -6688,9 +6571,9 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -6703,26 +6586,15 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki 0.21.4", -] - [[package]] name = "tokio-rustls" version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.6", + "rustls", "tokio", - "webpki 0.22.0", + "webpki", ] [[package]] @@ -6749,19 +6621,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "tokio-tungstenite" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511de3f85caf1c98983545490c3d09685fa8eb634e57eec22bb4db271f46cbd8" -dependencies = [ - "futures-util", - "log", - "pin-project", - "tokio", - "tungstenite 0.14.0", -] - [[package]] name = "tokio-tungstenite" version = "0.17.2" @@ -6773,7 +6632,7 @@ dependencies = [ "native-tls", "tokio", "tokio-native-tls", - "tungstenite 0.17.3", + "tungstenite", ] [[package]] @@ -6832,6 +6691,12 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd" + [[package]] name = "toml_edit" version = "0.14.4" @@ -6845,16 +6710,28 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_edit" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1541ba70885967e662f69d31ab3aeca7b1aaecfcd58679590b893e9239c3646" +dependencies = [ + "combine", + "indexmap", + "itertools", + "toml_datetime", +] + [[package]] name = "tonic" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498f271adc46acce75d66f639e4d35b31b2394c295c82496727dafa16d465dd2" +checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.13.0", + "base64 0.13.1", "bytes 1.3.0", "futures-core", "futures-util", @@ -6879,15 +6756,15 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fbcd2800e34e743b9ae795867d5f77b535d3a3be69fd731e39145719752df8c" +checksum = "31fa2c5e870bdce133847d15e075333e6e1ca3fff913001fede6754f3060e367" dependencies = [ "prettyplease", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "prost-build", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] @@ -6934,7 +6811,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bitflags", "bytes 1.3.0", "futures-core", @@ -6951,9 +6828,9 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" @@ -6963,9 +6840,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", "log", @@ -6976,20 +6853,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", ] [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", @@ -7032,12 +6909,12 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ - "ansi_term", "matchers", + "nu-ansi-term", "once_cell", "regex", "sharded-slab", @@ -7061,7 +6938,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna", + "idna 0.2.3", "ipnet", "lazy_static", "log", @@ -7101,9 +6978,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trybuild" -version = "1.0.64" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f408301c7480f9e6294eb779cfc907f54bd901a9660ef24d7f233ed5376485" +checksum = "db29f438342820400f2d9acfec0d363e987a38b2950bdb50a7069ed17b2148ee" dependencies = [ "glob", "once_cell", @@ -7114,32 +6991,13 @@ dependencies = [ "toml", ] -[[package]] -name = "tungstenite" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0b2d8558abd2e276b0a8df5c05a2ec762609344191e5fd23e292c910e9165b5" -dependencies = [ - "base64 0.13.0", - "byteorder", - "bytes 1.3.0", - "http 0.2.8", - "httparse", - "log", - "rand 0.8.5", - "sha-1 0.9.8", - "thiserror", - "url", - "utf-8", -] - [[package]] name = "tungstenite" version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "byteorder", "bytes 1.3.0", "http 0.2.8", @@ -7147,12 +7005,12 @@ dependencies = [ "log", "native-tls", "rand 0.8.5", - "rustls 0.20.6", - "sha-1 0.10.0", + "rustls", + "sha-1", "thiserror", "url", "utf-8", - "webpki 0.22.0", + "webpki", ] [[package]] @@ -7170,22 +7028,9 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", -] - -[[package]] -name = "typed-headers" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3179a61e9eccceead5f1574fd173cf2e162ac42638b9bf214c6ad0baf7efa24a" -dependencies = [ - "base64 0.11.0", - "bytes 0.5.6", - "chrono", - "http 0.2.8", - "mime", + "syn 1.0.104", ] [[package]] @@ -7297,33 +7142,32 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "ureq" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9399fa2f927a3d327187cbd201480cee55bee6ac5d3c77dd27f0c6814cff16d5" +checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "chunked_transfer", "log", "native-tls", "once_cell", - "rustls 0.20.6", + "rustls", "serde", "serde_json", "socks", "url", - "webpki 0.22.0", - "webpki-roots 0.22.3", + "webpki", + "webpki-roots", ] [[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", - "idna", - "matches", + "idna 0.3.0", "percent-encoding", "serde", ] @@ -7366,9 +7210,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" dependencies = [ "getrandom 0.2.7", "serde", @@ -7423,7 +7267,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", ] @@ -7456,9 +7300,9 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cef4e1e9114a4b7f1ac799f16ce71c14de5778500c5450ec6b7b920c55b587e" +checksum = "ed7b8be92646fc3d18b06147664ebc5f48d222686cb11a8755e561a735aacc6d" dependencies = [ "bytes 1.3.0", "futures-channel", @@ -7472,14 +7316,15 @@ dependencies = [ "multipart", "percent-encoding", "pin-project", + "rustls-pemfile 0.2.1", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-stream", - "tokio-tungstenite 0.15.0", - "tokio-util 0.6.10", + "tokio-tungstenite", + "tokio-util 0.7.3", "tower-service", "tracing", ] @@ -7523,9 +7368,9 @@ dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", "wasm-bindgen-shared", ] @@ -7557,9 +7402,9 @@ version = "0.2.81" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.47", "quote 1.0.21", - "syn 1.0.99", + "syn 1.0.104", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7582,28 +7427,20 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.7.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6a3cffdb686fbb24d9fb8f03a213803277ed2300f11026a3afe1f108dc021b" +checksum = "2a0cc7962b5aaa0dfcebaeef0161eec6edf5f4606c12e6777fd7d392f52033a5" dependencies = [ "jni", - "ndk-glue", + "ndk-context", + "objc", + "raw-window-handle", "url", "web-sys", "widestring", "winapi", ] -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki" version = "0.22.0" @@ -7614,22 +7451,13 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" -dependencies = [ - "webpki 0.21.4", -] - [[package]] name = "webpki-roots" version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf" dependencies = [ - "webpki 0.22.0", + "webpki", ] [[package]] @@ -7705,43 +7533,100 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + [[package]] name = "windows_i686_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + [[package]] name = "windows_i686_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + [[package]] name = "winreg" version = "0.7.0" @@ -7771,9 +7656,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.3" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "114ba2b24d2167ef6d67d7d04c8cc86522b87f490025f39f0303b7db5bf5e3d8" +checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" [[package]] name = "yansi" diff --git a/Containerfile b/Containerfile index c50c13692..b3e4f5096 100644 --- a/Containerfile +++ b/Containerfile @@ -1,5 +1,5 @@ #syntax=docker/dockerfile-upstream:1.4.0-rc1 -FROM rust:1.63.0-buster as shuttle-build +FROM rust:1.64.0-buster as shuttle-build RUN apt-get update &&\ apt-get install -y curl protobuf-compiler RUN cargo install cargo-chef @@ -21,7 +21,7 @@ COPY --from=cache /build . ARG folder RUN cargo build --bin shuttle-${folder} -FROM rust:1.63.0-buster as shuttle-common +FROM rust:1.64.0-buster as shuttle-common RUN apt-get update &&\ apt-get install -y curl RUN rustup component add rust-src diff --git a/admin/Cargo.toml b/admin/Cargo.toml index 069f28575..b4ccaeb4c 100644 --- a/admin/Cargo.toml +++ b/admin/Cargo.toml @@ -4,16 +4,16 @@ version = "0.1.0" edition = "2021" [dependencies] -anyhow = "1.0.62" -clap = { version = "4.0.0", features = [ "derive", "env" ] } +anyhow = "1.0.66" +clap = { version = "4.0.27", features = [ "derive", "env" ] } dirs = "4.0.0" -reqwest = { version = "0.11.11", features = ["json"] } -serde = { version = "1.0.143", features = ["derive"] } -serde_json = "1.0.83" -tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] } +reqwest = { version = "0.11.13", features = ["json"] } +serde = { version = "1.0.148", features = ["derive"] } +serde_json = "1.0.89" +tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] } toml = "0.5.9" -tracing = "0.1.35" -tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } +tracing = "0.1.37" +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } [dependencies.shuttle-common] version = "0.7.2" diff --git a/cargo-shuttle/Cargo.toml b/cargo-shuttle/Cargo.toml index 88e71a577..6648ac562 100644 --- a/cargo-shuttle/Cargo.toml +++ b/cargo-shuttle/Cargo.toml @@ -7,41 +7,41 @@ description = "A cargo command for the shuttle platform (https://www.shuttle.rs/ homepage = "https://www.shuttle.rs" [dependencies] -anyhow = "1.0.62" -async-trait = "0.1.57" +anyhow = "1.0.66" +async-trait = "0.1.58" bollard = "0.13.0" cargo = "0.64.0" -cargo-edit = { version = "0.10.4", features = ["cli"] } -cargo_metadata = "0.15.0" -chrono = "0.4.22" +cargo-edit = { version = "0.11.6", features = ["cli"] } +cargo_metadata = "0.15.2" +chrono = "0.4.23" clap = { version = "3.2.17", features = ["derive", "env"] } clap_complete = "3.2.5" crossbeam-channel = "0.5.6" crossterm = "0.25.0" dirs = "4.0.0" -flate2 = "1.0.24" -futures = "0.3.23" +flate2 = "1.0.25" +futures = "0.3.25" headers = "0.3.8" indoc = "1.0.7" log = "0.4.17" openssl = { version = '0.10', optional = true } portpicker = "0.1.1" -reqwest = { version = "0.11.11", features = ["json"] } -reqwest-middleware = "0.1.6" -reqwest-retry = "0.1.5" -serde = { version = "1.0.143", features = ["derive"] } -serde_json = "1.0.83" -sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls", "postgres"] } +reqwest = { version = "0.11.13", features = ["json"] } +reqwest-middleware = "0.2.0" +reqwest-retry = "0.2.0" +serde = { version = "1.0.148", features = ["derive"] } +serde_json = "1.0.89" +sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] } tar = "0.4.38" -tokio = { version = "1.20.1", features = ["macros"] } +tokio = { version = "1.22.0", features = ["macros"] } tokio-tungstenite = { version = "0.17.2", features = ["native-tls"] } toml = "0.5.9" -toml_edit = "0.14.4" -tracing = "0.1.35" -tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } -url = "2.2.2" -uuid = { version = "1.1.2", features = ["v4"] } -webbrowser = "0.7.1" +toml_edit = "0.15.0" +tracing = "0.1.37" +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } +url = "2.3.1" +uuid = { version = "1.2.2", features = ["v4"] } +webbrowser = "0.8.2" [dependencies.shuttle-common] version = "0.7.2" diff --git a/cargo-shuttle/tests/integration/run.rs b/cargo-shuttle/tests/integration/run.rs index 318145ffb..0998c2751 100644 --- a/cargo-shuttle/tests/integration/run.rs +++ b/cargo-shuttle/tests/integration/run.rs @@ -168,6 +168,8 @@ async fn rocket_authentication() { ); } +// TODO: remove ignore when updated examples are merged: https://github.com/shuttle-hq/examples/pull/4 +#[ignore] #[tokio::test(flavor = "multi_thread")] async fn actix_web_hello_world() { let port = cargo_shuttle_run("../examples/actix-web/hello-world").await; diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml index eea029727..f60bc6c57 100644 --- a/codegen/Cargo.toml +++ b/codegen/Cargo.toml @@ -11,10 +11,10 @@ proc-macro = true [dependencies] proc-macro-error = "1.0.4" -proc-macro2 = "1.0.43" +proc-macro2 = "1.0.47" quote = "1.0.21" -syn = { version = "1.0.99", features = ["full", "extra-traits"] } +syn = { version = "1.0.104", features = ["full", "extra-traits"] } [dev-dependencies] -pretty_assertions = "1.2.1" -trybuild = "1.0.64" +pretty_assertions = "1.3.0" +trybuild = "1.0.72" diff --git a/common/Cargo.toml b/common/Cargo.toml index 3d70c7cf0..79e64d304 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -7,21 +7,21 @@ description = "Common library for the shuttle platform (https://www.shuttle.rs/) # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = { version = "1.0.62", optional = true } -async-trait = { version = "0.1.52", optional = true } -axum = { version = "0.5.8", optional = true } -chrono = { version = "0.4.22", features = ["serde"] } -comfy-table = { version = "6.1.0", optional = true } +anyhow = { version = "1.0.66", optional = true } +async-trait = { version = "0.1.58", optional = true } +axum = { version = "0.6.0", optional = true } +chrono = { version = "0.4.23", features = ["serde"] } +comfy-table = { version = "6.1.3", optional = true } crossterm = { version = "0.25.0", optional = true } http = { version = "0.2.8", optional = true } -once_cell = "1.13.1" -reqwest = { version = "0.11.11", optional = true } -rustrict = "0.5.0" -serde = { version = "1.0.143", features = ["derive"] } -serde_json = { version = "1.0.85", optional = true } +once_cell = "1.16.0" +reqwest = { version = "0.11.13", optional = true } +rustrict = "0.5.5" +serde = { version = "1.0.148", features = ["derive"] } +serde_json = { version = "1.0.89", optional = true } strum = { version = "0.24.1", features = ["derive"] } -tracing = "0.1.36" -uuid = { version = "1.1.1", features = ["v4", "serde"] } +tracing = "0.1.37" +uuid = { version = "1.2.2", features = ["v4", "serde"] } [features] default = ["models"] diff --git a/common/src/backends/metrics.rs b/common/src/backends/metrics.rs index 433205b90..9dabc5a1c 100644 --- a/common/src/backends/metrics.rs +++ b/common/src/backends/metrics.rs @@ -1,7 +1,8 @@ use std::{collections::HashMap, convert::Infallible}; use async_trait::async_trait; -use axum::extract::{FromRequest, Path, RequestParts}; +use axum::extract::{FromRequestParts, Path}; +use axum::http::request::Parts; use tracing::Span; /// Used to record a bunch of metrics info @@ -10,18 +11,19 @@ use tracing::Span; pub struct Metrics; #[async_trait] -impl FromRequest for Metrics +impl FromRequestParts for Metrics where - B: Send, + S: Send + Sync, { type Rejection = Infallible; - async fn from_request(req: &mut RequestParts) -> Result { + async fn from_request_parts(parts: &mut Parts, state: &S) -> Result { // Get path parameters if they exist - let Path(path): Path> = match req.extract().await { - Ok(path) => path, - Err(_) => return Ok(Metrics), - }; + let Path(path): Path> = + match Path::from_request_parts(parts, state).await { + Ok(path) => path, + Err(_) => return Ok(Metrics), + }; let span = Span::current(); diff --git a/deployer/Cargo.toml b/deployer/Cargo.toml index 19799bc50..8c410926a 100644 --- a/deployer/Cargo.toml +++ b/deployer/Cargo.toml @@ -5,42 +5,42 @@ edition = "2021" description = "Service with instances created per project for handling the compilation, loading, and execution of Shuttle services" [dependencies] -anyhow = "1.0.58" -async-trait = "0.1.56" -axum = { version = "0.5.7", features = ["ws"] } -bytes = "1.1.0" +anyhow = "1.0.66" +async-trait = "0.1.58" +axum = { version = "0.6.0", features = ["ws"] } +bytes = "1.3.0" cargo = "0.64.0" -cargo_metadata = "0.15.0" -chrono = "0.4.22" +cargo_metadata = "0.15.2" +chrono = "0.4.23" clap = { version = "3.2.8", features = ["derive"] } crossbeam-channel = "0.5.6" -flate2 = "1.0.24" -fqdn = "0.2.2" -futures = "0.3.21" -hyper = { version = "0.14.20", features = ["client", "http1", "http2", "tcp" ] } +flate2 = "1.0.25" +fqdn = "0.2.3" +futures = "0.3.25" +hyper = { version = "0.14.23", features = ["client", "http1", "http2", "tcp" ] } # not great, but waiting for WebSocket changes to be merged hyper-reverse-proxy = { git = "https://github.com/chesedo/hyper-reverse-proxy", branch = "master" } -once_cell = "1.14.0" +once_cell = "1.16.0" opentelemetry = { version = "0.18.0", features = ["rt-tokio"] } opentelemetry-datadog = { version = "0.6.0", features = ["reqwest-client"] } opentelemetry-http = "0.7.0" pipe = "0.4.0" portpicker = "0.1.1" -serde = "1.0.137" -serde_json = "1.0.81" -sqlx = { version = "0.6.0", features = ["runtime-tokio-native-tls", "sqlite", "chrono", "json", "migrate", "uuid"] } +serde = "1.0.148" +serde_json = "1.0.89" +sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "sqlite", "chrono", "json", "migrate", "uuid"] } strum = { version = "0.24.1", features = ["derive"] } tar = "0.4.38" -thiserror = "1.0.24" -tokio = { version = "1.19.2", features = ["fs"] } +thiserror = "1.0.37" +tokio = { version = "1.22.0", features = ["fs"] } toml = "0.5.9" -tonic = "0.8.0" -tower = { version = "0.4.12", features = ["make"] } +tonic = "0.8.3" +tower = { version = "0.4.13", features = ["make"] } tower-http = { version = "0.3.4", features = ["auth", "trace"] } -tracing = "0.1.35" +tracing = "0.1.37" tracing-opentelemetry = "0.18.0" -tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } -uuid = { version = "1.1.2", features = ["v4"] } +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } +uuid = { version = "1.2.2", features = ["v4"] } [dependencies.shuttle-common] version = "0.7.2" @@ -57,7 +57,7 @@ path = "../service" features = ["loader"] [dev-dependencies] -ctor = "0.1.22" +ctor = "0.1.26" hex = "0.4.3" rand = "0.8.5" tempdir = "0.3.7" diff --git a/deployer/src/handlers/mod.rs b/deployer/src/handlers/mod.rs index 1501ee589..8b242dc04 100644 --- a/deployer/src/handlers/mod.rs +++ b/deployer/src/handlers/mod.rs @@ -39,7 +39,7 @@ pub fn make_router( proxy_fqdn: FQDN, admin_secret: String, project_name: ProjectName, -) -> Router { +) -> Router { Router::new() .route("/projects/:project_name/services", get(list_services)) .route( @@ -353,7 +353,9 @@ async fn logs_websocket_handler(mut s: WebSocket, persistence: Persistence, id: return; } }; - let mut last_timestamp = Utc.timestamp(0, 0); + + // Unwrap is safe because it only returns None for out of range numbers or invalid nanosecond + let mut last_timestamp = Utc.timestamp_opt(0, 0).unwrap(); for log in backlog.into_iter() { last_timestamp = log.timestamp; diff --git a/deployer/src/handlers/project.rs b/deployer/src/handlers/project.rs index 2389cd7e4..bafae003a 100644 --- a/deployer/src/handlers/project.rs +++ b/deployer/src/handlers/project.rs @@ -1,7 +1,9 @@ use std::collections::HashMap; use async_trait::async_trait; -use axum::extract::{FromRequest, Path, RequestParts}; +use axum::extract::{Extension, FromRequestParts, Path}; +use axum::http::request::Parts; +use axum::RequestPartsExt; use hyper::StatusCode; use shuttle_common::project::ProjectName; use tracing::error; @@ -11,18 +13,19 @@ use tracing::error; pub struct ProjectNameGuard; #[async_trait] -impl FromRequest for ProjectNameGuard +impl FromRequestParts for ProjectNameGuard where - B: Send, + S: Send + Sync, { type Rejection = StatusCode; - async fn from_request(req: &mut RequestParts) -> Result { + async fn from_request_parts(parts: &mut Parts, state: &S) -> Result { // We expect some path parameters - let Path(path): Path> = match req.extract().await { - Ok(path) => path, - Err(_) => return Err(StatusCode::NOT_FOUND), - }; + let Path(path): Path> = + match Path::from_request_parts(parts, state).await { + Ok(path) => path, + Err(_) => return Err(StatusCode::NOT_FOUND), + }; // All our routes have the `project_name` parameter let project_name = match path.get("project_name") { @@ -34,9 +37,10 @@ where }; // This extractor requires the ProjectName extension to be set - let expected_project_name: &ProjectName = match req.extensions().get() { - Some(expected) => expected, - None => { + let Extension(expected_project_name) = match parts.extract::>().await + { + Ok(expected) => expected, + Err(_) => { error!("ProjectName extension is not set"); return Err(StatusCode::INTERNAL_SERVER_ERROR); } diff --git a/deployer/src/persistence/mod.rs b/deployer/src/persistence/mod.rs index f3715b072..fd9c47af4 100644 --- a/deployer/src/persistence/mod.rs +++ b/deployer/src/persistence/mod.rs @@ -476,7 +476,7 @@ mod tests { id, service_id, state: State::Queued, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 43, 33), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 43, 33).unwrap(), address: None, }; @@ -496,7 +496,10 @@ mod tests { .unwrap(); let update = p.get_deployment(&id).await.unwrap().unwrap(); assert_eq!(update.state, State::Built); - assert_ne!(update.last_update, Utc.ymd(2022, 4, 25).and_hms(4, 43, 33)); + assert_ne!( + update.last_update, + Utc.with_ymd_and_hms(2022, 4, 25, 4, 43, 33).unwrap() + ); } #[tokio::test(flavor = "multi_thread")] @@ -510,28 +513,28 @@ mod tests { id: Uuid::new_v4(), service_id: xyz_id, state: State::Crashed, - last_update: Utc.ymd(2022, 4, 25).and_hms(7, 29, 35), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 7, 29, 35).unwrap(), address: None, }; let deployment_stopped = Deployment { id: Uuid::new_v4(), service_id: xyz_id, state: State::Stopped, - last_update: Utc.ymd(2022, 4, 25).and_hms(7, 49, 35), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 7, 49, 35).unwrap(), address: None, }; let deployment_other = Deployment { id: Uuid::new_v4(), service_id, state: State::Running, - last_update: Utc.ymd(2022, 4, 25).and_hms(7, 39, 39), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 7, 39, 39).unwrap(), address: None, }; let deployment_running = Deployment { id: Uuid::new_v4(), service_id: xyz_id, state: State::Running, - last_update: Utc.ymd(2022, 4, 25).and_hms(7, 48, 29), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 7, 48, 29).unwrap(), address: Some(SocketAddr::new(Ipv4Addr::LOCALHOST.into(), 9876)), }; @@ -568,35 +571,35 @@ mod tests { id: Uuid::new_v4(), service_id, state: State::Built, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 29, 33), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 29, 33).unwrap(), address: None, }, Deployment { id: id_1, service_id: foo_id, state: State::Running, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 29, 44), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 29, 44).unwrap(), address: None, }, Deployment { id: id_2, service_id: bar_id, state: State::Running, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 33, 48), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 33, 48).unwrap(), address: None, }, Deployment { id: Uuid::new_v4(), service_id: service_id2, state: State::Crashed, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 38, 52), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 38, 52).unwrap(), address: None, }, Deployment { id: id_3, service_id: foo_id, state: State::Running, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 42, 32), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 42, 32).unwrap(), address: None, }, ] { @@ -788,14 +791,14 @@ mod tests { id, service_id, state: State::Queued, // Should be different from the state recorded below - last_update: Utc.ymd(2022, 4, 29).and_hms(2, 39, 39), + last_update: Utc.with_ymd_and_hms(2022, 4, 29, 2, 39, 39).unwrap(), address: None, }) .await .unwrap(); let state = deploy_layer::Log { id, - timestamp: Utc.ymd(2022, 4, 29).and_hms(2, 39, 59), + timestamp: Utc.with_ymd_and_hms(2022, 4, 29, 2, 39, 59).unwrap(), state: State::Running, level: Level::Info, file: None, @@ -828,7 +831,7 @@ mod tests { id, service_id, state: State::Running, - last_update: Utc.ymd(2022, 4, 29).and_hms(2, 39, 59), + last_update: Utc.with_ymd_and_hms(2022, 4, 29, 2, 39, 59).unwrap(), address: Some(SocketAddr::new(Ipv4Addr::LOCALHOST.into(), 12345)), } ); @@ -1004,35 +1007,35 @@ mod tests { id: Uuid::new_v4(), service_id, state: State::Built, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 29, 33), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 29, 33).unwrap(), address: None, }, Deployment { id: Uuid::new_v4(), service_id, state: State::Stopped, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 29, 44), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 29, 44).unwrap(), address: None, }, Deployment { id: id_1, service_id, state: State::Running, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 33, 48), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 33, 48).unwrap(), address: None, }, Deployment { id: Uuid::new_v4(), service_id, state: State::Crashed, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 38, 52), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 38, 52).unwrap(), address: None, }, Deployment { id: id_2, service_id, state: State::Running, - last_update: Utc.ymd(2022, 4, 25).and_hms(4, 42, 32), + last_update: Utc.with_ymd_and_hms(2022, 4, 25, 4, 42, 32).unwrap(), address: None, }, ] { diff --git a/deployer/tests/resources/tests-fail/Cargo.toml b/deployer/tests/resources/tests-fail/Cargo.toml index 18f948a67..43b6ff357 100644 --- a/deployer/tests/resources/tests-fail/Cargo.toml +++ b/deployer/tests/resources/tests-fail/Cargo.toml @@ -9,5 +9,5 @@ crate-type = ["cdylib"] [workspace] [dependencies] -rocket = "0.5.0-rc.1" -shuttle-service = { version = "0.3.3", features = ["web-rocket"] } +rocket = "0.5.0-rc.2" +shuttle-service = { path = "../../../../service", features = ["web-rocket"] } diff --git a/deployer/tests/resources/tests-pass/Cargo.toml b/deployer/tests/resources/tests-pass/Cargo.toml index b3e5424eb..43e898a65 100644 --- a/deployer/tests/resources/tests-pass/Cargo.toml +++ b/deployer/tests/resources/tests-pass/Cargo.toml @@ -9,5 +9,5 @@ crate-type = ["cdylib"] [workspace] [dependencies] -rocket = "0.5.0-rc.1" -shuttle-service = { version = "0.3.3", features = ["web-rocket"] } +rocket = "0.5.0-rc.2" +shuttle-service = { path = "../../../../service", features = ["web-rocket"] } diff --git a/e2e/tests/integration/actix_web.rs b/e2e/tests/integration/actix_web.rs index f6a545889..ff3c05b34 100644 --- a/e2e/tests/integration/actix_web.rs +++ b/e2e/tests/integration/actix_web.rs @@ -2,6 +2,8 @@ use crossterm::style::Color; use crate::helpers::{self, APPS_FQDN}; +// TODO: remove ignore when updated examples are merged: https://github.com/shuttle-hq/examples/pull/4 +#[ignore] #[test] fn hello_world_actix_web() { let client = helpers::Services::new_docker( diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index 2140336cf..01281a826 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -6,41 +6,41 @@ publish = false [dependencies] acme2 = "0.5.1" -async-trait = "0.1.52" -axum = { version = "0.5.8", features = [ "headers" ] } +async-trait = "0.1.58" +axum = { version = "0.6.0", features = [ "headers" ] } axum-server = { version = "0.4.4", features = [ "tls-rustls" ] } -base64 = "0.13" -bollard = "0.13" -chrono = "0.4" -clap = { version = "4.0.0", features = [ "derive" ] } -fqdn = "0.2.2" -futures = "0.3.21" +base64 = "0.13.1" +bollard = "0.13.0" +chrono = "0.4.23" +clap = { version = "4.0.27", features = [ "derive" ] } +fqdn = "0.2.3" +futures = "0.3.25" http = "0.2.8" -hyper = { version = "0.14.19", features = [ "stream" ] } +hyper = { version = "0.14.23", features = [ "stream" ] } # not great, but waiting for WebSocket changes to be merged hyper-reverse-proxy = { git = "https://github.com/chesedo/hyper-reverse-proxy", branch = "bug/host_header" } -instant-acme = "0.1.0" +instant-acme = "0.1.1" lazy_static = "1.4.0" -once_cell = "1.14.0" +once_cell = "1.16.0" opentelemetry = { version = "0.18.0", features = ["rt-tokio"] } opentelemetry-datadog = { version = "0.6.0", features = ["reqwest-client"] } opentelemetry-http = "0.7.0" pem = "1.1.0" rand = "0.8.5" rcgen = "0.10.0" -rustls = { version = "0.20.6" } -rustls-pemfile = { version = "1.0.1" } -serde = { version = "1.0.137", features = [ "derive" ] } -serde_json = "1.0.81" -sqlx = { version = "0.5.11", features = [ "sqlite", "json", "runtime-tokio-rustls", "migrate" ] } +rustls = "0.20.7" +rustls-pemfile = "1.0.1" +serde = { version = "1.0.148", features = [ "derive" ] } +serde_json = "1.0.89" +sqlx = { version = "0.6.2", features = [ "sqlite", "json", "runtime-tokio-native-tls", "migrate" ] } strum = { version = "0.24.1", features = ["derive"] } -tokio = { version = "1.17", features = [ "full" ] } +tokio = { version = "1.22.0", features = [ "full" ] } tower = { version = "0.4.13", features = [ "steer" ] } tower-http = { version = "0.3.4", features = ["trace"] } -tracing = "0.1.35" +tracing = "0.1.37" tracing-opentelemetry = "0.18.0" -tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } -uuid = { version = "1.2.1", features = [ "v4" ] } +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } +uuid = { version = "1.2.2", features = [ "v4" ] } [dependencies.shuttle-common] version = "0.7.2" @@ -48,10 +48,10 @@ path = "../common" features = ["backend"] [dev-dependencies] -anyhow = "1" -base64 = "0.13" -colored = "2" -portpicker = "0.1" -snailquote = "0.3" +anyhow = "1.0.66" +base64 = "0.13.1" +colored = "2.0.0" +portpicker = "0.1.1" +snailquote = "0.3.1" tempfile = "3.3.0" diff --git a/gateway/src/api/latest.rs b/gateway/src/api/latest.rs index 8d773cbb7..1581f473f 100644 --- a/gateway/src/api/latest.rs +++ b/gateway/src/api/latest.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use std::time::Duration; use axum::body::{Body, BoxBody}; -use axum::extract::{Extension, MatchedPath, Path}; +use axum::extract::{Extension, MatchedPath, Path, State}; use axum::http::Request; use axum::middleware::from_extractor; use axum::response::Response; @@ -66,7 +66,7 @@ impl StatusResponse { } async fn get_user( - Extension(service): Extension>, + State(RouterState { service, .. }): State, Path(account_name): Path, _: Admin, ) -> Result, Error> { @@ -76,7 +76,7 @@ async fn get_user( } async fn post_user( - Extension(service): Extension>, + State(RouterState { service, .. }): State, Path(account_name): Path, _: Admin, ) -> Result, Error> { @@ -86,7 +86,7 @@ async fn post_user( } async fn get_project( - Extension(service): Extension>, + State(RouterState { service, .. }): State, ScopedUser { scope, .. }: ScopedUser, ) -> Result, Error> { let state = service.find_project(&scope).await?.into(); @@ -99,8 +99,7 @@ async fn get_project( } async fn post_project( - Extension(service): Extension>, - Extension(sender): Extension>, + State(RouterState { service, sender }): State, User { name, .. }: User, Path(project): Path, ) -> Result, Error> { @@ -123,8 +122,7 @@ async fn post_project( } async fn delete_project( - Extension(service): Extension>, - Extension(sender): Extension>, + State(RouterState { service, sender }): State, ScopedUser { scope: project, .. }: ScopedUser, ) -> Result, Error> { let state = service.find_project(&project).await?; @@ -152,14 +150,14 @@ async fn delete_project( } async fn route_project( - Extension(service): Extension>, + State(RouterState { service, .. }): State, scoped_user: ScopedUser, req: Request, ) -> Result, Error> { service.route(&scoped_user, req).await } -async fn get_status(Extension(sender): Extension>) -> Response { +async fn get_status(State(RouterState { sender, .. }): State) -> Response { let (status, body) = if sender.is_closed() || sender.capacity() == 0 { ( StatusCode::INTERNAL_SERVER_ERROR, @@ -180,8 +178,7 @@ async fn get_status(Extension(sender): Extension>) -> Response async fn revive_projects( _: Admin, - Extension(service): Extension>, - Extension(sender): Extension>, + State(RouterState { service, sender }): State, ) -> Result<(), Error> { crate::project::exec::revive(service, sender) .await @@ -201,10 +198,9 @@ async fn create_acme_account( async fn request_acme_certificate( _: Admin, - Extension(service): Extension>, + State(RouterState { service, sender }): State, Extension(acme_client): Extension, Extension(resolver): Extension>, - Extension(sender): Extension>, Path((project_name, fqdn)): Path<(ProjectName, String)>, AxumJson(credentials): AxumJson>, ) -> Result { @@ -260,8 +256,14 @@ async fn request_acme_certificate( Ok("certificate created".to_string()) } +#[derive(Clone)] +pub(crate) struct RouterState { + pub service: Arc, + pub sender: Sender, +} + pub struct ApiBuilder { - router: Router, + router: Router, service: Option>, sender: Option>, bind: Option, @@ -361,12 +363,11 @@ impl ApiBuilder { self } - pub fn into_router(self) -> Router { + pub fn into_router(self) -> Router { let service = self.service.expect("a GatewayService is required"); let sender = self.sender.expect("a task Sender is required"); - self.router - .layer(Extension(service)) - .layer(Extension(sender)) + + self.router.with_state(RouterState { service, sender }) } pub fn serve(self) -> impl Future> { diff --git a/gateway/src/auth.rs b/gateway/src/auth.rs index 1063861b8..2e1b84b19 100644 --- a/gateway/src/auth.rs +++ b/gateway/src/auth.rs @@ -1,14 +1,15 @@ use std::fmt::{Debug, Formatter}; use std::str::FromStr; -use std::sync::Arc; -use axum::extract::{Extension, FromRequest, Path, RequestParts, TypedHeader}; +use axum::extract::{FromRef, FromRequestParts, Path, TypedHeader}; use axum::headers::authorization::Bearer; use axum::headers::Authorization; +use axum::http::request::Parts; use rand::distributions::{Alphanumeric, DistString}; use serde::{Deserialize, Serialize}; use tracing::{trace, Span}; +use crate::api::latest::RouterState; use crate::service::GatewayService; use crate::{AccountName, Error, ErrorKind, ProjectName}; @@ -24,14 +25,14 @@ impl Key { } #[async_trait] -impl FromRequest for Key +impl FromRequestParts for Key where - B: Send, + S: Send + Sync, { type Rejection = Error; - async fn from_request(req: &mut RequestParts) -> Result { - let key = TypedHeader::>::from_request(req) + async fn from_request_parts(parts: &mut Parts, state: &S) -> Result { + let key = TypedHeader::>::from_request_parts(parts, state) .await .map_err(|_| Error::from(ErrorKind::KeyMissing)) .and_then(|TypedHeader(Authorization(bearer))| bearer.token().trim().parse())?; @@ -183,17 +184,18 @@ impl Permissions { } #[async_trait] -impl FromRequest for User +impl FromRequestParts for User where - B: Send, + S: Send + Sync, + RouterState: FromRef, { type Rejection = Error; - async fn from_request(req: &mut RequestParts) -> Result { - let key = Key::from_request(req).await?; - let Extension(service) = Extension::>::from_request(req) - .await - .unwrap(); + async fn from_request_parts(parts: &mut Parts, state: &S) -> Result { + let key = Key::from_request_parts(parts, state).await?; + + let RouterState { service, .. } = RouterState::from_ref(state); + let user = User::retrieve_from_key(&service, key) .await // Absord any error into `Unauthorized` @@ -231,17 +233,19 @@ pub struct ScopedUser { } #[async_trait] -impl FromRequest for ScopedUser +impl FromRequestParts for ScopedUser where - B: Send, + S: Send + Sync, + RouterState: FromRef, { type Rejection = Error; - async fn from_request(req: &mut RequestParts) -> Result { - let user = User::from_request(req).await?; - let scope = match Path::::from_request(req).await { + async fn from_request_parts(parts: &mut Parts, state: &S) -> Result { + let user = User::from_request_parts(parts, state).await?; + + let scope = match Path::::from_request_parts(parts, state).await { Ok(Path(p)) => p, - Err(_) => Path::<(ProjectName, String)>::from_request(req) + Err(_) => Path::<(ProjectName, String)>::from_request_parts(parts, state) .await .map(|Path((p, _))| p) .unwrap(), @@ -260,14 +264,16 @@ pub struct Admin { } #[async_trait] -impl FromRequest for Admin +impl FromRequestParts for Admin where - B: Send, + S: Send + Sync, + RouterState: FromRef, { type Rejection = Error; - async fn from_request(req: &mut RequestParts) -> Result { - let user = User::from_request(req).await?; + async fn from_request_parts(parts: &mut Parts, state: &S) -> Result { + let user = User::from_request_parts(parts, state).await?; + if user.is_super_user() { Ok(Self { user }) } else { diff --git a/proto/Cargo.toml b/proto/Cargo.toml index 91d5352ee..93e6b5bdc 100644 --- a/proto/Cargo.toml +++ b/proto/Cargo.toml @@ -6,12 +6,12 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -prost = "0.11.0" -tonic = "0.8.0" +prost = "0.11.2" +tonic = "0.8.3" [dependencies.shuttle-common] version = "0.7.2" path = "../common" [build-dependencies] -tonic-build = "0.8.0" +tonic-build = "0.8.3" diff --git a/provisioner/Cargo.toml b/provisioner/Cargo.toml index 057619eed..8ce67fc36 100644 --- a/provisioner/Cargo.toml +++ b/provisioner/Cargo.toml @@ -7,30 +7,29 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -aws-config = "0.47.0" -aws-sdk-rds = "0.17.0" -aws-smithy-types = "0.47.0" +aws-config = "0.51.0" +aws-sdk-rds = "0.21.0" clap = { version = "3.2.17", features = ["derive", "env"] } -fqdn = "0.2.2" -mongodb = "2.3.0" -prost = "0.11.0" +fqdn = "0.2.3" +mongodb = "2.3.1" +prost = "0.11.2" rand = "0.8.5" -sqlx = { version = "0.6.1", features = ["postgres", "runtime-tokio-native-tls"] } -thiserror = "1.0.32" -tokio = { version = "1.20.1", features = ["macros", "rt-multi-thread"] } -tonic = "0.8.0" -tracing = "0.1.36" -tracing-subscriber = "0.3.15" +sqlx = { version = "0.6.2", features = ["postgres", "runtime-tokio-native-tls"] } +thiserror = "1.0.37" +tokio = { version = "1.22.0", features = ["macros", "rt-multi-thread"] } +tonic = "0.8.3" +tracing = "0.1.37" +tracing-subscriber = "0.3.16" [dependencies.shuttle-proto] version = "0.7.2" path = "../proto" [dev-dependencies] -ctor = "0.1.23" -once_cell = "1.13.1" +ctor = "0.1.26" +once_cell = "1.16.0" portpicker = "0.1.1" -serde_json = "1.0.83" +serde_json = "1.0.89" [build-dependencies] -tonic-build = "0.8.0" +tonic-build = "0.8.3" diff --git a/provisioner/src/lib.rs b/provisioner/src/lib.rs index 7c8b08a16..a877a6dd9 100644 --- a/provisioner/src/lib.rs +++ b/provisioner/src/lib.rs @@ -3,7 +3,6 @@ use std::time::Duration; pub use args::Args; use aws_config::timeout; use aws_sdk_rds::{error::ModifyDBInstanceErrorKind, model::DbInstance, types::SdkError, Client}; -use aws_smithy_types::tristate::TriState; pub use error::Error; use mongodb::{bson::doc, options::ClientOptions}; use rand::Rng; @@ -51,10 +50,10 @@ impl MyProvisioner { let mongodb_client = mongodb::Client::with_options(mongodb_options)?; // Default timeout is too long so lowering it - let api_timeout_config = timeout::Api::new() - .with_call_timeout(TriState::Set(Duration::from_secs(120))) - .with_call_attempt_timeout(TriState::Set(Duration::from_secs(120))); - let timeout_config = timeout::Config::new().with_api_timeouts(api_timeout_config); + let timeout_config = timeout::TimeoutConfig::builder() + .operation_timeout(Duration::from_secs(120)) + .operation_attempt_timeout(Duration::from_secs(120)) + .build(); let aws_config = aws_config::from_env() .timeout_config(timeout_config) diff --git a/resources/aws-rds/Cargo.toml b/resources/aws-rds/Cargo.toml index 9ce569b8b..45b0b4448 100644 --- a/resources/aws-rds/Cargo.toml +++ b/resources/aws-rds/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["shuttle-service", "rds"] async-trait = "0.1.56" paste = "1.0.7" shuttle-service = { path = "../../service", version = "0.7.2", default-features = false } -sqlx = { version = "0.6.0", features = ["runtime-tokio-native-tls"] } +sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"] } tokio = { version = "1.19.2", features = ["rt"] } [features] diff --git a/resources/shared-db/Cargo.toml b/resources/shared-db/Cargo.toml index 28122f62a..6254aa4b8 100644 --- a/resources/shared-db/Cargo.toml +++ b/resources/shared-db/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["shuttle-service", "database"] async-trait = "0.1.56" mongodb = { version = "2.3.0", optional = true } shuttle-service = { path = "../../service", version = "0.7.2", default-features = false } -sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls"], optional = true } +sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls"], optional = true } tokio = { version = "1.19.2", features = ["rt"] } [features] diff --git a/service/Cargo.toml b/service/Cargo.toml index 15d8dec19..844dade74 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -11,33 +11,34 @@ doctest = false [dependencies] actix-web = { version = "4.2.1", optional = true } -anyhow = "1.0.62" -async-trait = "0.1.57" -axum = { version = "0.5.15", optional = true } -bincode = { version = "1.2.1", optional = true } +anyhow = "1.0.66" +async-trait = "0.1.58" +axum = { version = "0.6.0", optional = true } +bincode = { version = "1.3.3", optional = true } +# todo: debug updating this to 0.66 cargo = { version = "0.64.0", optional = true } -cargo_metadata = "0.15.0" -chrono = "=0.4.22" +cargo_metadata = "0.15.2" +chrono = "0.4.23" crossbeam-channel = "0.5.6" -futures = { version = "0.3.23", features = ["std"] } -hyper = { version = "0.14.20", features = ["server", "tcp", "http1"], optional = true } -libloading = { version = "0.7.3", optional = true } +futures = { version = "0.3.25", features = ["std"] } +hyper = { version = "0.14.23", features = ["server", "tcp", "http1"], optional = true } +libloading = { version = "0.7.4", optional = true } pipe = "0.4.0" -poem = { version = "1.3.40", optional = true } +poem = { version = "1.3.49", optional = true } rocket = { version = "0.5.0-rc.2", optional = true } -salvo = { version = "0.34.3", optional = true } -serde_json = "1.0.83" +salvo = { version = "0.37.5", optional = true } +serde_json = "1.0.89" serenity = { version = "0.11.5", default-features = false, features = ["client", "gateway", "rustls_backend", "model"], optional = true } sync_wrapper = { version = "0.1.1", optional = true } -thiserror = "1.0.32" -thruster = { version = "1.2.6", optional = true } +thiserror = "1.0.37" +thruster = { version = "1.3.0", optional = true } tide = { version = "0.16.0", optional = true } -tokio = { version = "=1.20.1", features = ["rt", "rt-multi-thread", "sync"] } +tokio = { version = "=1.22.0", features = ["rt", "rt-multi-thread", "sync"] } tower = { version = "0.4.13", features = ["make"], optional = true } -tracing = "0.1.36" -tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } -uuid = { version = "1.1.2", features = ["v4"] } -warp = { version = "0.3.2", optional = true } +tracing = "0.1.37" +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } +uuid = { version = "1.2.2", features = ["v4"] } +warp = { version = "0.3.3", optional = true } # Tide does not have tokio support. So make sure async-std is compatible with tokio # https://github.com/http-rs/tide/issues/791 @@ -53,9 +54,9 @@ optional = true [dev-dependencies] portpicker = "0.1.1" -sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls", "postgres"] } -tokio = { version = "1.20.1", features = ["macros"] } -uuid = { version = "1.1.2", features = ["v4"] } +sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] } +tokio = { version = "1.22.0", features = ["macros"] } +uuid = { version = "1.2.2", features = ["v4"] } [dependencies.shuttle-common] version = "0.7.2" diff --git a/service/src/lib.rs b/service/src/lib.rs index 770808703..32ef94f4b 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -109,7 +109,7 @@ //! //! ```toml //! shuttle-shared-db = { version = "0.7.2", features = ["postgres"] } -//! sqlx = { version = "0.6.1", features = ["runtime-tokio-native-tls", "postgres"] } +//! sqlx = { version = "0.6.2", features = ["runtime-tokio-native-tls", "postgres"] } //! ``` //! //! Now update the `#[shuttle_service::main]` function to take in a `PgPool`: diff --git a/service/tests/resources/sleep-async/Cargo.toml b/service/tests/resources/sleep-async/Cargo.toml index 84f976cce..e9fa47aae 100644 --- a/service/tests/resources/sleep-async/Cargo.toml +++ b/service/tests/resources/sleep-async/Cargo.toml @@ -9,5 +9,5 @@ crate-type = ["cdylib"] [workspace] [dependencies] -tokio = { version = "1.0", features = ["time"]} +tokio = { version = "1.22.0", features = ["time"] } shuttle-service = { path = "../../../" } diff --git a/service/tests/resources/sqlx-pool/Cargo.toml b/service/tests/resources/sqlx-pool/Cargo.toml index e3672cfe1..14487f75a 100644 --- a/service/tests/resources/sqlx-pool/Cargo.toml +++ b/service/tests/resources/sqlx-pool/Cargo.toml @@ -11,4 +11,4 @@ crate-type = ["cdylib"] [dependencies] shuttle-service = { path = "../../../" } shuttle-shared-db = { path = "../../../../resources/shared-db", features = ["postgres"] } -sqlx = { version = "0.6", features = [ "runtime-tokio-native-tls" ] } +sqlx = { version = "0.6.2", features = [ "runtime-tokio-native-tls" ] }