From 3e9e0469f91247ec7983218a9060327ca7988443 Mon Sep 17 00:00:00 2001 From: Kasper Juul Hermansen Date: Tue, 15 Nov 2022 17:01:41 +0000 Subject: [PATCH] Update all dependencies --- Cargo.lock | 544 ++++++--------------------------- Cargo.toml | 18 +- como_api/Cargo.toml | 16 +- como_core/Cargo.toml | 16 +- como_domain/Cargo.toml | 8 +- como_gql/Cargo.toml | 16 +- como_infrastructure/Cargo.toml | 18 +- templates/local_up.Dockerfile | 2 +- 8 files changed, 147 insertions(+), 491 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 427de5d..d799335 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,20 +97,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.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c794e162a5eff65c72ef524dfe393eb923c354e350bb78b9c7383df13f3bc142" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "argon2" @@ -163,15 +154,16 @@ dependencies = [ [[package]] name = "async-graphql" -version = "4.0.6" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ecd9edbd48b68e44f81b720d83e670d876dce440856feee6c892c8cd3f6798" +checksum = "d9ed522678d412d77effe47b3c82314ac36952a35e6e852093dd48287c421f80" dependencies = [ "async-graphql-derive", "async-graphql-parser", "async-graphql-value", "async-stream", "async-trait", + "base64", "bytes", "fast_chemail", "fnv", @@ -186,6 +178,7 @@ dependencies = [ "regex", "serde", "serde_json", + "serde_urlencoded", "static_assertions", "tempfile", "thiserror", @@ -212,9 +205,9 @@ dependencies = [ [[package]] name = "async-graphql-derive" -version = "4.0.6" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8801127f6a7b3af410498d2f971ee6da8f12f9b0b784473da636ce04e5ac565" +checksum = "c121a894495d7d3fc3d4e15e0a9843e422e4d1d9e3c514d8062a1c94b35b005d" dependencies = [ "Inflector", "async-graphql-parser", @@ -228,9 +221,9 @@ dependencies = [ [[package]] name = "async-graphql-parser" -version = "4.0.6" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4097e2e3e313a9220df25485046b7749f4b8d749aba8ed7e09e929d60a643e3" +checksum = "6b6c386f398145c6180206c1869c2279f5a3d45db5be4e0266148c6ac5c6ad68" dependencies = [ "async-graphql-value", "pest", @@ -240,9 +233,9 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "4.0.6" +version = "4.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbb3f5e2eb77fbe173b102e3a9321a5f93a491f9c5ef3850e1155ae83c49e88" +checksum = "7a941b499fead4a3fb5392cabf42446566d18c86313f69f2deab69560394d65f" dependencies = [ "bytes", "indexmap", @@ -312,15 +305,6 @@ dependencies = [ "syn", ] -[[package]] -name = "atoi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5" -dependencies = [ - "num-traits", -] - [[package]] name = "atoi" version = "1.0.0" @@ -349,9 +333,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de18bc5f2e9df8f52da03856bf40e29b747de5a84e43aefff90e3dc4a21529b" +checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" dependencies = [ "async-trait", "axum-core", @@ -384,9 +368,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f44a0e6200e9d11a1cdc989e4b358f6e3d354fbf48478f345a17f4e43f8635" +checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc" dependencies = [ "async-trait", "bytes", @@ -394,6 +378,8 @@ dependencies = [ "http", "http-body", "mime", + "tower-layer", + "tower-service", ] [[package]] @@ -432,12 +418,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base64" version = "0.13.0" @@ -603,26 +583,24 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.22" +version = "4.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +checksum = "389ca505fd2c00136e0d0cd34bcd8b6bd0b59d5779aab396054b716334230c1c" dependencies = [ "atty", "bitflags", "clap_derive", "clap_lex", - "indexmap", "once_cell", "strsim", "termcolor", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" dependencies = [ "heck", "proc-macro-error", @@ -633,9 +611,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" dependencies = [ "os_str_bytes", ] @@ -660,7 +638,7 @@ dependencies = [ "rand_core", "serde", "serde_json", - "sqlx 0.6.1", + "sqlx", "tokio", "tower", "tower-http", @@ -691,7 +669,7 @@ dependencies = [ "rand_core", "serde", "serde_json", - "sqlx 0.6.1", + "sqlx", "tokio", "tower-http", "tracing", @@ -713,9 +691,9 @@ dependencies = [ "rust-argon2", "serde", "serde_json", - "sqlx 0.5.13", + "sqlx", "thiserror", - "time 0.2.27", + "time", "tokio", "tracing", "tracing-subscriber", @@ -752,7 +730,7 @@ dependencies = [ "rand_core", "serde", "serde_json", - "sqlx 0.6.1", + "sqlx", "tokio", "tower-http", "tracing", @@ -779,7 +757,7 @@ dependencies = [ "rand_core", "serde", "serde_json", - "sqlx 0.6.1", + "sqlx", "tokio", "tower-http", "tracing", @@ -787,12 +765,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -813,7 +785,7 @@ dependencies = [ "rand", "sha2 0.10.2", "subtle", - "time 0.3.14", + "time", "version_check", ] @@ -832,30 +804,15 @@ dependencies = [ "libc", ] -[[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" @@ -1012,12 +969,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "dotenv" version = "0.15.0" @@ -1118,9 +1069,9 @@ dependencies = [ [[package]] name = "fragile" -version = "1.2.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "futures" @@ -1253,15 +1204,6 @@ dependencies = [ "polyval", ] -[[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.3" @@ -1271,22 +1213,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.3", + "hashbrown", ] [[package]] @@ -1302,7 +1235,7 @@ dependencies = [ "http", "httpdate", "mime", - "sha1 0.10.4", + "sha1", ] [[package]] @@ -1472,7 +1405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.12.3", + "hashbrown", "serde", ] @@ -1639,9 +1572,9 @@ dependencies = [ [[package]] name = "mockall" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2be9a9090bc1cac2930688fa9478092a64c6a92ddc6ae0692d46b37d9cab709" +checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" dependencies = [ "cfg-if 1.0.0", "downcast", @@ -1654,9 +1587,9 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d702a0530a0141cf4ed147cf5ec7be6f2c187d4e37fcbefc39cf34116bfe8f" +checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" dependencies = [ "cfg-if 1.0.0", "proc-macro2", @@ -1698,6 +1631,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +[[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" @@ -1754,6 +1697,12 @@ version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking_lot" version = "0.11.2" @@ -1950,12 +1899,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "1.0.43" @@ -2086,28 +2029,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64", - "log", - "ring", - "sct 0.6.1", - "webpki 0.21.4", -] - [[package]] name = "rustls" version = "0.20.6" @@ -2116,8 +2037,8 @@ checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", - "sct 0.7.0", - "webpki 0.22.0", + "sct", + "webpki", ] [[package]] @@ -2141,16 +2062,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" @@ -2161,35 +2072,20 @@ dependencies = [ "untrusted", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" -version = "1.0.142" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.142" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", @@ -2198,9 +2094,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.83" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" +checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" dependencies = [ "itoa", "ryu", @@ -2230,15 +2126,6 @@ dependencies = [ "digest 0.10.3", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - [[package]] name = "sha1" version = "0.10.4" @@ -2250,12 +2137,6 @@ dependencies = [ "digest 0.10.3", ] -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.9.9" @@ -2346,77 +2227,14 @@ dependencies = [ "unicode_categories", ] -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" -dependencies = [ - "ahash", - "atoi 0.4.0", - "base64", - "bitflags", - "byteorder", - "bytes", - "crc 2.1.0", - "crossbeam-queue", - "dirs", - "either", - "event-listener", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-util", - "hashlink 0.7.0", - "hex", - "hkdf", - "hmac 0.12.1", - "indexmap", - "itoa", - "libc", - "log", - "md-5", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rand", - "rustls 0.19.1", - "serde", - "serde_json", - "sha-1", - "sha2 0.10.2", - "smallvec", - "sqlformat", - "sqlx-rt 0.5.13", - "stringprep", - "thiserror", - "time 0.2.27", - "tokio-stream", - "url", - "webpki 0.21.4", - "webpki-roots 0.21.1", - "whoami", + "sqlx-core", + "sqlx-macros", ] [[package]] @@ -2426,12 +2244,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c21d3b5e7cadfe9ba7cdc1295f72cc556c750b4419c27c219c0693198901f8e" dependencies = [ "ahash", - "atoi 1.0.0", + "atoi", "base64", "bitflags", "byteorder", "bytes", - "crc 3.0.0", + "crc", "crossbeam-queue", "dirs", "dotenvy", @@ -2441,7 +2259,7 @@ dependencies = [ "futures-core", "futures-intrusive", "futures-util", - "hashlink 0.8.0", + "hashlink", "hex", "hkdf", "hmac 0.12.1", @@ -2455,7 +2273,7 @@ dependencies = [ "paste", "percent-encoding", "rand", - "rustls 0.20.6", + "rustls", "rustls-pemfile", "serde", "serde_json", @@ -2463,35 +2281,17 @@ dependencies = [ "sha2 0.10.2", "smallvec", "sqlformat", - "sqlx-rt 0.6.1", + "sqlx-rt", "stringprep", "thiserror", + "time", "tokio-stream", "url", "uuid", - "webpki-roots 0.22.4", + "webpki-roots", "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", - "quote", - "sha2 0.10.2", - "sqlx-core 0.5.13", - "sqlx-rt 0.5.13", - "syn", - "url", -] - [[package]] name = "sqlx-macros" version = "0.6.1" @@ -2508,23 +2308,12 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.2", - "sqlx-core 0.6.1", - "sqlx-rt 0.6.1", + "sqlx-core", + "sqlx-rt", "syn", "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" @@ -2533,16 +2322,7 @@ checksum = "7be52fc7c96c136cedea840ed54f7d446ff31ad670c9dea95ebcb998530971a3" dependencies = [ "once_cell", "tokio", - "tokio-rustls 0.23.4", -] - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", + "tokio-rustls", ] [[package]] @@ -2551,55 +2331,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1 0.6.1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "stringprep" version = "0.1.2" @@ -2668,12 +2399,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" -[[package]] -name = "textwrap" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" - [[package]] name = "thiserror" version = "1.0.32" @@ -2703,21 +2428,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi", -] - [[package]] name = "time" version = "0.3.14" @@ -2727,17 +2437,7 @@ dependencies = [ "itoa", "libc", "num_threads", - "time-macros 0.2.4", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", + "time-macros", ] [[package]] @@ -2746,19 +2446,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -2776,9 +2463,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.1" +version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" dependencies = [ "autocfg", "bytes", @@ -2786,7 +2473,6 @@ dependencies = [ "memchr", "mio", "num_cpus", - "once_cell", "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", @@ -2806,26 +2492,15 @@ dependencies = [ "syn", ] -[[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]] @@ -2934,9 +2609,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", @@ -2947,9 +2622,9 @@ 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", "quote", @@ -2958,9 +2633,9 @@ dependencies = [ [[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", @@ -2979,12 +2654,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", @@ -3110,9 +2785,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.1.2" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" dependencies = [ "getrandom", "rand", @@ -3121,9 +2796,9 @@ dependencies = [ [[package]] name = "validator" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07b0a1390e01c0fc35ebb26b28ced33c9a3808f7f9fbe94d3cc01e233bfeed5" +checksum = "32ad5bf234c7d3ad1042e5252b7eddb2c4669ee23f32c7dd0e9b7705f07ef591" dependencies = [ "idna", "lazy_static", @@ -3137,9 +2812,9 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea7ed5e8cf2b6bdd64a6c4ce851da25388a89327b17b88424ceced6bd5017923" +checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" dependencies = [ "if_chain", "lazy_static", @@ -3153,9 +2828,9 @@ dependencies = [ [[package]] name = "validator_types" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ddf34293296847abfc1493b15c6e2f5d3cd19f57ad7d22673bf4c6278da329" +checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" dependencies = [ "proc-macro2", "syn", @@ -3253,16 +2928,6 @@ dependencies = [ "wasm-bindgen", ] -[[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" @@ -3273,22 +2938,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.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" dependencies = [ - "webpki 0.22.0", + "webpki", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 5d91817..8879f6f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,15 +21,15 @@ como_domain = { path = "como_domain" } como_infrastructure = { path = "como_infrastructure" } como_api = { path = "como_api" } -async-graphql = "4.0.6" +async-graphql = "4.0.16" async-graphql-axum = "*" -axum = "0.5.13" +axum = "0.5.17" axum-extra = { version = "*", features = ["cookie", "cookie-private"] } axum-sessions = { version = "*" } serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.68" -tokio = { version = "1.20.1", features = ["full"] } -uuid = { version = "1.1.2", features = ["v4", "fast-rng"] } +serde_json = "1.0.87" +tokio = { version = "1.21.2", features = ["full"] } +uuid = { version = "1.2.2", features = ["v4", "fast-rng"] } sqlx = { version = "0.6", features = [ "runtime-tokio-rustls", "postgres", @@ -37,12 +37,12 @@ sqlx = { version = "0.6", features = [ "uuid", "offline", ] } -anyhow = "1.0.60" +anyhow = "1.0.66" dotenv = "0.15.0" -tracing = "0.1.36" -tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } +tracing = "0.1.37" +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.3.4", features = ["full"] } argon2 = "0.4" rand_core = { version = "0.6", features = ["std"] } cookie = { version = "0.16", features = ["secure", "percent-encode"] } -clap = { version = "3", features = ["derive", "env"] } +clap = { version = "4", features = ["derive", "env"] } diff --git a/como_api/Cargo.toml b/como_api/Cargo.toml index 78fde40..f94e47e 100644 --- a/como_api/Cargo.toml +++ b/como_api/Cargo.toml @@ -11,16 +11,16 @@ como_core = { path = "../como_core" } como_domain = { path = "../como_domain" } como_infrastructure = { path = "../como_infrastructure" } -async-graphql = "4.0.6" +async-graphql = "4.0.16" async-graphql-axum = "*" -axum = "0.5.13" +axum = "0.5.17" axum-extra = { version = "*", features = ["cookie", "cookie-private"] } axum-sessions = { version = "*" } serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.68" +serde_json = "1.0.87" -tokio = { version = "1.20.1", features = ["full"] } -uuid = { version = "1.1.2", features = ["v4", "fast-rng"] } +tokio = { version = "1.21.2", features = ["full"] } +uuid = { version = "1.2.2", features = ["v4", "fast-rng"] } sqlx = { version = "0.6", features = [ "runtime-tokio-rustls", "postgres", @@ -28,10 +28,10 @@ sqlx = { version = "0.6", features = [ "uuid", "offline", ] } -anyhow = "1.0.60" +anyhow = "1.0.66" dotenv = "0.15.0" -tracing = "0.1.36" -tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } +tracing = "0.1.37" +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } argon2 = "0.4" rand_core = { version = "0.6", features = ["std"] } cookie = { version = "0.16", features = ["secure", "percent-encode"] } diff --git a/como_core/Cargo.toml b/como_core/Cargo.toml index 63d202a..0ca22e4 100644 --- a/como_core/Cargo.toml +++ b/como_core/Cargo.toml @@ -8,24 +8,24 @@ edition = "2021" [dependencies] como_domain = { path = "../como_domain" } tokio = { version = "1", features = ["full"] } -axum = "0.5.1" +axum = "0.5.17" # utilty crates -serde = { version = "1.0.136", features = ["derive"] } -sqlx = { version = "0.5", features = [ +serde = { version = "1.0.147", features = ["derive"] } +sqlx = { version = "0.6", features = [ "runtime-tokio-rustls", "postgres", "time", ] } -serde_json = "1.0.81" +serde_json = "1.0.87" dotenv = "0.15.0" tracing = "0.1" tracing-subscriber = "0.3" anyhow = "1" -validator = { version = "0.15", features = ["derive"] } +validator = { version = "0.16", features = ["derive"] } async-trait = "0.1" thiserror = "1" rust-argon2 = "1.0" -clap = { version = "3", features = ["derive", "env"] } -mockall = "0.11.1" -time = "0.2" +clap = { version = "4", features = ["derive", "env"] } +mockall = "0.11.3" +time = "0.3" diff --git a/como_domain/Cargo.toml b/como_domain/Cargo.toml index ce8b82c..4f5cd15 100644 --- a/como_domain/Cargo.toml +++ b/como_domain/Cargo.toml @@ -6,8 +6,8 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -async-graphql = { version = "4.0.6", features = ["uuid"] } -anyhow = "1.0.60" +async-graphql = { version = "4.0.16", features = ["uuid"] } +anyhow = "1.0.66" serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.68" -uuid = { version = "1.1.2", features = ["v4", "fast-rng", "serde"] } +serde_json = "1.0.87" +uuid = { version = "1.2.2", features = ["v4", "fast-rng", "serde"] } diff --git a/como_gql/Cargo.toml b/como_gql/Cargo.toml index e4f8f16..8799dc0 100644 --- a/como_gql/Cargo.toml +++ b/como_gql/Cargo.toml @@ -10,15 +10,15 @@ como_core = { path = "../como_core" } como_domain = { path = "../como_domain" } como_infrastructure = { path = "../como_infrastructure" } -async-graphql = "4.0.6" +async-graphql = "4.0.16" async-graphql-axum = "*" -axum = "0.5.13" +axum = "0.5.17" axum-extra = { version = "*", features = ["cookie", "cookie-private"] } axum-sessions = { version = "*" } serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.68" -tokio = { version = "1.20.1", features = ["full"] } -uuid = { version = "1.1.2", features = ["v4", "fast-rng"] } +serde_json = "1.0.87" +tokio = { version = "1.21.2", features = ["full"] } +uuid = { version = "1.2.2", features = ["v4", "fast-rng"] } sqlx = { version = "0.6", features = [ "runtime-tokio-rustls", "postgres", @@ -26,10 +26,10 @@ sqlx = { version = "0.6", features = [ "uuid", "offline", ] } -anyhow = "1.0.60" +anyhow = "1.0.66" dotenv = "0.15.0" -tracing = "0.1.36" -tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } +tracing = "0.1.37" +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.3.4", features = ["full"] } argon2 = "0.4" rand_core = { version = "0.6", features = ["std"] } diff --git a/como_infrastructure/Cargo.toml b/como_infrastructure/Cargo.toml index 7c22b00..8f9d14f 100644 --- a/como_infrastructure/Cargo.toml +++ b/como_infrastructure/Cargo.toml @@ -9,15 +9,15 @@ edition = "2021" como_core = { path = "../como_core" } como_domain = { path = "../como_domain" } -async-graphql = "4.0.6" +async-graphql = "4.0.16" async-graphql-axum = "*" -axum = "0.5.13" +axum = "0.5.17" axum-extra = { version = "*", features = ["cookie", "cookie-private"] } axum-sessions = { version = "*" } serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0.68" -tokio = { version = "1.20.1", features = ["full"] } -uuid = { version = "1.1.2", features = ["v4", "fast-rng"] } +serde_json = "1.0.87" +tokio = { version = "1.21.2", features = ["full"] } +uuid = { version = "1.2.2", features = ["v4", "fast-rng"] } sqlx = { version = "0.6", features = [ "runtime-tokio-rustls", "postgres", @@ -25,12 +25,12 @@ sqlx = { version = "0.6", features = [ "uuid", "offline", ] } -anyhow = "1.0.60" +anyhow = "1.0.66" dotenv = "0.15.0" -tracing = "0.1.36" -tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } +tracing = "0.1.37" +tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.3.4", features = ["full"] } argon2 = "0.4" rand_core = { version = "0.6", features = ["std"] } cookie = { version = "0.16", features = ["secure", "percent-encode"] } -clap = { version = "3", features = ["derive", "env"] } +clap = { version = "4", features = ["derive", "env"] } diff --git a/templates/local_up.Dockerfile b/templates/local_up.Dockerfile index c6f6be7..258b8a3 100644 --- a/templates/local_up.Dockerfile +++ b/templates/local_up.Dockerfile @@ -1,3 +1,3 @@ -FROM postgres:14-alpine +FROM postgres:15-alpine COPY *.sh /docker-entrypoint-initdb.d/ -- 2.45.2