diff --git a/Cargo.lock b/Cargo.lock index 8937f262af..df70c21faf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -60,16 +60,16 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.2.2" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c83abf9903e1f0ad9973cc4f7b9767fd5a03a583f51a5b7a339e07987cd2724" +checksum = "0070905b2c4a98d184c4e81025253cb192aa8a73827553f38e9410801ceb35bb" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", "ahash", - "base64 0.13.1", + "base64 0.21.0", "bitflags", "brotli", "bytes", @@ -91,6 +91,8 @@ dependencies = [ "rand 0.8.5", "sha1", "smallvec", + "tokio", + "tokio-util 0.7.4", "tracing", "zstd", ] @@ -120,9 +122,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000" +checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" dependencies = [ "actix-macros", "futures-core", @@ -189,9 +191,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.2.1" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48f7b6534e06c7bfc72ee91db7917d4af6afe23e7d223b51e68fffbb21e96b9" +checksum = "464e0fddc668ede5f26ec1f9557a8d44eda948732f40c6b0ad79126930eb775f" dependencies = [ "actix-codec", "actix-http", @@ -396,9 +398,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.61" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1" dependencies = [ "proc-macro2", "quote", @@ -424,9 +426,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "awc" -version = "3.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80ca7ff88063086d2e2c70b9f3b29b2fcd999bac68ac21731e66781970d68519" +checksum = "0dff3fc64a176e0d4398c71b0f2c2679ff4a723c6ed8fcc68dfe5baa00665388" dependencies = [ "actix-codec", "actix-http", @@ -435,7 +437,7 @@ dependencies = [ "actix-tls", "actix-utils", "ahash", - "base64 0.13.1", + "base64 0.21.0", "bytes", "cfg-if", "cookie", @@ -459,10 +461,11 @@ dependencies = [ [[package]] name = "aws-config" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7688e1dfbb9f7804fab0a830820d7e827b8d973906763cf1a855ce4719292f5" +checksum = "3c3d1e2a1f1ab3ac6c4b884e37413eaa03eb9d901e4fc68ee8f5c1d49721680e" dependencies = [ + "aws-credential-types", "aws-http", "aws-sdk-sso", "aws-sdk-sts", @@ -486,10 +489,23 @@ dependencies = [ ] [[package]] -name = "aws-endpoint" -version = "0.52.0" +name = "aws-credential-types" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "253d7cd480bfa59a5323390e9e91885a8f06a275e0517d81eeb1070b6aa7d271" +checksum = "bb0696a0523a39a19087747e4dafda0362dc867531e3d72a3f195564c84e5e08" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-endpoint" +version = "0.54.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80a4f935ab6a1919fbfd6102a80c4fccd9ff5f47f94ba154074afe1051903261" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -501,10 +517,11 @@ dependencies = [ [[package]] name = "aws-http" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd1b83859383e46ea8fda633378f9f3f02e6e3a446fd89f0240b5c3662716c9" +checksum = "82976ca4e426ee9ca3ffcf919d9b2c8d14d0cd80d43cc02173737a8f07f28d4d" dependencies = [ + "aws-credential-types", "aws-smithy-http", "aws-smithy-types", "aws-types", @@ -519,10 +536,11 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db458a4e346d7fed44f36c71168c8e2216afba6fc24c4c2d3b171f52a7221b53" +checksum = "434d7097fc824eee1d94cf6c5e3a30714da15b81a5b99618f8feb67f8eb2f70a" dependencies = [ + "aws-credential-types", "aws-endpoint", "aws-http", "aws-sig-auth", @@ -535,6 +553,7 @@ dependencies = [ "aws-types", "bytes", "http", + "regex", "tokio-stream", "tower", "tracing", @@ -542,10 +561,11 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf03342c2b3f52b180f484e60586500765474f2bfc7dcd4ffe893a7a1929db1d" +checksum = "ca0119bacf0c42f587506769390983223ba834e605f049babe514b2bd646dbb2" dependencies = [ + "aws-credential-types", "aws-endpoint", "aws-http", "aws-sig-auth", @@ -558,16 +578,18 @@ dependencies = [ "aws-types", "bytes", "http", + "regex", "tokio-stream", "tower", ] [[package]] name = "aws-sdk-sts" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1de4e07ea87a30a317c7b563b3a40fd18a843ad794216dda81672b6e174bce" +checksum = "270b6a33969ebfcb193512fbd5e8ee5306888ad6c6d5d775cdbfb2d50d94de26" dependencies = [ + "aws-credential-types", "aws-endpoint", "aws-http", "aws-sig-auth", @@ -575,22 +597,25 @@ dependencies = [ "aws-smithy-client", "aws-smithy-http", "aws-smithy-http-tower", + "aws-smithy-json", "aws-smithy-query", "aws-smithy-types", "aws-smithy-xml", "aws-types", "bytes", "http", + "regex", "tower", "tracing", ] [[package]] name = "aws-sig-auth" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6126c4ff918e35fb9ae1bf2de71157fad36f0cc6a2b1d0f7197ee711713700fc" +checksum = "660a02a98ab1af83bd8d714afbab2d502ba9b18c49e7e4cddd6bf8837ff778cb" dependencies = [ + "aws-credential-types", "aws-sigv4", "aws-smithy-http", "aws-types", @@ -600,9 +625,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c7f88d7395f5411c6eef5889b6cd577ce6b677af461356cbfc20176c26c160" +checksum = "cdaf11005b7444e6cd66f600d09861a3aeb6eb89a0f003c7c9820dbab2d15297" dependencies = [ "aws-smithy-http", "form_urlencoded", @@ -619,9 +644,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6a895d68852dd1564328e63ef1583e5eb307dd2a5ebf35d862a5c402957d5e" +checksum = "075d87b46420b28b64140f2ba88fa6b158c2877466a2acdbeaf396c25e4b9b33" dependencies = [ "futures-util", "pin-project-lite", @@ -631,9 +656,9 @@ dependencies = [ [[package]] name = "aws-smithy-client" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f505bf793eb3e6d7c166ef1275c27b4b2cd5361173fe950ac8e2cfc08c29a7ef" +checksum = "17d44078855a64d757e5c1727df29ffa6679022c38cfc4ba4e63ee9567133141" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -654,9 +679,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e4b4304b7ea4af1af3e08535100eb7b6459d5a6264b92078bf85176d04ab85" +checksum = "b5bd86f48d7e36fb24ee922d04d79c8353e01724b1c38757ed92593179223aa7" dependencies = [ "aws-smithy-types", "bytes", @@ -676,9 +701,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-tower" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86072ecc4dc4faf3e2071144285cfd539263fe7102b701d54fb991eafb04af8" +checksum = "c8972d1b4ae3aba1a10e7106fed53a5a36bc8ef86170a84f6ddd33d36fac12ad" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -692,18 +717,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3ddd9275b167bc59e9446469eca56177ec0b51225632f90aaa2cd5f41c940e" +checksum = "18973f12721e27b54891386497a57e1ba09975df1c6cfeccafaf541198962aef" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b19d2e0b3ce20e460bad0d0d974238673100edebba6978c2c1aadd925602f7" +checksum = "2881effde104a2b0619badaad9f30ae67805e86fbbdb99e5fcc176e8bfbc1a85" dependencies = [ "aws-smithy-types", "urlencoding", @@ -711,9 +736,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987b1e37febb9bd409ca0846e82d35299e572ad8279bc404778caeb5fc05ad56" +checksum = "da7e499c4b15bab8eb6b234df31833cc83a1bdaa691ba72d5d81efc109d9d705" dependencies = [ "base64-simd", "itoa 1.0.5", @@ -724,19 +749,20 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ce3791e14eec75ffac851a5a559f1ce6b31843297f42cc8bfba82714a6a5d8" +checksum = "9a73082f023f4a361fe811954da0061076709198792a3d2ad3a7498e10b606a0" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.52.0" +version = "0.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c05adca3e2bcf686dd2c47836f216ab52ed7845c177d180c84b08522c1166a3" +checksum = "f8f15b34253b68cde08e39b0627cc6101bcca64351229484b4743392c035d057" dependencies = [ + "aws-credential-types", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", @@ -744,7 +770,6 @@ dependencies = [ "http", "rustc_version", "tracing", - "zeroize", ] [[package]] @@ -941,9 +966,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.1.1" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", "clap_derive", @@ -1021,7 +1046,7 @@ dependencies = [ "rust-ini", "serde", "serde_json", - "toml", + "toml 0.5.11", "yaml-rust", ] @@ -1175,9 +1200,9 @@ dependencies = [ [[package]] name = "diesel" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c186a7418a2aac330bb76cde82f16c36b03a66fb91db32d20214311f9f6545" +checksum = "4391a22b19c916e50bec4d6140f29bdda3e3bb187223fe6e3ea0b6e4d1021c04" dependencies = [ "bitflags", "byteorder", @@ -1269,26 +1294,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "enum-iterator" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91a4ec26efacf4aeff80887a175a419493cb6f8b5480d26387eb0bd038976187" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "env_logger" version = "0.7.1" @@ -1634,23 +1639,11 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "getset" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "git2" -version = "0.15.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" +checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" dependencies = [ "bitflags", "libc", @@ -1833,7 +1826,6 @@ dependencies = [ "rustls-native-certs", "tokio", "tokio-rustls", - "webpki-roots", ] [[package]] @@ -2011,9 +2003,9 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libgit2-sys" -version = "0.14.1+1.5.0" +version = "0.14.2+1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a07fb2692bc3593bda59de45a502bb3071659f2c515e28c71e728306b038e17" +checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" dependencies = [ "cc", "libc", @@ -2229,12 +2221,12 @@ dependencies = [ ] [[package]] -name = "ntapi" -version = "0.4.0" +name = "nom8" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" dependencies = [ - "winapi", + "memchr", ] [[package]] @@ -2911,12 +2903,12 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" dependencies = [ "async-compression", - "base64 0.13.1", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -3042,7 +3034,7 @@ dependencies = [ "thiserror", "time", "tokio", - "toml", + "toml 0.7.0", "url", "utoipa", "uuid", @@ -3295,6 +3287,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "serde_spanned" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c68e921cef53841b8925c2abadd27c9b891d9613bdc43d6b823062866df38e8" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3309,9 +3310,9 @@ dependencies = [ [[package]] name = "serial_test" -version = "0.10.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c789ec87f4687d022a2405cf46e0cd6284889f1839de292cadeb6c6019506f2" +checksum = "538c30747ae860d6fb88330addbbd3e0ddbe46d662d032855596d8a8ca260611" dependencies = [ "dashmap", "futures", @@ -3323,9 +3324,9 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "0.10.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f9e531ce97c88b4778aad0ceee079216071cffec6ac9b904277f8f92e7fe3" +checksum = "079a83df15f85d89a68d64ae1238f142f172b1fa915d0d76b26a7cba1b659a69" dependencies = [ "proc-macro2", "quote", @@ -3536,20 +3537,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" -[[package]] -name = "sysinfo" -version = "0.27.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "winapi", -] - [[package]] name = "tempfile" version = "3.3.0" @@ -3646,9 +3633,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.24.2" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" dependencies = [ "autocfg", "bytes", @@ -3747,13 +3734,47 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f560bc7fb3eb31f5eee1340c68a2160cad39605b7b9c9ec32045ddbdee13b85" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "886f31a9b85b6182cabd4d8b07df3b451afcc216563748201490940d2a28ed36" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d8716cdc5d20ec88a18a839edaf545edc71efa4a5ff700ef4a102c26cd8fa" +dependencies = [ + "indexmap", + "nom8", + "serde", + "serde_spanned", + "toml_datetime", +] + [[package]] name = "tonic" version = "0.8.3" @@ -4027,8 +4048,9 @@ checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" [[package]] name = "utoipa" -version = "2.4.2" -source = "git+https://github.com/juhaku/utoipa?rev=2a5c09d953f14dc78af655bbcfd016ce9a71baa0#2a5c09d953f14dc78af655bbcfd016ce9a71baa0" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3920fa753064b1be7842bea26175ffa0dfc4a8f30bcb52b8ff03fddf8889914c" dependencies = [ "indexmap", "serde", @@ -4038,8 +4060,9 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "2.4.2" -source = "git+https://github.com/juhaku/utoipa?rev=2a5c09d953f14dc78af655bbcfd016ce9a71baa0#2a5c09d953f14dc78af655bbcfd016ce9a71baa0" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "720298fac6efca20df9e457e67a1eab41a20d1c3101380b5c4dca1ca60ae0062" dependencies = [ "proc-macro-error", "proc-macro2", @@ -4071,19 +4094,14 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "7.5.0" +version = "8.0.0-beta.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571b69f690c855821462709b6f41d42ceccc316fbd17b60bd06d06928cfe6a99" +checksum = "7ddc80f045ae4afcbb388b085240e773f6728dfbbacff007dd91fc9e2f686fc7" dependencies = [ "anyhow", - "cfg-if", - "enum-iterator", - "getset", "git2", "rustc_version", "rustversion", - "sysinfo", - "thiserror", "time", ] @@ -4382,18 +4400,18 @@ checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.12.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e9262a83dc741c0b0ffec209881b45dbc232c21b02a2b9cb1adb93266e41303d" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "6.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "a6cf39f730b440bab43da8fb5faf5f254574462f73f260f85f7987f32154ff17" dependencies = [ "libc", "zstd-sys", diff --git a/crates/api_models/Cargo.toml b/crates/api_models/Cargo.toml index 1adeb7f7aa..fd1b8f6908 100644 --- a/crates/api_models/Cargo.toml +++ b/crates/api_models/Cargo.toml @@ -13,8 +13,7 @@ serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.91" strum = { version = "0.24.1", features = ["derive"] } time = { version = "0.3.17", features = ["serde", "serde-well-known", "std"] } -# Switch to the crates.io release of `utoipa` when the `preserve_order` feature is available in the release -utoipa = { git = "https://github.com/juhaku/utoipa", rev = "2a5c09d953f14dc78af655bbcfd016ce9a71baa0", features = ["preserve_order"] } +utoipa = { version = "3.0.1", features = ["preserve_order"] } # First party crates common_utils = { version = "0.1.0", path = "../common_utils" } diff --git a/crates/common_utils/Cargo.toml b/crates/common_utils/Cargo.toml index 9a4314cd97..e2f5ad54bf 100644 --- a/crates/common_utils/Cargo.toml +++ b/crates/common_utils/Cargo.toml @@ -8,7 +8,7 @@ readme = "README.md" license = "Apache-2.0" [dependencies] -async-trait = "0.1.61" +async-trait = "0.1.63" bytes = "1.3.0" error-stack = "0.2.4" futures = "0.3.25" diff --git a/crates/drainer/Cargo.toml b/crates/drainer/Cargo.toml index 89a733f001..7e546205a8 100644 --- a/crates/drainer/Cargo.toml +++ b/crates/drainer/Cargo.toml @@ -10,15 +10,15 @@ license = "Apache-2.0" [dependencies] async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = "9a71d142726dbc33f41c1fd935ddaa79841c7be5" } bb8 = "0.8" -clap = { version = "4.1.1", default-features = false, features = ["std", "derive", "help", "usage"] } +clap = { version = "4.1.4", default-features = false, features = ["std", "derive", "help", "usage"] } config = { version = "0.13.3", features = ["toml"] } -diesel = { version = "2.0.2", features = ["postgres", "serde_json", "time"] } +diesel = { version = "2.0.3", features = ["postgres", "serde_json", "time"] } error-stack = "0.2.4" serde = "1.0.152" serde_json = "1.0.91" serde_path_to_error = "0.1.9" thiserror = "1.0.38" -tokio = { version = "1.24.1", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.25.0", features = ["macros", "rt-multi-thread"] } # First Party Crates common_utils = { version = "0.1.0", path = "../common_utils" } diff --git a/crates/masking/Cargo.toml b/crates/masking/Cargo.toml index 01ab7f2bb8..4b1def1a5d 100644 --- a/crates/masking/Cargo.toml +++ b/crates/masking/Cargo.toml @@ -17,7 +17,7 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] bytes = { version = "1", optional = true } -diesel = { version = "2.0.2", features = ["postgres", "serde_json", "time"], optional = true } +diesel = { version = "2.0.3", features = ["postgres", "serde_json", "time"], optional = true } serde = { version = "1", features = ["derive"], optional = true } serde_json = "1.0.91" subtle = "2.4.1" diff --git a/crates/redis_interface/Cargo.toml b/crates/redis_interface/Cargo.toml index e4d93c27d6..92ed7d1afa 100644 --- a/crates/redis_interface/Cargo.toml +++ b/crates/redis_interface/Cargo.toml @@ -19,4 +19,4 @@ 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"] } [dev-dependencies] -tokio = { version = "1.24.1", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.25.0", features = ["macros", "rt-multi-thread"] } diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index 9a0888d53e..058da63e5e 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -25,19 +25,19 @@ openapi = ["olap", "oltp"] [dependencies] actix = "0.13.0" actix-cors = "0.6.4" -actix-rt = "2.7.0" -actix-web = "4.2.1" +actix-rt = "2.8.0" +actix-web = "4.3.0" async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = "9a71d142726dbc33f41c1fd935ddaa79841c7be5" } -async-trait = "0.1.61" -aws-config = { version = "0.52.0", optional = true } -aws-sdk-kms = { version = "0.22.0", optional = true } +async-trait = "0.1.63" +aws-config = { version = "0.54.1", optional = true } +aws-sdk-kms = { version = "0.24.0", optional = true } base64 = "0.21.0" bb8 = "0.8" bytes = "1.3.0" -clap = { version = "4.1.1", default-features = false, features = ["std", "derive", "help", "usage"] } +clap = { version = "4.1.4", default-features = false, features = ["std", "derive", "help", "usage"] } config = { version = "0.13.3", features = ["toml"] } crc32fast = "1.3.2" -diesel = { version = "2.0.2", features = ["postgres", "serde_json", "time"] } +diesel = { version = "2.0.3", features = ["postgres", "serde_json", "time"] } dyn-clone = "1.0.10" encoding_rs = "0.8.31" error-stack = "0.2.4" @@ -57,7 +57,7 @@ num_cpus = "1.15.0" once_cell = "1.17.0" rand = "0.8.5" regex = "1.7.1" -reqwest = { version = "0.11.13", features = ["json", "native-tls", "gzip"] } +reqwest = { version = "0.11.14", features = ["json", "native-tls", "gzip"] } ring = "0.16.20" serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.91" @@ -69,10 +69,9 @@ signal-hook = "0.3.14" strum = { version = "0.24.1", features = ["derive"] } thiserror = "1.0.38" time = { version = "0.3.17", features = ["serde", "serde-well-known", "std"] } -tokio = { version = "1.24.1", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.25.0", features = ["macros", "rt-multi-thread"] } url = { version = "2.3.1", features = ["serde"] } -# Switch to the crates.io release of `utoipa` when the `preserve_order` feature is available in the release -utoipa = { git = "https://github.com/juhaku/utoipa", rev = "2a5c09d953f14dc78af655bbcfd016ce9a71baa0", features = ["preserve_order", "time"] } +utoipa = { version = "3.0.1", features = ["preserve_order", "time"] } uuid = { version = "1.2.2", features = ["serde", "v4"] } # First party crates @@ -88,14 +87,14 @@ storage_models = { version = "0.1.0", path = "../storage_models", features = ["k router_env = { version = "0.1.0", path = "../router_env", default-features = false, features = ["vergen"] } [dev-dependencies] -actix-http = "3.2.2" -awc = { version = "3.0.1", features = ["rustls"] } +actix-http = "3.3.0" +awc = { version = "3.1.0", features = ["rustls"] } derive_deref = "1.1.1" rand = "0.8.5" -serial_test = "0.10.0" +serial_test = "1.0.0" time = { version = "0.3.17", features = ["macros"] } -tokio = "1.24.1" -toml = "0.5.10" +tokio = "1.25.0" +toml = "0.7.0" wiremock = "0.5" [[bin]] diff --git a/crates/router/tests/connectors/connector_auth.rs b/crates/router/tests/connectors/connector_auth.rs index 01505e6a01..5ac367e68a 100644 --- a/crates/router/tests/connectors/connector_auth.rs +++ b/crates/router/tests/connectors/connector_auth.rs @@ -20,8 +20,8 @@ pub(crate) struct ConnectorAuthentication { impl ConnectorAuthentication { pub(crate) fn new() -> Self { #[allow(clippy::expect_used)] - toml::de::from_slice( - &std::fs::read("tests/connectors/auth.toml") + toml::from_str( + &std::fs::read_to_string("tests/connectors/auth.toml") .expect("connector authentication config file not found"), ) .expect("Failed to read connector authentication config file") diff --git a/crates/router_derive/Cargo.toml b/crates/router_derive/Cargo.toml index 963e504bda..47a4d8a59d 100644 --- a/crates/router_derive/Cargo.toml +++ b/crates/router_derive/Cargo.toml @@ -12,12 +12,12 @@ proc-macro = true doctest = false [dependencies] -proc-macro2 = "1.0.49" +proc-macro2 = "1.0.50" quote = "1.0.23" syn = { version = "1.0.107", features = ["full", "extra-traits"] } # the full feature does not seem to encompass all the features [dev-dependencies] -diesel = { version = "2.0.2", features = ["postgres"] } +diesel = { version = "2.0.3", features = ["postgres"] } serde = { version = "1.0.152", features = ["derive"] } serde_json = "1.0.91" strum = { version = "0.24.1", features = ["derive"] } diff --git a/crates/router_env/Cargo.toml b/crates/router_env/Cargo.toml index 84bfcdc924..a733e61313 100644 --- a/crates/router_env/Cargo.toml +++ b/crates/router_env/Cargo.toml @@ -20,20 +20,20 @@ serde_json = "1.0.91" serde_path_to_error = "0.1.9" strum = { version = "0.24.1", features = ["derive"] } time = { version = "0.3.17", default-features = false, features = ["formatting"] } -tokio = { version = "1.24.1" } +tokio = { version = "1.25.0" } tracing = { version = "0.1.36" } tracing-actix-web = { version = "0.7.2", features = ["opentelemetry_0_18"], optional = true } tracing-appender = { version = "0.2.2" } tracing-attributes = "=0.1.22" tracing-opentelemetry = { version = "0.18.0" } tracing-subscriber = { version = "0.3.16", default-features = true, features = ["json", "env-filter", "registry"] } -vergen = { version = "7.5.0", optional = true } +vergen = { version = "8.0.0-beta.3", optional = true, features = ["cargo", "git", "git2", "rustc"] } [dev-dependencies] -tokio = { version = "1.24.1", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.25.0", features = ["macros", "rt-multi-thread"] } [build-dependencies] -vergen = "7.5.0" +vergen = { version = "8.0.0-beta.3", features = ["cargo", "git", "git2", "rustc"] } [features] default = ["actix_web"] diff --git a/crates/router_env/src/env.rs b/crates/router_env/src/env.rs index 701953f6b2..634ee58a98 100644 --- a/crates/router_env/src/env.rs +++ b/crates/router_env/src/env.rs @@ -75,8 +75,8 @@ pub fn workspace_path() -> PathBuf { /// Version of the crate containing the following information: /// -/// - Semantic Version from the latest git tag. If tags are not present in the repository, crate -/// version from the crate manifest is used instead. +/// - The latest git tag. If tags are not present in the repository, the short commit hash is used +/// instead. /// - Short hash of the latest git commit. /// - Timestamp of the latest git commit. /// @@ -85,9 +85,9 @@ pub fn workspace_path() -> PathBuf { macro_rules! version { () => { concat!( - env!("VERGEN_GIT_SEMVER"), + env!("VERGEN_GIT_DESCRIBE"), "-", - env!("VERGEN_GIT_SHA_SHORT"), + env!("VERGEN_GIT_SHA"), "-", env!("VERGEN_GIT_COMMIT_TIMESTAMP"), ) @@ -95,7 +95,7 @@ macro_rules! version { } /// -/// A string uniquely idendify build of the service. +/// A string uniquely identify build of the service. /// /// Consists of combination of /// - Version defined in the crate file @@ -113,7 +113,7 @@ macro_rules! build { concat!( env!("CARGO_PKG_VERSION"), "-", - env!("VERGEN_GIT_SHA_SHORT"), + env!("VERGEN_GIT_SHA"), "-", env!("VERGEN_GIT_COMMIT_TIMESTAMP"), "-", @@ -180,6 +180,6 @@ macro_rules! service_name { #[macro_export] macro_rules! profile { () => { - env!("VERGEN_CARGO_PROFILE") + env!("CARGO_PROFILE") }; } diff --git a/crates/router_env/src/vergen.rs b/crates/router_env/src/vergen.rs index 22e16605a2..93fd4f4f3d 100644 --- a/crates/router_env/src/vergen.rs +++ b/crates/router_env/src/vergen.rs @@ -8,53 +8,26 @@ /// Panics if `vergen` fails to generate `cargo` build instructions. #[allow(clippy::expect_used)] pub fn generate_cargo_instructions() { - use vergen::{vergen, Config, ShaKind}; + use std::io::Write; - let mut config = Config::default(); + use vergen::EmitBuilder; - let build = config.build_mut(); - *build.enabled_mut() = false; - *build.skip_if_error_mut() = true; + EmitBuilder::builder() + .cargo_debug() + .cargo_opt_level() + .cargo_target_triple() + .git_commit_timestamp() + .git_describe(true, true) + .git_sha(true) + .rustc_semver() + .rustc_commit_hash() + .emit() + .expect("Failed to generate `cargo` build instructions"); - let cargo = config.cargo_mut(); - *cargo.enabled_mut() = true; - *cargo.features_mut() = false; - *cargo.profile_mut() = true; - *cargo.target_triple_mut() = true; - - let git = config.git_mut(); - *git.enabled_mut() = true; - *git.commit_author_mut() = false; - *git.commit_count_mut() = false; - *git.commit_message_mut() = false; - *git.commit_timestamp_mut() = true; - *git.semver_mut() = true; - *git.semver_dirty_mut() = Some("-dirty"); - *git.skip_if_error_mut() = true; - *git.sha_kind_mut() = ShaKind::Both; - *git.skip_if_error_mut() = true; - - let rustc = config.rustc_mut(); - *rustc.enabled_mut() = true; - *rustc.channel_mut() = false; - *rustc.commit_date_mut() = false; - *rustc.host_triple_mut() = false; - *rustc.llvm_version_mut() = false; - *rustc.semver_mut() = true; - *rustc.sha_mut() = true; // required for semver to be available - *rustc.skip_if_error_mut() = true; - - let sysinfo = config.sysinfo_mut(); - *sysinfo.enabled_mut() = false; - *sysinfo.os_version_mut() = false; - *sysinfo.user_mut() = false; - *sysinfo.memory_mut() = false; - *sysinfo.cpu_vendor_mut() = false; - *sysinfo.cpu_core_count_mut() = false; - *sysinfo.cpu_name_mut() = false; - *sysinfo.cpu_brand_mut() = false; - *sysinfo.cpu_frequency_mut() = false; - *sysinfo.skip_if_error_mut() = true; - - vergen(config).expect("Failed to generate `cargo` build instructions"); + writeln!( + &mut std::io::stdout(), + "cargo:rustc-env=CARGO_PROFILE={}", + std::env::var("PROFILE").expect("Failed to obtain `cargo` profile") + ) + .expect("Failed to set `CARGO_PROFILE` environment variable"); } diff --git a/crates/router_env/tests/env.rs b/crates/router_env/tests/env.rs index 54317c92bf..16a26b3ac7 100644 --- a/crates/router_env/tests/env.rs +++ b/crates/router_env/tests/env.rs @@ -3,28 +3,19 @@ use router_env as env; #[tokio::test] async fn basic() -> Result<(), Box> { println!("CARGO_PKG_VERSION : {:?}", env!("CARGO_PKG_VERSION")); - println!("CARGO_PROFILE : {:?}", env!("VERGEN_CARGO_PROFILE")); + println!("CARGO_PROFILE : {:?}", env!("CARGO_PROFILE")); println!( "GIT_COMMIT_TIMESTAMP : {:?}", env!("VERGEN_GIT_COMMIT_TIMESTAMP") ); println!("GIT_SHA : {:?}", env!("VERGEN_GIT_SHA")); - println!("GIT_SHA_SHORT : {:?}", env!("VERGEN_GIT_SHA_SHORT")); println!("RUSTC_SEMVER : {:?}", env!("VERGEN_RUSTC_SEMVER")); println!( "CARGO_TARGET_TRIPLE : {:?}", env!("VERGEN_CARGO_TARGET_TRIPLE") ); - // println!( - // "SYSINFO_OS_VERSION : {:?}", - // env!("VERGEN_SYSINFO_OS_VERSION") - // ); - // println!("SYSINFO_CPU_BRAND : {:?}", env!("VERGEN_SYSINFO_CPU_BRAND")); - - // println!("CARGO_BIN_NAME : {}", env!("CARGO_BIN_NAME")); - Ok(()) } diff --git a/crates/storage_models/Cargo.toml b/crates/storage_models/Cargo.toml index f55f5972a0..4852e0888d 100644 --- a/crates/storage_models/Cargo.toml +++ b/crates/storage_models/Cargo.toml @@ -11,8 +11,8 @@ kv_store = [] [dependencies] async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = "9a71d142726dbc33f41c1fd935ddaa79841c7be5" } -async-trait = "0.1.61" -diesel = { version = "2.0.2", features = ["postgres", "serde_json", "time"] } +async-trait = "0.1.63" +diesel = { version = "2.0.3", features = ["postgres", "serde_json", "time"] } error-stack = "0.2.4" frunk = "0.4.1" frunk_core = "0.4.1"