diff --git a/Cargo.lock b/Cargo.lock index 54d49ab4f3..ff777f8f62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,7 +11,7 @@ dependencies = [ "actix-rt", "actix_derive", "bitflags 1.3.2", - "bytes 1.4.0", + "bytes", "crossbeam-channel", "futures-core", "futures-sink", @@ -20,27 +20,27 @@ dependencies = [ "log", "once_cell", "parking_lot", - "pin-project-lite 0.2.9", + "pin-project-lite", "smallvec", - "tokio 1.28.2", - "tokio-util 0.7.8", + "tokio", + "tokio-util", ] [[package]] name = "actix-codec" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" +checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" dependencies = [ "bitflags 1.3.2", - "bytes 1.4.0", + "bytes", "futures-core", "futures-sink", - "log", "memchr", - "pin-project-lite 0.2.9", - "tokio 1.28.2", - "tokio-util 0.7.8", + "pin-project-lite", + "tokio", + "tokio-util", + "tracing", ] [[package]] @@ -72,27 +72,27 @@ dependencies = [ "base64 0.21.2", "bitflags 1.3.2", "brotli", - "bytes 1.4.0", + "bytes", "bytestring", "derive_more", "encoding_rs", "flate2", "futures-core", - "h2 0.3.19", + "h2", "http", "httparse", - "httpdate 1.0.2", - "itoa 1.0.6", + "httpdate", + "itoa", "language-tags", "local-channel", "mime", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "rand 0.8.5", "sha1", "smallvec", - "tokio 1.28.2", - "tokio-util 0.7.8", + "tokio", + "tokio-util", "tracing", "zstd", ] @@ -116,7 +116,7 @@ dependencies = [ "actix-multipart-derive", "actix-utils", "actix-web", - "bytes 1.4.0", + "bytes", "derive_more", "futures-core", "futures-util", @@ -129,7 +129,7 @@ dependencies = [ "serde_json", "serde_plain", "tempfile", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -166,7 +166,7 @@ checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" dependencies = [ "actix-macros", "futures-core", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -180,10 +180,10 @@ dependencies = [ "actix-utils", "futures-core", "futures-util", - "mio 0.8.6", + "mio", "num_cpus", - "socket2 0.4.9", - "tokio 1.28.2", + "socket2", + "tokio", "tracing", ] @@ -195,7 +195,7 @@ checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" dependencies = [ "futures-core", "paste", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] @@ -211,9 +211,9 @@ dependencies = [ "futures-core", "http", "log", - "pin-project-lite 0.2.9", + "pin-project-lite", "tokio-rustls", - "tokio-util 0.7.8", + "tokio-util", "webpki-roots", ] @@ -224,7 +224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" dependencies = [ "local-waker", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] @@ -243,27 +243,27 @@ dependencies = [ "actix-utils", "actix-web-codegen", "ahash 0.7.6", - "bytes 1.4.0", + "bytes", "bytestring", - "cfg-if 1.0.0", + "cfg-if", "cookie", "derive_more", "encoding_rs", "futures-core", "futures-util", "http", - "itoa 1.0.6", + "itoa", "language-tags", "log", "mime", "once_cell", - "pin-project-lite 0.2.9", + "pin-project-lite", "regex", "serde", "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.4.9", + "socket2", "time 0.3.21", "url", ] @@ -303,7 +303,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", "once_cell", "version_check", ] @@ -314,17 +314,17 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "cfg-if 1.0.0", - "getrandom 0.2.9", + "cfg-if", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] @@ -344,6 +344,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -361,9 +367,9 @@ checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "api_models" @@ -373,12 +379,11 @@ dependencies = [ "cards", "common_enums", "common_utils", - "error-stack", "frunk", "frunk_core", "masking", "mime", - "reqwest 0.11.18", + "reqwest", "router_derive", "serde", "serde_json", @@ -406,12 +411,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.2" @@ -431,13 +430,13 @@ dependencies = [ [[package]] name = "async-bb8-diesel" version = "0.1.0" -source = "git+https://github.com/juspay/async-bb8-diesel?rev=9a71d142726dbc33f41c1fd935ddaa79841c7be5#9a71d142726dbc33f41c1fd935ddaa79841c7be5" +source = "git+https://github.com/oxidecomputer/async-bb8-diesel?rev=be3d9bce50051d8c0e0c06078e8066cc27db3001#be3d9bce50051d8c0e0c06078e8066cc27db3001" dependencies = [ "async-trait", "bb8", "diesel", "thiserror", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -460,8 +459,8 @@ dependencies = [ "flate2", "futures-core", "memchr", - "pin-project-lite 0.2.9", - "tokio 1.28.2", + "pin-project-lite", + "tokio", ] [[package]] @@ -472,7 +471,7 @@ checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "futures-lite", "log", @@ -480,7 +479,7 @@ dependencies = [ "polling", "rustix", "slab", - "socket2 0.4.9", + "socket2", "waker-fn", ] @@ -501,7 +500,7 @@ checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] @@ -534,7 +533,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi 0.1.19", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -557,25 +556,25 @@ dependencies = [ "actix-utils", "ahash 0.7.6", "base64 0.21.2", - "bytes 1.4.0", - "cfg-if 1.0.0", + "bytes", + "cfg-if", "cookie", "derive_more", "futures-core", "futures-util", - "h2 0.3.19", + "h2", "http", - "itoa 1.0.6", + "itoa", "log", "mime", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "rand 0.8.5", "rustls", "serde", "serde_json", "serde_urlencoded", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -595,14 +594,14 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes", "fastrand", "hex", "http", - "hyper 0.14.26", + "hyper", "ring", "time 0.3.21", - "tokio 1.28.2", + "tokio", "tower", "tracing", "zeroize", @@ -617,7 +616,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-types", "fastrand", - "tokio 1.28.2", + "tokio", "tracing", "zeroize", ] @@ -646,20 +645,20 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes", "http", - "http-body 0.4.5", + "http-body", "lazy_static", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "tracing", ] [[package]] name = "aws-sdk-kms" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c902d7d6aefbfe04cd5a5e9eec9f2230a635d9b8b23c83e6490b743ce2a230f5" +checksum = "545335abd7c6ef7285d2972a67b9f8279ff5fec8bbb3ffc637fa436ba1e6e434" dependencies = [ "aws-credential-types", "aws-endpoint", @@ -672,7 +671,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes", "http", "regex", "tokio-stream", @@ -682,9 +681,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "0.25.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "392b9811ca489747ac84349790e49deaa1f16631949e7dd4156000251c260eae" +checksum = "fba197193cbb4bcb6aad8d99796b2291f36fa89562ded5d4501363055b0de89f" dependencies = [ "aws-credential-types", "aws-endpoint", @@ -701,9 +700,9 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.4.0", + "bytes", "http", - "http-body 0.4.5", + "http-body", "once_cell", "percent-encoding", "regex", @@ -715,9 +714,9 @@ dependencies = [ [[package]] name = "aws-sdk-sesv2" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28ec96086c4bda28c512b10c5c951d031651be454a512e511cf5fe91b21b9cc9" +checksum = "4891169a246b580136f4d3682c11a68b710bdc1027dd7774023fa651a87f10b6" dependencies = [ "aws-credential-types", "aws-endpoint", @@ -730,7 +729,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes", "http", "regex", "tokio-stream", @@ -755,7 +754,7 @@ dependencies = [ "aws-smithy-json", "aws-smithy-types", "aws-types", - "bytes 1.4.0", + "bytes", "http", "regex", "tokio-stream", @@ -782,7 +781,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.4.0", + "bytes", "http", "regex", "tower", @@ -812,7 +811,7 @@ checksum = "9d2ce6f507be68e968a33485ced670111d1cbad161ddbbab1e313c03d37d8f4c" dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", - "bytes 1.4.0", + "bytes", "form_urlencoded", "hex", "hmac", @@ -832,8 +831,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13bda3996044c202d75b91afeb11a9afae9db9a721c6a7a427410018e286b880" dependencies = [ "futures-util", - "pin-project-lite 0.2.9", - "tokio 1.28.2", + "pin-project-lite", + "tokio", "tokio-stream", ] @@ -845,14 +844,14 @@ checksum = "07ed8b96d95402f3f6b8b57eb4e0e45ee365f78b1a924faf20ff6e97abf1eae6" dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes 1.4.0", + "bytes", "crc32c", "crc32fast", "hex", "http", - "http-body 0.4.5", + "http-body", "md-5", - "pin-project-lite 0.2.9", + "pin-project-lite", "sha1", "sha2", "tracing", @@ -868,16 +867,16 @@ dependencies = [ "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-types", - "bytes 1.4.0", + "bytes", "fastrand", "http", - "http-body 0.4.5", - "hyper 0.14.26", + "http-body", + "hyper", "hyper-rustls", "lazy_static", - "pin-project-lite 0.2.9", + "pin-project-lite", "rustls", - "tokio 1.28.2", + "tokio", "tower", "tracing", ] @@ -889,7 +888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460c8da5110835e3d9a717c61f5556b20d03c32a1dec57f8fc559b360f733bb8" dependencies = [ "aws-smithy-types", - "bytes 1.4.0", + "bytes", "crc32fast", ] @@ -901,18 +900,18 @@ checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28" dependencies = [ "aws-smithy-eventstream", "aws-smithy-types", - "bytes 1.4.0", + "bytes", "bytes-utils", "futures-core", "http", - "http-body 0.4.5", - "hyper 0.14.26", + "http-body", + "hyper", "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "pin-utils", - "tokio 1.28.2", - "tokio-util 0.7.8", + "tokio", + "tokio-util", "tracing", ] @@ -924,10 +923,10 @@ checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9" dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes 1.4.0", + "bytes", "http", - "http-body 0.4.5", - "pin-project-lite 0.2.9", + "http-body", + "pin-project-lite", "tower", "tracing", ] @@ -958,7 +957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16a3d0bf4f324f4ef9793b86a1701d9700fbcdbd12a846da45eed104c634c6e8" dependencies = [ "base64-simd", - "itoa 1.0.6", + "itoa", "num-integer", "ryu", "time 0.3.21", @@ -991,24 +990,24 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b32c5ea3aabaf4deb5f5ced2d688ec0844c881c9e6c696a8b769a05fc691e62" +checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core", "bitflags 1.3.2", - "bytes 1.4.0", + "bytes", "futures-util", "http", - "http-body 0.4.5", - "hyper 0.14.26", - "itoa 1.0.6", + "http-body", + "hyper", + "itoa", "matchit", "memchr", "mime", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "rustversion", "serde", "sync_wrapper", @@ -1024,10 +1023,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.4.0", + "bytes", "futures-util", "http", - "http-body 0.4.5", + "http-body", "mime", "rustversion", "tower-layer", @@ -1058,15 +1057,15 @@ dependencies = [ [[package]] name = "bb8" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1627eccf3aa91405435ba240be23513eeca466b5dc33866422672264de061582" +checksum = "98b4b0f25f18bcdc3ac72bdb486ed0acf7e185221fd4dc985bc15db5800b0ba2" dependencies = [ "async-trait", "futures-channel", "futures-util", "parking_lot", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -1096,17 +1095,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "constant_time_eq 0.1.5", -] - [[package]] name = "blake3" version = "1.3.3" @@ -1114,10 +1102,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" dependencies = [ "arrayref", - "arrayvec 0.7.2", + "arrayvec", "cc", - "cfg-if 1.0.0", - "constant_time_eq 0.2.5", + "cfg-if", + "constant_time_eq", "digest", ] @@ -1169,12 +1157,6 @@ version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - [[package]] name = "bytes" version = "1.4.0" @@ -1187,7 +1169,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" dependencies = [ - "bytes 1.4.0", + "bytes", "either", ] @@ -1197,7 +1179,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae" dependencies = [ - "bytes 1.4.0", + "bytes", ] [[package]] @@ -1240,7 +1222,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.17", + "semver", "serde", "serde_json", ] @@ -1253,7 +1235,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.17", + "semver", "serde", "serde_json", "thiserror", @@ -1279,12 +1261,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -1293,25 +1269,25 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.45", "wasm-bindgen", - "winapi 0.3.9", + "winapi", ] [[package]] name = "clap" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "401a4694d2bf92537b6867d94de48c4842089645fdcdf6c71865b175d836e9c2" dependencies = [ "clap_builder", "clap_derive", @@ -1320,9 +1296,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980" dependencies = [ "anstyle", "bitflags 1.3.2", @@ -1331,9 +1307,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" dependencies = [ "heck", "proc-macro2", @@ -1347,27 +1323,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi 0.3.9", -] - [[package]] name = "common_enums" version = "0.1.0" @@ -1385,7 +1340,7 @@ name = "common_utils" version = "0.1.0" dependencies = [ "async-trait", - "bytes 1.4.0", + "bytes", "diesel", "error-stack", "fake", @@ -1408,7 +1363,7 @@ dependencies = [ "signal-hook-tokio", "thiserror", "time 0.3.21", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -1439,12 +1394,6 @@ dependencies = [ "yaml-rust", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.2.5" @@ -1520,7 +1469,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1529,7 +1478,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1540,7 +1489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset", "scopeguard", @@ -1552,7 +1501,7 @@ version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1565,71 +1514,6 @@ dependencies = [ "typenum", ] -[[package]] -name = "csv" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" -dependencies = [ - "csv-core", - "itoa 1.0.6", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 2.0.18", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - [[package]] name = "darling" version = "0.14.4" @@ -1706,7 +1590,7 @@ version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "hashbrown", "lock_api", "once_cell", @@ -1723,7 +1607,7 @@ dependencies = [ "deadpool-runtime", "num_cpus", "retain_mut", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -1765,7 +1649,7 @@ dependencies = [ "bitflags 2.3.1", "byteorder", "diesel_derives", - "itoa 1.0.6", + "itoa", "pq-sys", "r2d2", "serde_json", @@ -1810,17 +1694,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af83450b771231745d43edf36dc9b7813ab83be5e8cbea344ccced1a09dfebcd" -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users 0.3.5", - "winapi 0.3.9", -] - [[package]] name = "dirs" version = "4.0.0" @@ -1837,8 +1710,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users 0.4.3", - "winapi 0.3.9", + "redox_users", + "winapi", ] [[package]] @@ -1867,7 +1740,7 @@ dependencies = [ "serde_path_to_error", "storage_models", "thiserror", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -1882,19 +1755,13 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - [[package]] name = "encoding_rs" version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1975,7 +1842,7 @@ dependencies = [ "router_env", "serde", "thiserror", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -1999,13 +1866,13 @@ dependencies = [ "futures-core", "futures-util", "http", - "hyper 0.14.26", + "hyper", "hyper-rustls", "mime", "serde", "serde_json", "time 0.3.21", - "tokio 1.28.2", + "tokio", "url", "webdriver", ] @@ -2021,9 +1888,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -2061,9 +1928,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -2077,9 +1944,9 @@ dependencies = [ "arc-swap", "arcstr", "async-trait", - "bytes 1.4.0", + "bytes", "bytes-utils", - "cfg-if 1.0.0", + "cfg-if", "float-cmp", "futures", "lazy_static", @@ -2088,11 +1955,11 @@ dependencies = [ "pretty_env_logger", "rand 0.8.5", "redis-protocol", - "semver 1.0.17", + "semver", "sha-1", - "tokio 1.28.2", + "tokio", "tokio-stream", - "tokio-util 0.7.8", + "tokio-util", "tracing", "tracing-futures", "url", @@ -2162,22 +2029,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags 1.3.2", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - [[package]] name = "futures" version = "0.3.28" @@ -2237,7 +2088,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.9", + "pin-project-lite", "waker-fn", ] @@ -2283,7 +2134,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite", "pin-utils", "slab", ] @@ -2305,7 +2156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "windows-targets 0.48.0", + "windows-targets", ] [[package]] @@ -2314,27 +2165,27 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] name = "git2" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5" +checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" dependencies = [ "bitflags 1.3.2", "libc", @@ -2349,33 +2200,13 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "h2" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio 0.2.25", - "tokio-util 0.3.1", - "tracing", - "tracing-futures", -] - [[package]] name = "h2" version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ - "bytes 1.4.0", + "bytes", "fnv", "futures-core", "futures-sink", @@ -2383,8 +2214,8 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.28.2", - "tokio-util 0.7.8", + "tokio", + "tokio-util", "tracing", ] @@ -2448,19 +2279,9 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.4.0", + "bytes", "fnv", - "itoa 1.0.6", -] - -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.6", - "http", + "itoa", ] [[package]] @@ -2469,9 +2290,9 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.4.0", + "bytes", "http", - "pin-project-lite 0.2.9", + "pin-project-lite", ] [[package]] @@ -2486,7 +2307,7 @@ dependencies = [ "futures-lite", "http", "infer 0.2.3", - "pin-project-lite 0.2.9", + "pin-project-lite", "rand 0.7.3", "serde", "serde_json", @@ -2501,12 +2322,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - [[package]] name = "httpdate" version = "1.0.2" @@ -2522,49 +2337,25 @@ dependencies = [ "quick-error", ] -[[package]] -name = "hyper" -version = "0.13.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -dependencies = [ - "bytes 0.5.6", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.2.7", - "http", - "http-body 0.3.1", - "httparse", - "httpdate 0.3.2", - "itoa 0.4.8", - "pin-project", - "socket2 0.3.19", - "tokio 0.2.25", - "tower-service", - "tracing", - "want", -] - [[package]] name = "hyper" version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.19", + "h2", "http", - "http-body 0.4.5", + "http-body", "httparse", - "httpdate 1.0.2", - "itoa 1.0.6", - "pin-project-lite 0.2.9", - "socket2 0.4.9", - "tokio 1.28.2", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", "tower-service", "tracing", "want", @@ -2577,11 +2368,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", - "hyper 0.14.26", + "hyper", "log", "rustls", "rustls-native-certs", - "tokio 1.28.2", + "tokio", "tokio-rustls", ] @@ -2591,35 +2382,22 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper 0.14.26", - "pin-project-lite 0.2.9", - "tokio 1.28.2", + "hyper", + "pin-project-lite", + "tokio", "tokio-io-timeout", ] -[[package]] -name = "hyper-tls" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" -dependencies = [ - "bytes 0.5.6", - "hyper 0.13.10", - "native-tls", - "tokio 0.2.25", - "tokio-tls", -] - [[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.4.0", - "hyper 0.14.26", + "bytes", + "hyper", "native-tls", - "tokio 1.28.2", + "tokio", "tokio-native-tls", ] @@ -2639,12 +2417,11 @@ dependencies = [ [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -2655,9 +2432,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2695,29 +2472,20 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.1", "libc", "windows-sys 0.48.0", ] -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - [[package]] name = "ipnet" version = "2.7.2" @@ -2733,12 +2501,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.6" @@ -2806,16 +2568,6 @@ dependencies = [ "simple_asn1", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "language-tags" version = "0.3.2" @@ -2830,15 +2582,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.146" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "libgit2-sys" -version = "0.15.1+1.6.4" +version = "0.15.2+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7" +checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" dependencies = [ "cc", "libc", @@ -2848,15 +2600,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libmimalloc-sys" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a558e3d911bc3c7bfc8c78bc580b404d6e51c1cefbf656e176a94b49b0df40" +checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" dependencies = [ "cc", "libc", @@ -2864,9 +2616,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -2874,15 +2626,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2891,9 +2634,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "literally" @@ -2921,9 +2664,9 @@ checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2931,12 +2674,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "luhn" @@ -2956,17 +2696,11 @@ dependencies = [ "libc", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "masking" version = "0.1.0" dependencies = [ - "bytes 1.4.0", + "bytes", "diesel", "serde", "serde_json", @@ -2997,7 +2731,7 @@ checksum = "b0bab19cef8a7fe1c18a43e881793bfc9d4ea984befec3ae5bd0415abf3ecf00" dependencies = [ "actix-web", "futures-util", - "itoa 1.0.6", + "itoa", "maud_macros", ] @@ -3045,9 +2779,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d88dad3f985ec267a3fcb7a1726f5cb1a7e8cad8b646e70a84f967210df23da" +checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" dependencies = [ "libmimalloc-sys", ] @@ -3076,61 +2810,30 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.6.23" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "windows-sys 0.48.0", ] [[package]] name = "moka" -version = "0.10.2" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d3b8e76a2e4b17de765db9432e377a171c42fbe0512b8bc860ff1bfe2e273b" +checksum = "36506f2f935238463605f3bb13b362f1949daafc3b347d05d60ae08836db2bd2" dependencies = [ "async-io", "async-lock", @@ -3179,17 +2882,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "net2" -version = "0.2.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - [[package]] name = "nom" version = "7.1.3" @@ -3207,7 +2899,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ "overload", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3251,44 +2943,20 @@ dependencies = [ "libc", ] -[[package]] -name = "oas3" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8d29c198db98412285776c0ff6acdf24b26591730ace3580d1afe9edcbde07" -dependencies = [ - "bytes 0.5.6", - "colored", - "derive_more", - "http", - "lazy_static", - "log", - "maplit", - "prettytable-rs", - "regex", - "reqwest 0.10.10", - "semver 0.11.0", - "serde", - "serde_derive", - "serde_json", - "serde_yaml", - "url", -] - [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.52" +version = "0.10.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" +checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" dependencies = [ "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -3315,9 +2983,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.87" +version = "0.9.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" +checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" dependencies = [ "cc", "libc", @@ -3349,7 +3017,7 @@ dependencies = [ "opentelemetry-proto", "prost", "thiserror", - "tokio 1.28.2", + "tokio", "tonic", ] @@ -3377,7 +3045,7 @@ dependencies = [ "futures-util", "indexmap", "once_cell", - "pin-project-lite 0.2.9", + "pin-project-lite", "thiserror", "urlencoding", ] @@ -3400,7 +3068,7 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "thiserror", - "tokio 1.28.2", + "tokio", "tokio-stream", ] @@ -3444,15 +3112,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.45.0", + "windows-targets", ] [[package]] @@ -3484,15 +3152,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" +checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" dependencies = [ "thiserror", "ucd-trie", @@ -3500,9 +3168,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" +checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" dependencies = [ "pest", "pest_generator", @@ -3510,9 +3178,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" +checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" dependencies = [ "pest", "pest_meta", @@ -3523,9 +3191,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" +checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" dependencies = [ "once_cell", "pest", @@ -3552,12 +3220,6 @@ dependencies = [ "syn 2.0.18", ] -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - [[package]] name = "pin-project-lite" version = "0.2.9" @@ -3572,23 +3234,23 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "polling" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.9", + "pin-project-lite", "windows-sys 0.48.0", ] @@ -3617,20 +3279,6 @@ dependencies = [ "log", ] -[[package]] -name = "prettytable-rs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e" -dependencies = [ - "atty", - "csv", - "encode_unicode", - "lazy_static", - "term", - "unicode-width", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3696,7 +3344,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.4.0", + "bytes", "prost-derive", ] @@ -3715,9 +3363,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ "bitflags 1.3.2", "memchr", @@ -3726,9 +3374,9 @@ dependencies = [ [[package]] name = "quanta" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc73c42f9314c4bdce450c77e6f09ecbddefbeddb1b5979ded332a3913ded33" +checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" dependencies = [ "crossbeam-utils", "libc", @@ -3737,7 +3385,7 @@ dependencies = [ "raw-cpuid", "wasi 0.11.0+wasi-snapshot-preview1", "web-sys", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3835,7 +3483,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] @@ -3871,7 +3519,7 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c31deddf734dc0a39d3112e73490e88b61a05e83e074d211f348404cee4d2c6" dependencies = [ - "bytes 1.4.0", + "bytes", "bytes-utils", "cookie-factory", "crc16", @@ -3883,7 +3531,6 @@ dependencies = [ name = "redis_interface" version = "0.1.0" dependencies = [ - "async-trait", "common_utils", "error-stack", "fred", @@ -3891,15 +3538,9 @@ dependencies = [ "router_env", "serde", "thiserror", - "tokio 1.28.2", + "tokio", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.16" @@ -3918,33 +3559,22 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_users" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" -dependencies = [ - "getrandom 0.1.16", - "redox_syscall 0.1.57", - "rust-argon2", -] - [[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.8.3" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ "aho-corasick", "memchr", @@ -3972,42 +3602,6 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" -[[package]] -name = "reqwest" -version = "0.10.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" -dependencies = [ - "base64 0.13.1", - "bytes 0.5.6", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "http-body 0.3.1", - "hyper 0.13.10", - "hyper-tls 0.4.3", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "mime_guess", - "native-tls", - "percent-encoding", - "pin-project-lite 0.2.9", - "serde", - "serde_json", - "serde_urlencoded", - "tokio 0.2.25", - "tokio-tls", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.7.0", -] - [[package]] name = "reqwest" version = "0.11.18" @@ -4016,15 +3610,15 @@ checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "async-compression", "base64 0.21.2", - "bytes 1.4.0", + "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.19", + "h2", "http", - "http-body 0.4.5", - "hyper 0.14.26", - "hyper-tls 0.5.0", + "http-body", + "hyper", + "hyper-tls", "ipnet", "js-sys", "log", @@ -4033,19 +3627,19 @@ dependencies = [ "native-tls", "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", + "pin-project-lite", "serde", "serde_json", "serde_urlencoded", - "tokio 1.28.2", + "tokio", "tokio-native-tls", - "tokio-util 0.7.8", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.10.1", + "winreg", ] [[package]] @@ -4066,7 +3660,7 @@ dependencies = [ "spin", "untrusted", "web-sys", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4099,7 +3693,7 @@ dependencies = [ "base64 0.21.2", "bb8", "blake3", - "bytes 1.4.0", + "bytes", "cards", "clap", "common_utils", @@ -4127,12 +3721,11 @@ dependencies = [ "moka", "nanoid", "num_cpus", - "oas3", "once_cell", "rand 0.8.5", "redis_interface", "regex", - "reqwest 0.11.18", + "reqwest", "ring", "router_derive", "router_env", @@ -4150,7 +3743,7 @@ dependencies = [ "thirtyfour", "thiserror", "time 0.3.21", - "tokio 1.28.2", + "tokio", "toml 0.7.4", "url", "utoipa", @@ -4189,7 +3782,7 @@ dependencies = [ "serde_path_to_error", "strum", "time 0.3.21", - "tokio 1.28.2", + "tokio", "tracing", "tracing-actix-web", "tracing-appender", @@ -4199,18 +3792,6 @@ dependencies = [ "vergen", ] -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64 0.13.1", - "blake2b_simd", - "constant_time_eq 0.1.5", - "crossbeam-utils", -] - [[package]] name = "rust-embed" version = "6.6.1" @@ -4252,7 +3833,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ordered-multimap", ] @@ -4268,14 +3849,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.17", + "semver", ] [[package]] name = "rustix" -version = "0.37.11" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags 1.3.2", "errno", @@ -4375,12 +3956,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - [[package]] name = "sct" version = "0.7.0" @@ -4414,15 +3989,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.17" @@ -4432,15 +3998,6 @@ dependencies = [ "serde", ] -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" version = "1.0.163" @@ -4468,7 +4025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "indexmap", - "itoa 1.0.6", + "itoa", "ryu", "serde", ] @@ -4540,18 +4097,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.6", + "itoa", "ryu", "serde", ] [[package]] name = "serde_with" -version = "2.3.3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" dependencies = [ - "base64 0.13.1", + "base64 0.21.2", "chrono", "hex", "indexmap", @@ -4563,9 +4120,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "2.3.3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" dependencies = [ "darling 0.20.1", "proc-macro2", @@ -4573,18 +4130,6 @@ dependencies = [ "syn 2.0.18", ] -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap", - "ryu", - "serde", - "yaml-rust", -] - [[package]] name = "serial_test" version = "2.0.0" @@ -4616,7 +4161,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -4627,7 +4172,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -4638,7 +4183,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -4658,7 +4203,7 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" dependencies = [ - "dirs 4.0.0", + "dirs", ] [[package]] @@ -4689,7 +4234,7 @@ dependencies = [ "futures-core", "libc", "signal-hook", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -4734,17 +4279,6 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - [[package]] name = "socket2" version = "0.4.9" @@ -4752,7 +4286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4766,14 +4300,12 @@ name = "storage_models" version = "0.1.0" dependencies = [ "async-bb8-diesel", - "async-trait", "common_enums", "common_utils", "diesel", "error-stack", "frunk", "frunk_core", - "hex", "masking", "router_derive", "router_env", @@ -4863,26 +4395,16 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ - "cfg-if 1.0.0", + "autocfg", + "cfg-if", "fastrand", "redox_syscall 0.3.5", "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder", - "dirs 1.0.5", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -4915,7 +4437,7 @@ dependencies = [ "stringmatch", "thirtyfour-macros", "thiserror", - "tokio 1.28.2", + "tokio", "url", "urlparse", ] @@ -4958,7 +4480,7 @@ version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] @@ -4970,7 +4492,7 @@ checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4979,7 +4501,7 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ - "itoa 1.0.6", + "itoa", "serde", "time-core", "time-macros", @@ -5015,23 +4537,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokio" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "iovec", - "lazy_static", - "memchr", - "mio 0.6.23", - "pin-project-lite 0.1.12", - "slab", -] - [[package]] name = "tokio" version = "1.28.2" @@ -5039,14 +4544,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", - "bytes 1.4.0", + "bytes", "libc", - "mio 0.8.6", + "mio", "num_cpus", "parking_lot", - "pin-project-lite 0.2.9", + "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -5057,8 +4562,8 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ - "pin-project-lite 0.2.9", - "tokio 1.28.2", + "pin-project-lite", + "tokio", ] [[package]] @@ -5079,7 +4584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" dependencies = [ "native-tls", - "tokio 1.28.2", + "tokio", ] [[package]] @@ -5089,7 +4594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls", - "tokio 1.28.2", + "tokio", "webpki", ] @@ -5100,32 +4605,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", - "tokio 1.28.2", -] - -[[package]] -name = "tokio-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" -dependencies = [ - "native-tls", - "tokio 0.2.25", -] - -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", + "pin-project-lite", + "tokio", ] [[package]] @@ -5134,11 +4615,11 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ - "bytes 1.4.0", + "bytes", "futures-core", "futures-sink", - "pin-project-lite 0.2.9", - "tokio 1.28.2", + "pin-project-lite", + "tokio", "tracing", ] @@ -5195,21 +4676,21 @@ dependencies = [ "async-trait", "axum", "base64 0.13.1", - "bytes 1.4.0", + "bytes", "futures-core", "futures-util", - "h2 0.3.19", + "h2", "http", - "http-body 0.4.5", - "hyper 0.14.26", + "http-body", + "hyper", "hyper-timeout", "percent-encoding", "pin-project", "prost", "prost-derive", - "tokio 1.28.2", + "tokio", "tokio-stream", - "tokio-util 0.7.8", + "tokio-util", "tower", "tower-layer", "tower-service", @@ -5227,11 +4708,11 @@ dependencies = [ "futures-util", "indexmap", "pin-project", - "pin-project-lite 0.2.9", + "pin-project-lite", "rand 0.8.5", "slab", - "tokio 1.28.2", - "tokio-util 0.7.8", + "tokio", + "tokio-util", "tower-layer", "tower-service", "tracing", @@ -5255,9 +4736,9 @@ version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", - "pin-project-lite 0.2.9", + "pin-project-lite", "tracing-attributes", "tracing-core", ] @@ -5440,12 +4921,6 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "unidecode" version = "0.3.0" @@ -5460,9 +4935,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -5528,7 +5003,7 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", "serde", ] @@ -5628,9 +5103,7 @@ version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ - "cfg-if 1.0.0", - "serde", - "serde_json", + "cfg-if", "wasm-bindgen-macro", ] @@ -5651,11 +5124,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -5692,9 +5165,9 @@ checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -5707,7 +5180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9973cb72c8587d5ad5efdb91e663d36177dc37725e6c90ca86c626b0cc45c93f" dependencies = [ "base64 0.13.1", - "bytes 1.4.0", + "bytes", "cookie", "http", "log", @@ -5738,12 +5211,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -5754,12 +5221,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -5772,7 +5233,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5787,7 +5248,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", + "windows-targets", ] [[package]] @@ -5805,37 +5266,13 @@ dependencies = [ "windows_x86_64_msvc 0.42.2", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets", ] [[package]] @@ -5946,22 +5383,13 @@ dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "winreg" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5977,23 +5405,13 @@ dependencies = [ "futures", "futures-timer", "http-types", - "hyper 0.14.26", + "hyper", "log", "once_cell", "regex", "serde", "serde_json", - "tokio 1.28.2", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", + "tokio", ] [[package]] @@ -6019,9 +5437,9 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" [[package]] name = "zip" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "byteorder", "crc32fast", diff --git a/Cargo.toml b/Cargo.toml index cc7cc81548..21e01cf4d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,9 @@ [workspace] resolver = "2" -members = ["crates/*", "examples/*"] +members = ["crates/*"] +package.edition = "2021" +package.rust-version = "1.65" +package.license = "Apache-2.0" [profile.release] strip = true diff --git a/crates/api_models/Cargo.toml b/crates/api_models/Cargo.toml index 7d52c2c729..fce4c06584 100644 --- a/crates/api_models/Cargo.toml +++ b/crates/api_models/Cargo.toml @@ -1,37 +1,35 @@ [package] name = "api_models" +description = "Request/response models for the `router` crate" version = "0.1.0" -edition = "2021" +edition.workspace = true +rust-version.workspace = true +readme = "README.md" +license.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [features] default = [] -errors = [ - "dep:actix-web", - "dep:reqwest", -] +errors = ["dep:actix-web", "dep:reqwest"] multiple_mca = [] dummy_connector = [] detailed_errors = [] [dependencies] actix-web = { version = "4.3.1", optional = true } -error-stack = "0.3.1" frunk = "0.4.1" frunk_core = "0.4.1" mime = "0.3.17" -reqwest = { version = "0.11.16", optional = true } -serde = { version = "1.0.160", features = ["derive"] } +reqwest = { version = "0.11.18", optional = true } +serde = { version = "1.0.163", features = ["derive"] } serde_json = "1.0.96" strum = { version = "0.24.1", features = ["derive"] } -time = { version = "0.3.20", features = ["serde", "serde-well-known", "std"] } -url = { version = "2.3.1", features = ["serde"] } +time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] } +url = { version = "2.4.0", features = ["serde"] } utoipa = { version = "3.3.0", features = ["preserve_order"] } - # First party crates +cards = { version = "0.1.0", path = "../cards" } +common_enums = { path = "../common_enums" } common_utils = { version = "0.1.0", path = "../common_utils" } masking = { version = "0.1.0", path = "../masking" } router_derive = { version = "0.1.0", path = "../router_derive" } -common_enums = {path = "../common_enums"} -cards = { version = "0.1.0", path = "../cards" } diff --git a/crates/api_models/README.md b/crates/api_models/README.md new file mode 100644 index 0000000000..752b391125 --- /dev/null +++ b/crates/api_models/README.md @@ -0,0 +1,3 @@ +# API Models + +Request/response models for the `router` crate. diff --git a/crates/cards/Cargo.toml b/crates/cards/Cargo.toml index 4b05bc4948..2afc834524 100644 --- a/crates/cards/Cargo.toml +++ b/crates/cards/Cargo.toml @@ -1,23 +1,25 @@ [package] name = "cards" +description = "Types to handle card masking and validation" version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +edition.workspace = true +rust-version.workspace = true +readme = "README.md" +license.workspace = true [features] default = ["serde"] [dependencies] -time = { version = "0.3.20" } error-stack = "0.3.1" -serde = { version = "1", features = ["derive"], optional = true } -thiserror = "1.0.40" luhn = "1.0.1" +serde = { version = "1.0.163", features = ["derive"], optional = true } +thiserror = "1.0.40" +time = "0.3.21" -# First Party crates -masking = { version = "0.1.0", path = "../masking" } +# First party crates common_utils = { version = "0.1.0", path = "../common_utils" } +masking = { version = "0.1.0", path = "../masking" } [dev-dependencies] -serde_json = "1.0.94" +serde_json = "1.0.96" diff --git a/crates/cards/README.md b/crates/cards/README.md new file mode 100644 index 0000000000..1f7c38f393 --- /dev/null +++ b/crates/cards/README.md @@ -0,0 +1,3 @@ +# Cards + +Types to handle card masking and validation. diff --git a/crates/common_enums/Cargo.toml b/crates/common_enums/Cargo.toml index 9521d0ee04..1358e57158 100644 --- a/crates/common_enums/Cargo.toml +++ b/crates/common_enums/Cargo.toml @@ -1,14 +1,16 @@ [package] -name = "common_enums" +name = "common_enums" +description = "Enums shared across the request/response types and database types" version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +edition.workspace = true +rust-version.workspace = true +readme = "README.md" +license.workspace = true [dependencies] diesel = { version = "2.1.0", features = ["postgres"] } -serde = { version = "1.0.160", features = [ "derive" ] } -strum = { version = "0.24.1", features = [ "derive" ] } +serde = { version = "1.0.163", features = ["derive"] } +strum = { version = "0.24.1", features = ["derive"] } utoipa = { version = "3.3.0", features = ["preserve_order"] } # First party crates diff --git a/crates/common_enums/README.md b/crates/common_enums/README.md new file mode 100644 index 0000000000..eb165da5d8 --- /dev/null +++ b/crates/common_enums/README.md @@ -0,0 +1,3 @@ +# Common Enums + +Enums shared across the request/response types and database types. diff --git a/crates/common_utils/Cargo.toml b/crates/common_utils/Cargo.toml index ada1549a23..80aa645e15 100644 --- a/crates/common_utils/Cargo.toml +++ b/crates/common_utils/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "common_utils" -description = "Utilities shared across router and other crates" +description = "Utilities shared across `router` and other crates" version = "0.1.0" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true readme = "README.md" -license = "Apache-2.0" +license.workspace = true [features] signals = ["dep:signal-hook-tokio", "dep:signal-hook", "dep:tokio", "dep:router_env", "dep:futures"] @@ -19,23 +19,20 @@ diesel = "2.1.0" error-stack = "0.3.1" futures = { version = "0.3.28", optional = true } hex = "0.4.3" +md5 = "0.7.0" nanoid = "0.4.0" -once_cell = "1.17.1" +once_cell = "1.18.0" quick-xml = { version = "0.28.2", features = ["serialize"] } rand = "0.8.5" -regex = "1.7.3" +regex = "1.8.4" ring = { version = "0.16.20", features = ["std"] } -serde = { version = "1.0.160", features = ["derive"] } +serde = { version = "1.0.163", features = ["derive"] } serde_json = "1.0.96" serde_urlencoded = "0.7.1" signal-hook = { version = "0.3.15", optional = true } -tokio = { version = "1.27.0", features = [ - "macros", - "rt-multi-thread", -], optional = true } thiserror = "1.0.40" -time = { version = "0.3.20", features = ["serde", "serde-well-known", "std"] } -md5 = "0.7.0" +time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] } +tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"], optional = true } # First party crates masking = { version = "0.1.0", path = "../masking" } @@ -45,5 +42,5 @@ router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"], optional = true } [dev-dependencies] -fake = "2.5.0" -proptest = "1.1.0" +fake = "2.6.1" +proptest = "1.2.0" diff --git a/crates/common_utils/README.md b/crates/common_utils/README.md index 4f0c8e2ff6..6fa1dcd3a4 100644 --- a/crates/common_utils/README.md +++ b/crates/common_utils/README.md @@ -1,11 +1,3 @@ # Common Utils -Common functionality required by internal crates - -## Files Tree Layout - -```text -└── src : source code - └── errors : common error specific types - └── ext_traits : traits for extending type functionalities -``` +Utilities shared across `router` and other crates. diff --git a/crates/drainer/Cargo.toml b/crates/drainer/Cargo.toml index 2003c20f0a..60c478792e 100644 --- a/crates/drainer/Cargo.toml +++ b/crates/drainer/Cargo.toml @@ -1,29 +1,29 @@ [package] name = "drainer" -description = "App that reads redis streams and executes queries in DB" +description = "Application that reads Redis streams and executes queries in database" version = "0.1.0" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true readme = "README.md" -license = "Apache-2.0" +license.workspace = true [features] kms = ["external_services/kms"] vergen = ["router_env/vergen"] [dependencies] -async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = "9a71d142726dbc33f41c1fd935ddaa79841c7be5" } +async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "be3d9bce50051d8c0e0c06078e8066cc27db3001" } bb8 = "0.8" -clap = { version = "4.2.2", default-features = false, features = ["std", "derive", "help", "usage"] } +clap = { version = "4.3.2", default-features = false, features = ["std", "derive", "help", "usage"] } config = { version = "0.13.3", features = ["toml"] } diesel = { version = "2.1.0", features = ["postgres"] } error-stack = "0.3.1" -once_cell = "1.17.1" -serde = "1.0.160" +once_cell = "1.18.0" +serde = "1.0.163" serde_json = "1.0.96" serde_path_to_error = "0.1.11" thiserror = "1.0.40" -tokio = { version = "1.27.0", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"] } # First Party Crates common_utils = { version = "0.1.0", path = "../common_utils", features = ["signals"] } diff --git a/crates/drainer/README.md b/crates/drainer/README.md index 25e0320a75..8da1d8d56d 100644 --- a/crates/drainer/README.md +++ b/crates/drainer/README.md @@ -1,3 +1,3 @@ # Drainer -App that reads redis streams and executes queries in DB \ No newline at end of file +Application that reads Redis streams and executes queries in database. diff --git a/crates/external_services/Cargo.toml b/crates/external_services/Cargo.toml index 008699b34b..4700c2a81d 100644 --- a/crates/external_services/Cargo.toml +++ b/crates/external_services/Cargo.toml @@ -2,30 +2,30 @@ name = "external_services" description = "Interactions of the router with external systems" version = "0.1.0" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true readme = "README.md" -license = "Apache-2.0" +license.workspace = true [features] kms = ["dep:aws-config", "dep:aws-sdk-kms"] email = ["dep:aws-config"] [dependencies] -aws-config = { version = "0.55.1", optional = true } -aws-sdk-kms = { version = "0.26.0", optional = true } -base64 = "0.21.0" -error-stack = "0.3.1" -once_cell = "1.17.1" -serde = { version = "1.0.160", features = ["derive"] } -thiserror = "1.0.40" -tokio = "1.27.0" +async-trait = "0.1.68" +aws-config = { version = "0.55.3", optional = true } +aws-sdk-kms = { version = "0.28.0", optional = true } +aws-sdk-sesv2 = "0.28.0" +aws-smithy-client = "0.55.3" +base64 = "0.21.2" dyn-clone = "1.0.11" -async-trait = "0.1.66" -aws-sdk-sesv2 = "0.27.0" -aws-smithy-client = "0.55.0" +error-stack = "0.3.1" +once_cell = "1.18.0" +serde = { version = "1.0.163", features = ["derive"] } +thiserror = "1.0.40" +tokio = "1.28.2" # First party crates common_utils = { version = "0.1.0", path = "../common_utils" } -router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] } masking = { version = "0.1.0", path = "../masking" } +router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] } diff --git a/crates/masking/Cargo.toml b/crates/masking/Cargo.toml index 2e6389ce8b..21d7916428 100644 --- a/crates/masking/Cargo.toml +++ b/crates/masking/Cargo.toml @@ -2,10 +2,10 @@ name = "masking" description = "Personal Identifiable Information protection. Wrapper types and traits for secret management which help ensure they aren't accidentally copied, logged, or otherwise exposed (as much as possible), and also ensure secrets are securely wiped from memory when dropped." version = "0.1.0" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true readme = "README.md" -license = "Apache-2.0" +license.workspace = true [features] default = ["alloc", "serde", "diesel"] diff --git a/crates/masking/README.md b/crates/masking/README.md index 1b99cf634a..5385f0ccda 100644 --- a/crates/masking/README.md +++ b/crates/masking/README.md @@ -1,10 +1,13 @@ -# masking +# Masking Personal Identifiable Information protection. -Wrapper types and traits for secret management which help ensure they aren't accidentally copied, logged, or otherwise exposed (as much as possible), and also ensure secrets are securely wiped from memory when dropped. +Wrapper types and traits for secret management which help ensure they aren't +accidentally copied, logged, or otherwise exposed (as much as possible), and +also ensure secrets are securely wiped from memory when dropped. Secret-keeping library inspired by `secrecy`. This solution has such advantages over alternatives: + - alternatives have not implemented several traits from the box which are needed - alternatives do not have WeakSecret and Secret differentiation - alternatives do not support masking strategies @@ -35,18 +38,3 @@ Most fields are under `Option`. To simplify dealing with `Option`, use `expose_o .unwrap_or_default(), ); ``` - - -## Files Tree Layout - - -```bash -. -├── src # : source code -└── tests # : unit and integration tests - -``` - - diff --git a/crates/redis_interface/Cargo.toml b/crates/redis_interface/Cargo.toml index b40639ff42..8066787dca 100644 --- a/crates/redis_interface/Cargo.toml +++ b/crates/redis_interface/Cargo.toml @@ -2,23 +2,22 @@ name = "redis_interface" description = "A user-friendly interface to Redis" version = "0.1.0" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true readme = "README.md" -license = "Apache-2.0" +license.workspace = true [dependencies] -async-trait = "0.1.68" error-stack = "0.3.1" fred = { version = "6.3.0", features = ["metrics", "partial-tracing","subscriber-client"] } futures = "0.3" -serde = { version = "1.0.160", features = ["derive"] } +serde = { version = "1.0.163", features = ["derive"] } thiserror = "1.0.40" -tokio = "1.26.0" +tokio = "1.28.2" # First party crates common_utils = { version = "0.1.0", path = "../common_utils", features = ["async_ext"] } router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] } [dev-dependencies] -tokio = { version = "1.27.0", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"] } diff --git a/crates/redis_interface/README.md b/crates/redis_interface/README.md new file mode 100644 index 0000000000..d79b9bd6b3 --- /dev/null +++ b/crates/redis_interface/README.md @@ -0,0 +1,3 @@ +# Redis Interface + +A user-friendly interface to Redis. diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 76aa16a1d0..6584eb2fe5 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -2,18 +2,17 @@ name = "router" description = "Modern, fast and open payment router" version = "0.2.0" -edition = "2021" +edition.workspace = true default-run = "router" -rust-version = "1.65" +rust-version.workspace = true readme = "README.md" -license = "Apache-2.0" -build = "src/build.rs" +license.workspace = true [features] default = ["kv_store", "stripe", "oltp", "olap", "accounts_cache", "dummy_connector"] -s3 = ["dep:aws-sdk-s3","dep:aws-config"] -kms = ["external_services/kms","dep:aws-config"] -email = ["external_services/email","dep:aws-config"] +s3 = ["dep:aws-sdk-s3", "dep:aws-config"] +kms = ["external_services/kms", "dep:aws-config"] +email = ["external_services/email", "dep:aws-config"] basilisk = ["kms"] stripe = ["dep:serde_qs"] release = ["kms", "stripe", "basilisk", "s3", "email"] @@ -21,7 +20,7 @@ olap = [] oltp = [] kv_store = [] accounts_cache = [] -openapi = ["olap", "oltp", "dep:oas3"] +openapi = ["olap", "oltp"] vergen = ["router_env/vergen"] multiple_mca = ["api_models/multiple_mca"] dummy_connector = ["api_models/dummy_connector"] @@ -32,15 +31,18 @@ detailed_errors = ["api_models/detailed_errors", "error-stack/serde"] [dependencies] actix = "0.13.0" actix-cors = "0.6.4" +actix-multipart = "0.6.0" actix-rt = "2.8.0" actix-web = "4.3.1" -async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = "9a71d142726dbc33f41c1fd935ddaa79841c7be5" } +async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "be3d9bce50051d8c0e0c06078e8066cc27db3001" } async-trait = "0.1.68" -base64 = "0.21.0" +aws-config = { version = "0.55.3", optional = true } +aws-sdk-s3 = { version = "0.28.0", optional = true } +base64 = "0.21.2" bb8 = "0.8" blake3 = "1.3.3" bytes = "1.4.0" -clap = { version = "4.2.2", default-features = false, features = ["std", "derive", "help", "usage"] } +clap = { version = "4.3.2", default-features = false, features = ["std", "derive", "help", "usage"] } config = { version = "0.13.3", features = ["toml"] } crc32fast = "1.3.2" diesel = { version = "2.1.0", features = ["postgres"] } @@ -52,54 +54,50 @@ frunk_core = "0.4.1" futures = "0.3.28" hex = "0.4.3" http = "0.2.9" -josekit = "0.8.2" +infer = "0.13.0" +josekit = "0.8.3" jsonwebtoken = "8.3.0" literally = "0.1.3" maud = { version = "0.25", features = ["actix-web"] } mimalloc = { version = "0.1", optional = true } mime = "0.3.17" -moka = { version = "0.10", features = ["future"] } +moka = { version = "0.11", features = ["future"] } nanoid = "0.4.0" num_cpus = "1.15.0" -oas3 = { version = "0.2.1", optional = true } -once_cell = "1.17.1" +once_cell = "1.18.0" rand = "0.8.5" -regex = "1.7.3" -reqwest = { version = "0.11.16", features = ["json", "native-tls", "gzip", "multipart"] } +regex = "1.8.4" +reqwest = { version = "0.11.18", features = ["json", "native-tls", "gzip", "multipart"] } ring = "0.16.20" -serde = { version = "1.0.160", features = ["derive"] } +serde = { version = "1.0.163", features = ["derive"] } serde_json = "1.0.96" serde_path_to_error = "0.1.11" serde_qs = { version = "0.12.0", optional = true } serde_urlencoded = "0.7.1" -serde_with = "2.3.2" +serde_with = "3.0.0" signal-hook = "0.3.15" strum = { version = "0.24.1", features = ["derive"] } thiserror = "1.0.40" -time = { version = "0.3.20", features = ["serde", "serde-well-known", "std"] } -tokio = { version = "1.27.0", features = ["macros", "rt-multi-thread"] } -url = { version = "2.3.1", features = ["serde"] } +time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] } +tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"] } +url = { version = "2.4.0", features = ["serde"] } utoipa = { version = "3.3.0", features = ["preserve_order", "time"] } utoipa-swagger-ui = { version = "3.1.3", features = ["actix-web"] } -uuid = { version = "1.3.1", features = ["serde", "v4"] } +uuid = { version = "1.3.3", features = ["serde", "v4"] } # First party crates api_models = { version = "0.1.0", path = "../api_models", features = ["errors"] } -common_utils = { version = "0.1.0", path = "../common_utils", features = ["signals", "async_ext"] } cards = { version = "0.1.0", path = "../cards" } +common_utils = { version = "0.1.0", path = "../common_utils", features = ["signals", "async_ext"] } external_services = { version = "0.1.0", path = "../external_services" } masking = { version = "0.1.0", path = "../masking" } redis_interface = { version = "0.1.0", path = "../redis_interface" } router_derive = { version = "0.1.0", path = "../router_derive" } router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] } storage_models = { version = "0.1.0", path = "../storage_models", features = ["kv_store"] } -actix-multipart = "0.6.0" -aws-sdk-s3 = { version = "0.25.0", optional = true } -aws-config = {version = "0.55.1", optional = true } -infer = "0.13.0" [target.'cfg(not(target_os = "windows"))'.dependencies] -signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"]} +signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"] } [build-dependencies] router_env = { version = "0.1.0", path = "../router_env", default-features = false } @@ -110,11 +108,11 @@ awc = { version = "3.1.1", features = ["rustls"] } derive_deref = "1.1.1" rand = "0.8.5" serial_test = "2.0.0" -time = { version = "0.3.20", features = ["macros"] } -tokio = "1.27.0" -toml = "0.7.3" -wiremock = "0.5" thirtyfour = "0.31.0" +time = { version = "0.3.21", features = ["macros"] } +tokio = "1.28.2" +toml = "0.7.4" +wiremock = "0.5" [[bin]] name = "router" diff --git a/crates/router/src/build.rs b/crates/router/build.rs similarity index 100% rename from crates/router/src/build.rs rename to crates/router/build.rs diff --git a/crates/router_derive/Cargo.toml b/crates/router_derive/Cargo.toml index 483a0d1cd9..cc389fee26 100644 --- a/crates/router_derive/Cargo.toml +++ b/crates/router_derive/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "router_derive" -description = "Utility macros for the router crate" +description = "Utility macros for the `router` crate" version = "0.1.0" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true readme = "README.md" -license = "Apache-2.0" +license.workspace = true [lib] proc-macro = true @@ -19,6 +19,6 @@ syn = { version = "1.0.109", features = ["full", "extra-traits"] } # the full fe [dev-dependencies] diesel = { version = "2.1.0", features = ["postgres"] } -serde = { version = "1.0.160", features = ["derive"] } +serde = { version = "1.0.163", features = ["derive"] } serde_json = "1.0.96" strum = { version = "0.24.1", features = ["derive"] } diff --git a/crates/router_derive/README.md b/crates/router_derive/README.md index 7dd2dcf874..29064643c5 100644 --- a/crates/router_derive/README.md +++ b/crates/router_derive/README.md @@ -1,8 +1,3 @@ # `router_derive` Utility macros for the `router` crate. - -This crate provides the following macros: - -- `#[derive(DebugAsDisplay)]`: To use the `Debug` implementation of a type as its `Display` implementation. -- `#[derive(DieselEnum)]` and `#[diesel_enum]`: To derive the boilerplate code required to use enums with the `diesel` crate and a PostgreSQL database. diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index c023c1e7ea..f9db6452d2 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -2,38 +2,38 @@ name = "router_env" description = "Environment of payment router: logger, basic config, its environment awareness." version = "0.1.0" -edition = "2021" -rust-version = "1.65" +edition.workspace = true +rust-version.workspace = true readme = "README.md" -license = "Apache-2.0" +license.workspace = true [dependencies] config = { version = "0.13.3", features = ["toml"] } -gethostname = "0.4.2" -once_cell = "1.17.1" +gethostname = "0.4.3" +once_cell = "1.18.0" opentelemetry = { version = "0.19.0", features = ["rt-tokio-current-thread", "metrics"] } opentelemetry-otlp = { version = "0.12.0", features = ["metrics"] } rustc-hash = "1.1" -serde = { version = "1.0.160", features = ["derive"] } +serde = { version = "1.0.163", features = ["derive"] } serde_json = "1.0.96" serde_path_to_error = "0.1.11" strum = { version = "0.24.1", features = ["derive"] } -time = { version = "0.3.20", default-features = false, features = ["formatting"] } -tokio = { version = "1.27.0" } +time = { version = "0.3.21", default-features = false, features = ["formatting"] } +tokio = { version = "1.28.2" } tracing = { version = "=0.1.36" } -tracing-actix-web = { version = "0.7.4", features = ["opentelemetry_0_19"], optional = true } +tracing-actix-web = { version = "0.7.5", features = ["opentelemetry_0_19"], optional = true } tracing-appender = { version = "0.2.2" } tracing-attributes = "=0.1.22" tracing-opentelemetry = { version = "0.19.0" } -tracing-subscriber = { version = "0.3.16", default-features = true, features = ["env-filter", "json", "registry"] } -vergen = { version = "8.1.1", optional = true, features = ["cargo", "git", "git2", "rustc"] } +tracing-subscriber = { version = "0.3.17", default-features = true, features = ["env-filter", "json", "registry"] } +vergen = { version = "8.2.1", optional = true, features = ["cargo", "git", "git2", "rustc"] } [dev-dependencies] -tokio = { version = "1.27.0", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.28.2", features = ["macros", "rt-multi-thread"] } [build-dependencies] cargo_metadata = "0.15.4" -vergen = { version = "8.1.1", features = ["cargo", "git", "git2", "rustc"], optional = true } +vergen = { version = "8.2.1", features = ["cargo", "git", "git2", "rustc"], optional = true } [features] default = ["actix_web"] diff --git a/crates/router_env/README.md b/crates/router_env/README.md index 6108585645..d2dbde7109 100644 --- a/crates/router_env/README.md +++ b/crates/router_env/README.md @@ -19,16 +19,3 @@ pub fn sample() -> () { ); } ``` - -## Files Tree Layout - -```text -├── src : source code -│ └── logger : logger -└── tests : unit and integration tests - └── test_module : unit and integration tests -``` - - diff --git a/crates/storage_models/Cargo.toml b/crates/storage_models/Cargo.toml index aca1978090..20894d0b03 100644 --- a/crates/storage_models/Cargo.toml +++ b/crates/storage_models/Cargo.toml @@ -1,31 +1,31 @@ [package] name = "storage_models" +description = "Database types shared across `router` and other crates" version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +edition.workspace = true +rust-version.workspace = true +readme = "README.md" +license.workspace = true [features] default = ["kv_store"] kv_store = [] [dependencies] -async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = "9a71d142726dbc33f41c1fd935ddaa79841c7be5" } -async-trait = "0.1.68" +async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "be3d9bce50051d8c0e0c06078e8066cc27db3001" } diesel = { version = "2.1.0", features = ["postgres", "serde_json", "time", "64-column-tables"] } error-stack = "0.3.1" frunk = "0.4.1" frunk_core = "0.4.1" -hex = "0.4.3" -serde = { version = "1.0.160", features = ["derive"] } +serde = { version = "1.0.163", features = ["derive"] } serde_json = "1.0.96" strum = { version = "0.24.1", features = ["derive"] } thiserror = "1.0.40" -time = { version = "0.3.20", features = ["serde", "serde-well-known", "std"] } +time = { version = "0.3.21", features = ["serde", "serde-well-known", "std"] } # First party crates +common_enums = { path = "../common_enums" } common_utils = { version = "0.1.0", path = "../common_utils" } -common_enums = {path = "../common_enums"} masking = { version = "0.1.0", path = "../masking" } router_derive = { version = "0.1.0", path = "../router_derive" } router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] } diff --git a/crates/storage_models/README.md b/crates/storage_models/README.md new file mode 100644 index 0000000000..2c8d6109d0 --- /dev/null +++ b/crates/storage_models/README.md @@ -0,0 +1,3 @@ +# Storage Models + +Database models shared across `router` and other crates. diff --git a/examples/README.md b/examples/README.md deleted file mode 100644 index 6b39b15e06..0000000000 --- a/examples/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Examples - -Here should be list of samples. \ No newline at end of file