diff --git a/CHANGELOG.md b/CHANGELOG.md index 571f8713dd..36a1733033 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,68 @@ All notable changes to Router will be documented in this file. This project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html). +# [1.14.0] - 2023-04-06 + +## 🚀 Features + +### GraphOS Enterprise: Coprocessor read access to request `uri`, `method` and HTTP response status codes ([Issue #2861](https://github.com/apollographql/router/issues/2861), [Issue #2861](https://github.com/apollographql/router/issues/2862)) + +We've added the ability for [coprocessors](https://www.apollographql.com/docs/router/customizations/coprocessor) to have read-only access to additional contextual information at [the `RouterService` and `SubgraphService`](https://www.apollographql.com/docs/router/customizations/coprocessor/#how-it-works) stages: + +The `RouterService` stage now has read-only access to these **client request** properties: + - `path` (e.g., `/graphql`) + - `method` (e.g., `POST`, `GET`) + +The `RouterService` stage now has read-only access to these **client response** properties: + - `status_code` (e.g. `403`, `200`) + +The `SubgraphService` stage now has read-only access to these **subgraph response** properties: + - `status_code` (e.g., `503`, `200`) + +By [@o0ignition0o](https://github.com/o0ignition0o) in https://github.com/apollographql/router/pull/2863 + +## 🐛 Fixes + +### Coprocessors: Empty body requests from `GET` requests are now deserialized without error + +Fixes a bug where a coprocessor operating at the `router_request` stage would fail to deserialize an empty body, which is typical for `GET` requests. + +By [@o0ignition0o](https://github.com/o0ignition0o) in https://github.com/apollographql/router/pull/2863 + +## 📃 Configuration + +### Helm: Router chart now supports `extraLabels` for Deployments/Pods + +Our Helm chart now supports a new value called `extraLabels`, which enables chart users to add custom labels to the Router Deployment and its Pods. + +By [@gscheibel](https://github.com/gscheibel/) in https://github.com/apollographql/router/pull/2903 + +### Helm: Router chart now supports `extraContainers` to run sidecars + +Our Helm chart now supports `extraContainers` in an effort to simplify the ability to run containers alongside Router containers (sidecars) which is a useful pattern for [coprocessors](https://www.apollographql.com/docs/router/customizations/coprocessor/). + +By [@pcarrier](https://github.com/pcarrier) in https://github.com/apollographql/router/pull/2881 + +### Migrate away from unimplemented `coprocessor.subgraph.all.response.uri` + +We have removed a completely unimplemented `coprocessor.subgraph.all.response.uri` key from our configuration. It had no effect, but we will automatically migrate configurations which did use it, resulting in no breaking changes by this removal. + +By [@o0ignition0o](https://github.com/o0ignition0o) in https://github.com/apollographql/router/pull/2863 + +## 📚 Documentation + +### Update coprocessor documentation to reflect newly added fields ([Issue #2886](https://github.com/apollographql/router/issues/2886)) + +The [External coprocessing documentation](https://www.apollographql.com/docs/router/customizations/coprocessor) is now up to date, with a full configuration example, and the newly added fields. + +By [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/2863 + +### Example: Rhai-based `cache-control` response header management + +A new Rhai example demonstrates how to recreate some of the behavior of Apollo Gateway's subgraph `cache-control` response header behavior. This addresses some of the need identified in #326. + +By [@lennyburdette](https://github.com/lennyburdette) in https://github.com/apollographql/router/pull/2759 + # [1.13.2] - 2023-04-03 ## 🐛 Fixes diff --git a/Cargo.lock b/Cargo.lock index 8407c62b1c..0ad8dbbf29 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,12 +43,12 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ "crypto-common", - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -149,11 +149,51 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "anstream" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] + [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "apollo-ariadne" @@ -167,9 +207,9 @@ dependencies = [ [[package]] name = "apollo-compiler" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecbe4f00b1baeb4dfe40eb54e8e3831057086296e68217e4f7a246569abebac" +checksum = "4f2ac73f66d5f39aad9f4c6b888c048046f4bd59c6678a30164fc16fb7ccb6a2" dependencies = [ "apollo-ariadne", "apollo-parser 0.5.0", @@ -232,7 +272,7 @@ dependencies = [ [[package]] name = "apollo-router" -version = "1.13.2" +version = "1.14.0" dependencies = [ "access-json", "ansi_term", @@ -250,7 +290,7 @@ dependencies = [ "buildstructor 0.5.2", "bytes", "ci_info", - "clap 4.1.4", + "clap 4.2.1", "console-subscriber", "dashmap", "derivative", @@ -357,7 +397,7 @@ dependencies = [ "url", "urlencoding", "uuid", - "walkdir 2.3.2", + "walkdir 2.3.3", "wiremock", "wsl", "yaml-rust", @@ -365,7 +405,7 @@ dependencies = [ [[package]] name = "apollo-router-benchmarks" -version = "1.13.2" +version = "1.14.0" dependencies = [ "apollo-parser 0.4.1", "apollo-router", @@ -381,11 +421,11 @@ dependencies = [ [[package]] name = "apollo-router-scaffold" -version = "1.13.2" +version = "1.14.0" dependencies = [ "anyhow", "cargo-scaffold", - "clap 4.1.4", + "clap 4.2.1", "copy_dir", "regex", "str_inflector", @@ -408,9 +448,9 @@ dependencies = [ [[package]] name = "arbitrary" -version = "1.2.3" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e90af4de65aa7b293ef2d09daff88501eb254f58edde2e1ac02c82d873eadad" +checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" dependencies = [ "derive_arbitrary", ] @@ -452,7 +492,7 @@ checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" dependencies = [ "askama_shared", "proc-macro2", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -477,7 +517,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 1.0.107", + "syn 1.0.109", "toml", ] @@ -534,34 +574,35 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +checksum = "ad445822218ce64be7a341abfb0b1ea43b5c23aa83902542a4542e78309d8e5e" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "async-trait" -version = "0.1.67" +version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.3", + "syn 2.0.13", ] [[package]] @@ -658,6 +699,15 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "backtrace-ext" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" +dependencies = [ + "backtrace", +] + [[package]] name = "base16ct" version = "0.1.1" @@ -694,9 +744,9 @@ dependencies = [ [[package]] name = "base64ct" -version = "1.5.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bit-set" @@ -721,11 +771,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -736,11 +786,11 @@ checksum = "9e2211b0817f061502a8dd9f11a37e879e79763e3c698d2418cf824d8cb2f21e" [[package]] name = "block-padding" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -756,9 +806,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -775,6 +825,16 @@ dependencies = [ "regex-automata", ] +[[package]] +name = "bstr" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "buildstructor" version = "0.3.2" @@ -785,7 +845,7 @@ dependencies = [ "proc-macro2", "quote", "str_inflector", - "syn 1.0.107", + "syn 1.0.109", "thiserror", "try_match", ] @@ -800,16 +860,16 @@ dependencies = [ "proc-macro2", "quote", "str_inflector", - "syn 2.0.3", + "syn 2.0.13", "thiserror", "try_match", ] [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bytecount" @@ -839,11 +899,23 @@ dependencies = [ "either", ] +[[package]] +name = "cache-control" +version = "0.1.0" +dependencies = [ + "anyhow", + "apollo-router", + "http", + "serde_json", + "tokio", + "tower", +] + [[package]] name = "cargo-scaffold" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a14e2a7adeaf890958568da541ab7b52fefb784937d8ea7f18a03218b1701fe9" +checksum = "6828446789083ba7a028638e2033176eeb854397e75bdebcfdd04fa001c31d6f" dependencies = [ "anyhow", "buildstructor 0.3.2", @@ -859,7 +931,7 @@ dependencies = [ "shell-words", "structopt", "toml", - "walkdir 2.3.2", + "walkdir 2.3.3", ] [[package]] @@ -879,9 +951,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] @@ -969,30 +1041,38 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.4" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex 0.3.0", - "is-terminal", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex 0.4.1", "strsim 0.10.0", - "termcolor", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck 0.4.1", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.13", ] [[package]] @@ -1006,12 +1086,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "combine" @@ -1040,11 +1117,26 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "concolor-override" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys 0.45.0", +] + [[package]] name = "concurrent-queue" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils", ] @@ -1085,9 +1177,9 @@ dependencies = [ [[package]] name = "console" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", @@ -1134,9 +1226,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" +checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" [[package]] name = "const-random" @@ -1217,9 +1309,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "countme" @@ -1229,9 +1321,9 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] @@ -1276,7 +1368,7 @@ dependencies = [ "serde_json", "tinytemplate", "tokio", - "walkdir 2.3.2", + "walkdir 2.3.3", ] [[package]] @@ -1291,9 +1383,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1301,9 +1393,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -1312,22 +1404,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] @@ -1344,7 +1436,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1356,7 +1448,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "typenum", ] @@ -1368,7 +1460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1395,13 +1487,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms", "subtle", "zeroize", ] @@ -1426,10 +1519,16 @@ dependencies = [ "hashbrown", "lock_api", "once_cell", - "parking_lot_core 0.9.5", + "parking_lot_core 0.9.7", "serde", ] +[[package]] +name = "data-encoding" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" + [[package]] name = "deadpool" version = "0.9.5" @@ -1532,7 +1631,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1591,18 +1690,18 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "derive_arbitrary" -version = "1.2.3" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8beee4701e2e229e8098bbdecdca12449bc3e322f137d269182fa1291e20bd00" +checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1615,7 +1714,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.0", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1666,15 +1765,6 @@ dependencies = [ "generic-array 0.12.4", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array 0.14.6", -] - [[package]] name = "digest" version = "0.10.6" @@ -1693,16 +1783,16 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", ] [[package]] name = "dirs" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd" dependencies = [ - "dirs-sys", + "dirs-sys 0.4.0", ] [[package]] @@ -1716,6 +1806,17 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "dirs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +dependencies = [ + "libc", + "redox_users", + "windows-sys 0.45.0", +] + [[package]] name = "displaydoc" version = "0.2.3" @@ -1724,7 +1825,7 @@ checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1762,9 +1863,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecdsa" @@ -1792,9 +1893,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" @@ -1807,7 +1908,7 @@ dependencies = [ "der", "digest 0.10.6", "ff", - "generic-array 0.14.6", + "generic-array 0.14.7", "group", "hkdf", "pem-rfc7468", @@ -1871,22 +1972,22 @@ dependencies = [ [[package]] name = "erased-serde" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ca605381c017ec7a5fef5e548f1cfaa419ed0f6df6367339300db74c92aa7d" +checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" dependencies = [ "serde", ] [[package]] name = "errno" -version = "0.2.8" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" dependencies = [ "errno-dragonfly", "libc", - "winapi 0.3.9", + "windows-sys 0.45.0", ] [[package]] @@ -1936,9 +2037,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1953,16 +2054,22 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" + [[package]] name = "filetime" -version = "0.2.19" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.42.0", + "redox_syscall 0.2.16", + "windows-sys 0.45.0", ] [[package]] @@ -2034,13 +2141,13 @@ dependencies = [ [[package]] name = "foreign-types-macros" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.13", ] [[package]] @@ -2096,7 +2203,7 @@ dependencies = [ "redis-protocol", "rustls", "rustls-native-certs", - "semver 1.0.16", + "semver 1.0.17", "sha-1", "tokio", "tokio-rustls", @@ -2126,9 +2233,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -2141,9 +2248,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -2151,15 +2258,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -2169,9 +2276,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" @@ -2190,32 +2297,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.13", ] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-test" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6a770d3eb0d13372658eec78213b849e0530cf58b4fbc7bf0320e5e4632716" +checksum = "84af27744870a4a325fa342ce65a940dfba08957b260b790ec278c1d81490349" dependencies = [ "futures-core", "futures-executor", @@ -2236,9 +2343,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -2263,9 +2370,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -2307,20 +2414,20 @@ dependencies = [ [[package]] name = "ghost" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" +checksum = "e77ac7b51b8e6313251737fcef4b1c01a2ea102bde68415b62c0ee9268fec357" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.13", ] [[package]] name = "gimli" -version = "0.27.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "git2" @@ -2339,12 +2446,12 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr", + "bstr 1.4.0", "fnv", "log", "regex", @@ -2394,7 +2501,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -2405,7 +2512,7 @@ checksum = "a755cc59cda2641ea3037b4f9f7ef40471c329f55c1fa2db6fa0bb7ae6c1f7ce" dependencies = [ "graphql_client_codegen", "proc-macro2", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -2421,9 +2528,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes", "fnv", @@ -2553,6 +2660,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hex" version = "0.4.3" @@ -2748,9 +2861,9 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -2763,7 +2876,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" dependencies = [ - "console 0.15.4", + "console 0.15.5", "lazy_static", "number_prefix", "regex", @@ -2802,16 +2915,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ "block-padding", - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "insta" -version = "1.26.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff" +checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" dependencies = [ - "console 0.15.4", + "console 0.15.5", "lazy_static", "linked-hash-map", "pest", @@ -2865,30 +2978,31 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] name = "is-terminal" -version = "0.4.2" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2923,18 +3037,18 @@ checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -2979,11 +3093,11 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "8.2.0" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828" +checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "pem", "ring", "serde", @@ -3044,15 +3158,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libfuzzer-sys" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8fff891139ee62800da71b7fd5b508d570b9ad95e614a53c6f453ca08366038" +checksum = "beb09950ae85a0a94b27676cccf37da5ff13f27076aa1adbc6545dd0d0e1bd4e" dependencies = [ "arbitrary", "cc", @@ -3073,6 +3187,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + [[package]] name = "libm" version = "0.2.6" @@ -3131,14 +3251,14 @@ checksum = "c880e0101fc5844ae1c2f3b5b50aba1fb1939e308149dc2dde33b80a0816df18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.3", + "syn 2.0.13", ] [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "lock_api" @@ -3209,18 +3329,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -3237,12 +3348,13 @@ dependencies = [ [[package]] name = "miette" -version = "5.5.0" +version = "5.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd9b301defa984bbdbe112b4763e093ed191750a0d914a78c1106b2d0fe703" +checksum = "7abdc09c381c9336b9f2e9bd6067a9a5290d20e2d2e2296f275456121c33ae89" dependencies = [ - "atty", "backtrace", + "backtrace-ext", + "is-terminal", "miette-derive", "once_cell", "owo-colors", @@ -3257,13 +3369,13 @@ dependencies = [ [[package]] name = "miette-derive" -version = "5.5.0" +version = "5.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c2401ab7ac5282ca5c8b518a87635b1a93762b0b90b9990c509888eeccba29" +checksum = "8842972f23939443013dfd3720f46772b743e86f1a81d120d4b6fb090f87de1c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.13", ] [[package]] @@ -3318,21 +3430,21 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "mockall" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" dependencies = [ "cfg-if", "downcast", @@ -3345,21 +3457,21 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "multer" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" dependencies = [ "bytes", "encoding_rs", @@ -3369,7 +3481,7 @@ dependencies = [ "log", "memchr", "mime", - "spin 0.9.4", + "spin 0.9.8", "version_check", ] @@ -3384,9 +3496,9 @@ dependencies = [ [[package]] name = "nom" -version = "7.1.2" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -3410,7 +3522,7 @@ dependencies = [ "kqueue", "libc", "mio", - "walkdir 2.3.2", + "walkdir 2.3.3", "windows-sys 0.42.0", ] @@ -3457,7 +3569,7 @@ checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" dependencies = [ "byteorder", "lazy_static", - "libm", + "libm 0.2.6", "num-integer", "num-iter", "num-traits", @@ -3474,9 +3586,9 @@ checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa" [[package]] name = "num-complex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -3521,7 +3633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", + "libm 0.2.6", ] [[package]] @@ -3542,9 +3654,9 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" [[package]] name = "object" -version = "0.30.1" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d864c91689fdc196779b98dba0aceac6118594c2df6ee5d943eb6a8df4d107a" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ "memchr", ] @@ -3585,15 +3697,24 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "111.25.2+1.1.1t" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" -version = "0.9.80" +version = "0.9.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa" dependencies = [ - "autocfg", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -3795,9 +3916,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.4.1" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] name = "outref" @@ -3851,6 +3972,16 @@ dependencies = [ "sha2", ] +[[package]] +name = "packed_simd_2" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm 0.1.4", +] + [[package]] name = "parking" version = "2.0.0" @@ -3875,7 +4006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.5", + "parking_lot_core 0.9.7", ] [[package]] @@ -3887,35 +4018,35 @@ dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi 0.3.9", ] [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "paste" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ "base64 0.13.1", ] @@ -3937,9 +4068,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.2" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6e86fb9e7026527a0d46bc308b841d73170ef8f443e1807f6ef88526a816d4" +checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" dependencies = [ "thiserror", "ucd-trie", @@ -3947,9 +4078,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.2" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96504449aa860c8dcde14f9fba5c58dc6658688ca1fe363589d6327b8662c603" +checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" dependencies = [ "pest", "pest_generator", @@ -3957,33 +4088,33 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.2" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "798e0220d1111ae63d66cb66a5dcb3fc2d986d520b98e49e1852bfdb11d7c5e7" +checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.13", ] [[package]] name = "pest_meta" -version = "2.5.2" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "984298b75898e30a843e278a9f2452c31e349a073a0ce6fd950a12a74464e065" +checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" dependencies = [ "once_cell", "pest", - "sha1 0.10.5", + "sha2", ] [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset", "indexmap", @@ -4008,7 +4139,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4051,6 +4182,12 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "plotters" version = "0.3.4" @@ -4087,7 +4224,7 @@ checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4124,15 +4261,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -4150,12 +4287,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.22" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8992a85d8e93a28bdf76137db888d3874e3b230dee5ed8bebac4c9f7617773" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4169,13 +4306,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit", ] [[package]] @@ -4187,7 +4323,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "version_check", ] @@ -4210,9 +4346,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -4259,9 +4395,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.5" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5320c680de74ba083512704acb90fe00f28f79207286a848e730c45dd73ed6" +checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12" dependencies = [ "bytes", "heck 0.4.1", @@ -4274,7 +4410,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 1.0.107", + "syn 1.0.109", "tempfile", "which", ] @@ -4289,7 +4425,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4409,9 +4545,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -4419,9 +4555,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -4472,6 +4608,15 @@ dependencies = [ "bitflags", ] +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.4.3" @@ -4479,7 +4624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom 0.2.8", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] @@ -4505,15 +4650,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.15" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ "base64 0.21.0", "bytes", @@ -4570,9 +4715,9 @@ dependencies = [ [[package]] name = "rhai" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff176e72a35d975ea0759b1bed69e30ad5cf47580b2e5d00449e8623b5a37dc" +checksum = "fd29fa1f740be6dc91982013957e08c3c4232d7efcfe19e12da87d50bad47758" dependencies = [ "ahash 0.8.3", "bitflags", @@ -4652,7 +4797,7 @@ checksum = "db74e3fdd29d969a0ec1f8e79171a6f0f71d0429293656901db382d248c4c021" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4721,13 +4866,13 @@ dependencies = [ [[package]] name = "rowan" -version = "0.15.10" +version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5811547e7ba31e903fe48c8ceab10d40d70a101f3d15523c847cce91aa71f332" +checksum = "64449cfef9483a475ed56ae30e2da5ee96448789fb2aa240a04beb6a055078bf" dependencies = [ "countme", "hashbrown", - "memoffset 0.6.5", + "memoffset", "rustc-hash", "text-size", ] @@ -4768,43 +4913,43 @@ dependencies = [ [[package]] name = "rust-embed" -version = "6.4.2" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "283ffe2f866869428c92e0d61c2f35dfb4355293cdfdc48f49e895c15f1333d1" +checksum = "1b68543d5527e158213414a92832d2aab11a84d2571a5eb021ebe22c43aab066" dependencies = [ "rust-embed-impl", "rust-embed-utils", - "walkdir 2.3.2", + "walkdir 2.3.3", ] [[package]] name = "rust-embed-impl" -version = "6.3.1" +version = "6.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ab23d42d71fb9be1b643fe6765d292c5e14d46912d13f3ae2815ca048ea04d" +checksum = "4d4e0f0ced47ded9a68374ac145edd65a6c1fa13a96447b873660b2a568a0fd7" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 1.0.107", - "walkdir 2.3.2", + "syn 1.0.109", + "walkdir 2.3.3", ] [[package]] name = "rust-embed-utils" -version = "7.3.0" +version = "7.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1669d81dfabd1b5f8e2856b8bbe146c6192b0ba22162edc738ac0a5de18f054" +checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731" dependencies = [ "sha2", - "walkdir 2.3.2", + "walkdir 2.3.3", ] [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" [[package]] name = "rustc-hash" @@ -4827,21 +4972,21 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.16", + "semver 1.0.17", ] [[package]] name = "rustix" -version = "0.36.6" +version = "0.37.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" +checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -4879,15 +5024,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "salsa" @@ -4915,7 +5060,7 @@ dependencies = [ "heck 0.3.3", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4929,12 +5074,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -4959,7 +5103,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4986,7 +5130,7 @@ checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct", "der", - "generic-array 0.14.6", + "generic-array 0.14.7", "pkcs8", "subtle", "zeroize", @@ -4994,9 +5138,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", @@ -5007,9 +5151,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ "core-foundation-sys", "libc", @@ -5026,9 +5170,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "semver-parser" @@ -5038,31 +5182,31 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.149" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" +checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.149" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.13", ] [[package]] @@ -5073,14 +5217,14 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "indexmap", "itoa", @@ -5102,9 +5246,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" +checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" dependencies = [ "serde", ] @@ -5128,7 +5272,7 @@ checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5234,18 +5378,18 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "shellexpand" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1c7ddea665294d484c39fd0c0d2b7e35bbfe10035c5fe1854741a57f6880e1" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" dependencies = [ "dirs", ] [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -5276,7 +5420,7 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" dependencies = [ - "bstr", + "bstr 0.2.17", "unicode-segmentation", ] @@ -5286,7 +5430,7 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbf644ad016b75129f01a34a355dcb8d66a5bc803e417c7a77cc5d5ee9fa0f18" dependencies = [ - "console 0.15.4", + "console 0.15.5", "similar", ] @@ -5304,9 +5448,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -5340,9 +5484,9 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", @@ -5350,11 +5494,11 @@ dependencies = [ [[package]] name = "sourcemap" -version = "6.2.1" +version = "6.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebe057d110ddba043708da3fb010bf562ff6e9d4d60c9ee92860527bcbeccd6" +checksum = "eed16231c92d0a6f0388f56e0ab2be24ecff1173f8e22f0ea5e074d0525631cb" dependencies = [ - "base64 0.13.1", + "data-encoding", "if_chain", "rustc_version 0.2.3", "serde", @@ -5371,9 +5515,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spki" @@ -5434,7 +5578,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5447,7 +5591,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5470,37 +5614,37 @@ dependencies = [ [[package]] name = "supports-color" -version = "1.3.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" +checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" dependencies = [ - "atty", + "is-terminal", "is_ci", ] [[package]] name = "supports-hyperlinks" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590b34f7c5f01ecc9d78dba4b3f445f31df750a67621cf31626f3b7441ce6406" +checksum = "4b4806e0b03b9906e76b018a5d821ebf198c8e9dc0829ed3328eeeb5094aed60" dependencies = [ - "atty", + "is-terminal", ] [[package]] name = "supports-unicode" -version = "1.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b945e45b417b125a8ec51f1b7df2f8df7920367700d1f98aedd21e5735f8b2" +checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7" dependencies = [ - "atty", + "is-terminal", ] [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -5509,9 +5653,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.3" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8234ae35e70582bfa0f1fedffa6daa248e41dd045310b19800c4a36382c8f60" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" dependencies = [ "proc-macro2", "quote", @@ -5520,9 +5664,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sys-info" @@ -5536,22 +5680,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -5577,9 +5721,9 @@ dependencies = [ [[package]] name = "termtree" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-log" @@ -5589,7 +5733,7 @@ checksum = "38f0c854faeb68a048f0f2dc410c5ddae3bf83854ef0e4977d58306a5edef50e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5621,7 +5765,7 @@ checksum = "1f972445f2c781bb6d47ee4a715db3a0e404a79d977f751fd4eb2b0d44c6eb9d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5673,7 +5817,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.3", + "syn 2.0.13", ] [[package]] @@ -5684,10 +5828,11 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -5728,9 +5873,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ "itoa", "serde", @@ -5746,9 +5891,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -5783,9 +5928,9 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" @@ -5826,7 +5971,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5889,6 +6034,23 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + [[package]] name = "tonic" version = "0.8.3" @@ -5935,7 +6097,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6047,7 +6209,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6130,9 +6292,9 @@ dependencies = [ [[package]] name = "tracing-test" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3d272c44878d2bbc9f4a20ad463724f03e19dbc667c6e84ac433ab7ffcc70b" +checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" dependencies = [ "lazy_static", "tracing-core", @@ -6142,20 +6304,20 @@ dependencies = [ [[package]] name = "tracing-test-macro" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744324b12d69a9fc1edea4b38b7b1311295b662d161ad5deac17bb1358224a08" +checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" dependencies = [ "lazy_static", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try_match" @@ -6175,7 +6337,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6186,7 +6348,7 @@ checksum = "a46ee5bd706ff79131be9c94e7edcb82b703c487766a114434e5790361cf08c5" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6216,7 +6378,7 @@ checksum = "e60147782cc30833c05fba3bab1d9b5771b2685a2557672ac96fa5d154099c0e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6286,9 +6448,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-id" @@ -6298,9 +6460,9 @@ checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-linebreak" @@ -6323,9 +6485,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" @@ -6389,6 +6551,12 @@ dependencies = [ "url", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "1.1.2" @@ -6465,12 +6633,11 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi 0.3.9", "winapi-util", ] @@ -6498,9 +6665,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6508,24 +6675,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -6535,9 +6702,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6545,22 +6712,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wasm-streams" @@ -6577,9 +6744,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -6606,9 +6773,9 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -6660,103 +6827,159 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "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", ] [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "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", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -6769,13 +6992,13 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.5.17" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12316b50eb725e22b2f6b9c4cbede5b7b89984274d113a7440c86e5c3fc6f99b" +checksum = "bd7b0b5b253ebc0240d6aac6dd671c495c467420577bf634d3064ae7e6fa2b4c" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.13.1", + "base64 0.21.0", "deadpool", "futures", "futures-timer", @@ -6797,12 +7020,13 @@ checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4" [[package]] name = "x25519-dalek" -version = "2.0.0-pre.1" +version = "2.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +checksum = "fabd6e16dd08033932fc3265ad4510cc2eab24656058a6dcb107ffe274abcc95" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.0.0-rc.2", "rand_core 0.6.4", + "serde", "zeroize", ] @@ -6823,20 +7047,20 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zeroize" -version = "1.5.7" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57090580b8b26d9fd2288c4ac982b3b3c6446cd8e91112bcf672d5ddb2f17441" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.3", + "syn 2.0.13", ] diff --git a/Cargo.toml b/Cargo.toml index 86ff32bab2..3fe0e63b79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,7 @@ members = [ "apollo-router-scaffold", "examples/add-timestamp-header/rhai", "examples/async-auth/rust", + "examples/cache-control/rhai", "examples/context/rust", "examples/cookies-to-headers/rhai", "examples/data-response-mutate/rhai", @@ -34,7 +35,7 @@ strip = "debuginfo" incremental = false # If building a dhat feature, you must use this profile -# e.g. heap allocation tracing: cargo build --profile release-dhat --features dhat-heap +# e.g. heap allocation tracing: cargo build --profile release-dhat --features dhat-heap # e.g. heap and ad-hoc allocation tracing: cargo build --profile release-dhat --features dhat-heap,dhat-ad-hoc [profile.release-dhat] inherits = "release" diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml index 5a5b2dccfb..9d6596aeae 100644 --- a/apollo-router-benchmarks/Cargo.toml +++ b/apollo-router-benchmarks/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router-benchmarks" -version = "1.13.2" +version = "1.14.0" authors = ["Apollo Graph, Inc. "] edition = "2021" license = "Elastic-2.0" diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml index ce2e9d08e7..00e943811e 100644 --- a/apollo-router-scaffold/Cargo.toml +++ b/apollo-router-scaffold/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router-scaffold" -version = "1.13.2" +version = "1.14.0" authors = ["Apollo Graph, Inc. "] edition = "2021" license = "Elastic-2.0" diff --git a/apollo-router-scaffold/templates/base/Cargo.toml b/apollo-router-scaffold/templates/base/Cargo.toml index b843805115..e44d62ab63 100644 --- a/apollo-router-scaffold/templates/base/Cargo.toml +++ b/apollo-router-scaffold/templates/base/Cargo.toml @@ -22,7 +22,7 @@ apollo-router = { path ="{{integration_test}}apollo-router" } apollo-router = { git="https://github.com/apollographql/router.git", branch="{{branch}}" } {{else}} # Note if you update these dependencies then also update xtask/Cargo.toml -apollo-router = "1.13.2" +apollo-router = "1.14.0" {{/if}} {{/if}} async-trait = "0.1.52" diff --git a/apollo-router-scaffold/templates/base/xtask/Cargo.toml b/apollo-router-scaffold/templates/base/xtask/Cargo.toml index 8f91d7b893..372a3518ef 100644 --- a/apollo-router-scaffold/templates/base/xtask/Cargo.toml +++ b/apollo-router-scaffold/templates/base/xtask/Cargo.toml @@ -13,7 +13,7 @@ apollo-router-scaffold = { path ="{{integration_test}}apollo-router-scaffold" } {{#if branch}} apollo-router-scaffold = { git="https://github.com/apollographql/router.git", branch="{{branch}}" } {{else}} -apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.13.2" } +apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.14.0" } {{/if}} {{/if}} anyhow = "1.0.58" diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index e8636f9fa6..7c03ba30c2 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router" -version = "1.13.2" +version = "1.14.0" authors = ["Apollo Graph, Inc. "] repository = "https://github.com/apollographql/router/" documentation = "https://docs.rs/apollo-router" diff --git a/apollo-router/src/configuration/migrations/0007-coprocessor_subgraph_url.yaml b/apollo-router/src/configuration/migrations/0007-coprocessor_subgraph_url.yaml new file mode 100644 index 0000000000..4b4ecad9cb --- /dev/null +++ b/apollo-router/src/configuration/migrations/0007-coprocessor_subgraph_url.yaml @@ -0,0 +1,4 @@ +description: coprocessor.subgraph.all.response.uri was removed +actions: + - type: delete + path: coprocessor.subgraph.all.response.uri diff --git a/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap b/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap index c7f176f6cf..e0438fb4ac 100644 --- a/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap +++ b/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap @@ -211,13 +211,16 @@ expression: "&schema" "headers": false, "context": false, "body": false, - "sdl": false + "sdl": false, + "path": false, + "method": false }, "response": { "headers": false, "context": false, "body": false, - "sdl": false + "sdl": false, + "status_code": false } }, "type": "object", @@ -228,7 +231,9 @@ expression: "&schema" "headers": false, "context": false, "body": false, - "sdl": false + "sdl": false, + "path": false, + "method": false }, "type": "object", "properties": { @@ -247,6 +252,16 @@ expression: "&schema" "default": false, "type": "boolean" }, + "method": { + "description": "Send the method", + "default": false, + "type": "boolean" + }, + "path": { + "description": "Send the path", + "default": false, + "type": "boolean" + }, "sdl": { "description": "Send the SDL", "default": false, @@ -261,7 +276,8 @@ expression: "&schema" "headers": false, "context": false, "body": false, - "sdl": false + "sdl": false, + "status_code": false }, "type": "object", "properties": { @@ -284,6 +300,11 @@ expression: "&schema" "description": "Send the SDL", "default": false, "type": "boolean" + }, + "status_code": { + "description": "Send the HTTP status", + "default": false, + "type": "boolean" } }, "additionalProperties": false @@ -299,14 +320,15 @@ expression: "&schema" "context": false, "body": false, "uri": false, + "method": false, "service_name": false }, "response": { "headers": false, "context": false, "body": false, - "uri": false, - "service_name": false + "service_name": false, + "status_code": false } } }, @@ -320,14 +342,15 @@ expression: "&schema" "context": false, "body": false, "uri": false, + "method": false, "service_name": false }, "response": { "headers": false, "context": false, "body": false, - "uri": false, - "service_name": false + "service_name": false, + "status_code": false } }, "type": "object", @@ -339,6 +362,7 @@ expression: "&schema" "context": false, "body": false, "uri": false, + "method": false, "service_name": false }, "type": "object", @@ -358,6 +382,11 @@ expression: "&schema" "default": false, "type": "boolean" }, + "method": { + "description": "Send the method URI", + "default": false, + "type": "boolean" + }, "service_name": { "description": "Send the service name", "default": false, @@ -377,8 +406,8 @@ expression: "&schema" "headers": false, "context": false, "body": false, - "uri": false, - "service_name": false + "service_name": false, + "status_code": false }, "type": "object", "properties": { @@ -402,8 +431,8 @@ expression: "&schema" "default": false, "type": "boolean" }, - "uri": { - "description": "Send the subgraph URI", + "status_code": { + "description": "Send the http status", "default": false, "type": "boolean" } diff --git a/apollo-router/src/plugins/coprocessor.rs b/apollo-router/src/plugins/coprocessor.rs index f959da6581..ccb7909575 100644 --- a/apollo-router/src/plugins/coprocessor.rs +++ b/apollo-router/src/plugins/coprocessor.rs @@ -152,7 +152,7 @@ where /// What information is passed to a router request/response stage #[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, JsonSchema)] #[serde(default, deny_unknown_fields)] -pub(super) struct RouterConf { +pub(super) struct RouterRequestConf { /// Send the headers pub(super) headers: bool, /// Send the context @@ -161,12 +161,31 @@ pub(super) struct RouterConf { pub(super) body: bool, /// Send the SDL pub(super) sdl: bool, + /// Send the path + pub(super) path: bool, + /// Send the method + pub(super) method: bool, } +/// What information is passed to a router request/response stage +#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, JsonSchema)] +#[serde(default, deny_unknown_fields)] +pub(super) struct RouterResponseConf { + /// Send the headers + pub(super) headers: bool, + /// Send the context + pub(super) context: bool, + /// Send the body + pub(super) body: bool, + /// Send the SDL + pub(super) sdl: bool, + /// Send the HTTP status + pub(super) status_code: bool, +} /// What information is passed to a subgraph request/response stage #[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, JsonSchema)] #[serde(default, deny_unknown_fields)] -pub(super) struct SubgraphConf { +pub(super) struct SubgraphRequestConf { /// Send the headers pub(super) headers: bool, /// Send the context @@ -175,10 +194,28 @@ pub(super) struct SubgraphConf { pub(super) body: bool, /// Send the subgraph URI pub(super) uri: bool, + /// Send the method URI + pub(super) method: bool, /// Send the service name pub(super) service_name: bool, } +/// What information is passed to a subgraph request/response stage +#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, JsonSchema)] +#[serde(default, deny_unknown_fields)] +pub(super) struct SubgraphResponseConf { + /// Send the headers + pub(super) headers: bool, + /// Send the context + pub(super) context: bool, + /// Send the body + pub(super) body: bool, + /// Send the service name + pub(super) service_name: bool, + /// Send the http status + pub(super) status_code: bool, +} + /// Configures the externalization plugin #[derive(Clone, Debug, Default, Deserialize, JsonSchema)] #[serde(deny_unknown_fields)] @@ -206,9 +243,9 @@ fn default_timeout() -> Duration { #[serde(default)] pub(super) struct RouterStage { /// The request configuration - pub(super) request: RouterConf, + pub(super) request: RouterRequestConf, /// The response configuration - pub(super) response: RouterConf, + pub(super) response: RouterResponseConf, } impl RouterStage { @@ -322,9 +359,9 @@ pub(super) struct SubgraphStages { #[serde(default, deny_unknown_fields)] pub(super) struct SubgraphStage { #[serde(default)] - pub(super) request: SubgraphConf, + pub(super) request: SubgraphRequestConf, #[serde(default)] - pub(super) response: SubgraphConf, + pub(super) response: SubgraphResponseConf, } impl SubgraphStage { @@ -429,7 +466,7 @@ async fn process_router_request_stage( coprocessor_url: String, sdl: Arc, mut request: router::Request, - request_config: RouterConf, + request_config: RouterRequestConf, ) -> Result, BoxError> where C: Service, Response = hyper::Response, Error = BoxError> @@ -450,10 +487,15 @@ where .then(|| externalize_header_map(&parts.headers)) .transpose()?; + // HTTP GET requests don't have a body let body_to_send = request_config .body .then(|| serde_json::from_slice::(&bytes)) - .transpose()?; + .transpose() + .unwrap_or_default(); + + let path_to_send = request_config.path.then(|| parts.uri.to_string()); + let context_to_send = request_config.context.then(|| request.context.clone()); let sdl = request_config.sdl.then(|| sdl.clone().to_string()); @@ -467,7 +509,10 @@ where context: context_to_send, sdl, uri: None, + path: path_to_send, + method: Some(parts.method.to_string()), service_name: None, + status_code: None, }; tracing::debug!(?payload, "externalized output"); @@ -551,7 +596,7 @@ async fn process_router_response_stage( coprocessor_url: String, sdl: Arc, mut response: router::Response, - response_config: RouterConf, + response_config: RouterResponseConf, ) -> Result where C: Service, Response = hyper::Response, Error = BoxError> @@ -575,6 +620,7 @@ where .body .then(|| serde_json::from_slice::(&bytes)) .transpose()?; + let status_to_send = response_config.status_code.then(|| parts.status.as_u16()); let context_to_send = response_config.context.then(|| response.context.clone()); let sdl = response_config.sdl.then(|| sdl.clone().to_string()); @@ -586,8 +632,11 @@ where headers: headers_to_send, body: body_to_send, context: context_to_send, + status_code: status_to_send, sdl, uri: None, + path: None, + method: None, service_name: None, }; @@ -633,7 +682,7 @@ async fn process_subgraph_request_stage( coprocessor_url: String, service_name: String, mut request: subgraph::Request, - request_config: SubgraphConf, + request_config: SubgraphRequestConf, ) -> Result, BoxError> where C: Service, Response = hyper::Response, Error = BoxError> @@ -672,7 +721,10 @@ where context: context_to_send, sdl: None, service_name, + path: None, uri, + method: Some(parts.method.to_string()), + status_code: None, }; tracing::debug!(?payload, "externalized output"); @@ -758,7 +810,7 @@ async fn process_subgraph_response_stage( coprocessor_url: String, service_name: String, mut response: subgraph::Response, - response_config: SubgraphConf, + response_config: SubgraphResponseConf, ) -> Result where C: Service, Response = hyper::Response, Error = BoxError> @@ -780,6 +832,8 @@ where .then(|| externalize_header_map(&parts.headers)) .transpose()?; + let status_to_send = response_config.status_code.then(|| parts.status.as_u16()); + let body_to_send = response_config .body .then(|| serde_json::from_slice::(&bytes)) @@ -795,8 +849,11 @@ where headers: headers_to_send, body: body_to_send, context: context_to_send, + status_code: status_to_send, sdl: None, uri: None, + path: None, + method: None, service_name, }; diff --git a/apollo-router/src/plugins/coprocessor_test.rs b/apollo-router/src/plugins/coprocessor_test.rs index 35457b5cdc..fb30b997dd 100644 --- a/apollo-router/src/plugins/coprocessor_test.rs +++ b/apollo-router/src/plugins/coprocessor_test.rs @@ -8,6 +8,7 @@ mod tests { use http::header::CONTENT_TYPE; use http::HeaderMap; use http::HeaderValue; + use http::Method; use http::StatusCode; use hyper::Body; use mime::APPLICATION_JSON; @@ -92,11 +93,13 @@ mod tests { #[tokio::test] async fn coprocessor_returning_the_wrong_version_should_fail() { let router_stage = RouterStage { - request: RouterConf { + request: RouterRequestConf { headers: true, context: true, body: true, sdl: true, + path: false, + method: false, }, response: Default::default(), }; @@ -149,11 +152,13 @@ mod tests { #[tokio::test] async fn coprocessor_returning_the_wrong_stage_should_fail() { let router_stage = RouterStage { - request: RouterConf { + request: RouterRequestConf { headers: true, context: true, body: true, sdl: true, + path: false, + method: false, }, response: Default::default(), }; @@ -206,11 +211,13 @@ mod tests { #[tokio::test] async fn coprocessor_missing_request_control_should_fail() { let router_stage = RouterStage { - request: RouterConf { + request: RouterRequestConf { headers: true, context: true, body: true, sdl: true, + path: false, + method: false, }, response: Default::default(), }; @@ -262,11 +269,12 @@ mod tests { #[tokio::test] async fn coprocessor_subgraph_with_invalid_response_body_should_fail() { let subgraph_stage = SubgraphStage { - request: SubgraphConf { + request: SubgraphRequestConf { headers: false, context: false, body: true, uri: false, + method: false, service_name: false, }, response: Default::default(), @@ -323,11 +331,12 @@ mod tests { #[tokio::test] async fn external_plugin_subgraph_request() { let subgraph_stage = SubgraphStage { - request: SubgraphConf { + request: SubgraphRequestConf { headers: false, context: false, body: true, uri: false, + method: false, service_name: false, }, response: Default::default(), @@ -451,11 +460,12 @@ mod tests { #[tokio::test] async fn external_plugin_subgraph_request_controlflow_break() { let subgraph_stage = SubgraphStage { - request: SubgraphConf { + request: SubgraphRequestConf { headers: false, context: false, body: true, uri: false, + method: false, service_name: false, }, response: Default::default(), @@ -519,12 +529,12 @@ mod tests { async fn external_plugin_subgraph_response() { let subgraph_stage = SubgraphStage { request: Default::default(), - response: SubgraphConf { + response: SubgraphResponseConf { headers: false, context: false, body: true, - uri: false, service_name: false, + status_code: false, }, }; @@ -629,11 +639,13 @@ mod tests { #[tokio::test] async fn external_plugin_router_request() { let router_stage = RouterStage { - request: RouterConf { + request: RouterRequestConf { headers: true, context: true, body: true, sdl: true, + path: true, + method: true, }, response: Default::default(), }; @@ -742,14 +754,144 @@ mod tests { service.oneshot(request.try_into().unwrap()).await.unwrap(); } + #[tokio::test] + async fn external_plugin_router_request_http_get() { + let router_stage = RouterStage { + request: RouterRequestConf { + headers: true, + context: true, + body: true, + sdl: true, + path: true, + method: true, + }, + response: Default::default(), + }; + + let mock_router_service = router_service::from_supergraph_mock_callback(move |req| { + // Let's assert that the router request has been transformed as it should have. + assert_eq!( + req.supergraph_request.headers().get("cookie").unwrap(), + "tasty_cookie=strawberry" + ); + + // the method shouldn't have changed + assert_eq!(req.supergraph_request.method(), Method::GET); + // the uri shouldn't have changed + assert_eq!(req.supergraph_request.uri(), "/"); + + assert_eq!( + req.context + .get::<&str, u8>("this-is-a-test-context") + .unwrap() + .unwrap(), + 42 + ); + + // The query should have changed + assert_eq!( + "query Long {\n me {\n name\n}\n}", + req.supergraph_request.into_body().query.unwrap() + ); + + Ok(supergraph::Response::builder() + .data(json!({ "test": 1234_u32 })) + .context(req.context) + .build() + .unwrap()) + }) + .await; + + let mock_http_client = mock_with_callback(move |req: hyper::Request| { + Box::pin(async { + let deserialized_request: Externalizable = + serde_json::from_slice(&hyper::body::to_bytes(req.into_body()).await.unwrap()) + .unwrap(); + + assert_eq!(EXTERNALIZABLE_VERSION, deserialized_request.version); + assert_eq!( + PipelineStep::RouterRequest.to_string(), + deserialized_request.stage + ); + + Ok(hyper::Response::builder() + .body(Body::from( + r##"{ + "version": 1, + "stage": "RouterRequest", + "control": "continue", + "id": "1b19c05fdafc521016df33148ad63c1b", + "uri": "/this/is/a/new/uri", + "method": "POST", + "headers": { + "cookie": [ + "tasty_cookie=strawberry" + ], + "content-type": [ + "application/json" + ], + "host": [ + "127.0.0.1:4000" + ], + "apollo-federation-include-trace": [ + "ftv1" + ], + "apollographql-client-name": [ + "manual" + ], + "accept": [ + "*/*" + ], + "user-agent": [ + "curl/7.79.1" + ], + "content-length": [ + "46" + ] + }, + "body": { + "query": "query Long {\n me {\n name\n}\n}" + }, + "context": { + "entries": { + "accepts-json": false, + "accepts-wildcard": true, + "accepts-multipart": false, + "this-is-a-test-context": 42 + } + }, + "sdl": "the sdl shouldnt change" + }"##, + )) + .unwrap()) + }) + }); + + let service = router_stage.as_service( + mock_http_client, + mock_router_service.boxed(), + "http://test".to_string(), + Arc::new("".to_string()), + ); + + let request = supergraph::Request::fake_builder() + .method(Method::GET) + .build() + .unwrap(); + + service.oneshot(request.try_into().unwrap()).await.unwrap(); + } + #[tokio::test] async fn external_plugin_router_request_controlflow_break() { let router_stage = RouterStage { - request: RouterConf { + request: RouterRequestConf { headers: true, context: true, body: true, sdl: true, + path: true, + method: true, }, response: Default::default(), }; @@ -830,11 +972,12 @@ mod tests { #[tokio::test] async fn external_plugin_router_response() { let router_stage = RouterStage { - response: RouterConf { + response: RouterResponseConf { headers: true, context: true, body: true, sdl: true, + status_code: false, }, request: Default::default(), }; diff --git a/apollo-router/src/services/external.rs b/apollo-router/src/services/external.rs index 67eec2c1ab..d137fcd4a4 100644 --- a/apollo-router/src/services/external.rs +++ b/apollo-router/src/services/external.rs @@ -87,7 +87,13 @@ pub(crate) struct Externalizable { #[serde(skip_serializing_if = "Option::is_none")] pub(crate) uri: Option, #[serde(skip_serializing_if = "Option::is_none")] + pub(crate) method: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub(crate) path: Option, + #[serde(skip_serializing_if = "Option::is_none")] pub(crate) service_name: Option, + #[serde(skip_serializing_if = "Option::is_none")] + pub(crate) status_code: Option, } impl Externalizable diff --git a/apollo-router/src/services/subgraph.rs b/apollo-router/src/services/subgraph.rs index 666381349c..c2923b9bf8 100644 --- a/apollo-router/src/services/subgraph.rs +++ b/apollo-router/src/services/subgraph.rs @@ -140,6 +140,7 @@ impl Response { extensions: Object, status_code: Option, context: Context, + headers: Option>, ) -> Response { // Build a response let res = graphql::Response::builder() @@ -151,11 +152,13 @@ impl Response { .build(); // Build an http Response - let response = http::Response::builder() + let mut response = http::Response::builder() .status(status_code.unwrap_or(StatusCode::OK)) .body(res) .expect("Response is serializable; qed"); + *response.headers_mut() = headers.unwrap_or_default(); + Self { response, context } } @@ -174,6 +177,7 @@ impl Response { extensions: JsonMap, status_code: Option, context: Option, + headers: Option>, ) -> Response { Response::new( label, @@ -183,6 +187,7 @@ impl Response { extensions, status_code, context.unwrap_or_default(), + headers, ) } @@ -203,6 +208,7 @@ impl Response { Default::default(), status_code, context, + Default::default(), )) } } diff --git a/apollo-router/src/services/supergraph.rs b/apollo-router/src/services/supergraph.rs index 6810781ca9..0923af9c3e 100644 --- a/apollo-router/src/services/supergraph.rs +++ b/apollo-router/src/services/supergraph.rs @@ -133,29 +133,31 @@ impl Request { /// Create a request with an example query, for tests #[builder(visibility = "pub")] fn canned_new( + query: Option, operation_name: Option, // Skip the `Object` type alias in order to use buildstructor’s map special-casing extensions: JsonMap, context: Option, headers: MultiMap, ) -> Result { - let query = " - query TopProducts($first: Int) { - topProducts(first: $first) { - upc - name - reviews { - id - product { name } - author { id name } - } - } + let default_query = " + query TopProducts($first: Int) { + topProducts(first: $first) { + upc + name + reviews { + id + product { name } + author { id name } + } + } } "; + let query = query.unwrap_or(default_query.to_string()); let mut variables = JsonMap::new(); variables.insert("first", 2_usize.into()); Self::fake_new( - Some(query.to_owned()), + Some(query), operation_name, variables, extensions, diff --git a/apollo-router/tests/fixtures/request_response_test.rhai b/apollo-router/tests/fixtures/request_response_test.rhai index 87a807e5dc..1b09327289 100644 --- a/apollo-router/tests/fixtures/request_response_test.rhai +++ b/apollo-router/tests/fixtures/request_response_test.rhai @@ -41,16 +41,16 @@ fn process_supergraph_request(request) { } let expected_query = ` - query TopProducts($first: Int) { - topProducts(first: $first) { - upc - name - reviews { - id - product { name } - author { id name } - } - } + query TopProducts($first: Int) { + topProducts(first: $first) { + upc + name + reviews { + id + product { name } + author { id name } + } + } } `; if request.body.query != expected_query { diff --git a/dockerfiles/tracing/docker-compose.datadog.yml b/dockerfiles/tracing/docker-compose.datadog.yml index ec023fc7e3..e30f205385 100644 --- a/dockerfiles/tracing/docker-compose.datadog.yml +++ b/dockerfiles/tracing/docker-compose.datadog.yml @@ -3,7 +3,7 @@ services: apollo-router: container_name: apollo-router - image: ghcr.io/apollographql/router:v1.13.2 + image: ghcr.io/apollographql/router:v1.14.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/datadog.router.yaml:/etc/config/configuration.yaml diff --git a/dockerfiles/tracing/docker-compose.jaeger.yml b/dockerfiles/tracing/docker-compose.jaeger.yml index d5fa7374ca..b3e1b1dd34 100644 --- a/dockerfiles/tracing/docker-compose.jaeger.yml +++ b/dockerfiles/tracing/docker-compose.jaeger.yml @@ -4,7 +4,7 @@ services: apollo-router: container_name: apollo-router #build: ./router - image: ghcr.io/apollographql/router:v1.13.2 + image: ghcr.io/apollographql/router:v1.14.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/jaeger.router.yaml:/etc/config/configuration.yaml diff --git a/dockerfiles/tracing/docker-compose.zipkin.yml b/dockerfiles/tracing/docker-compose.zipkin.yml index 536a47f7cf..6995a9f34f 100644 --- a/dockerfiles/tracing/docker-compose.zipkin.yml +++ b/dockerfiles/tracing/docker-compose.zipkin.yml @@ -4,7 +4,7 @@ services: apollo-router: container_name: apollo-router build: ./router - image: ghcr.io/apollographql/router:v1.13.2 + image: ghcr.io/apollographql/router:v1.14.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/zipkin.router.yaml:/etc/config/configuration.yaml diff --git a/docs/source/containerization/docker.mdx b/docs/source/containerization/docker.mdx index f5c32d521b..cf22184cac 100644 --- a/docs/source/containerization/docker.mdx +++ b/docs/source/containerization/docker.mdx @@ -11,7 +11,7 @@ The default behaviour of the router images is suitable for a quickstart or devel Note: The [docker documentation](https://docs.docker.com/engine/reference/run/) for the run command may be helpful when reading through the examples. -Note: The exact image version to use is your choice depending on which release you wish to use. In the following examples, replace `` with your chosen version. e.g.: `v1.13.2` +Note: The exact image version to use is your choice depending on which release you wish to use. In the following examples, replace `` with your chosen version. e.g.: `v1.14.0` ## Override the configuration diff --git a/docs/source/containerization/kubernetes.mdx b/docs/source/containerization/kubernetes.mdx index 9dc164bea9..94ce76f87a 100644 --- a/docs/source/containerization/kubernetes.mdx +++ b/docs/source/containerization/kubernetes.mdx @@ -13,7 +13,7 @@ import { Link } from 'gatsby'; [Helm](https://helm.sh) is the package manager for kubernetes. -There is a complete [helm chart definition](https://github.com/apollographql/router/tree/v1.13.2/helm/chart/router) in the repo which illustrates how to use helm to deploy the router in kubernetes. +There is a complete [helm chart definition](https://github.com/apollographql/router/tree/v1.14.0/helm/chart/router) in the repo which illustrates how to use helm to deploy the router in kubernetes. In both the following examples, we are using helm to install the router: - into namespace "router-deploy" (create namespace if it doesn't exist) @@ -64,10 +64,10 @@ kind: ServiceAccount metadata: name: release-name-router labels: - helm.sh/chart: router-1.13.2 + helm.sh/chart: router-1.14.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.13.2" + app.kubernetes.io/version: "v1.14.0" app.kubernetes.io/managed-by: Helm --- # Source: router/templates/secret.yaml @@ -76,10 +76,10 @@ kind: Secret metadata: name: "release-name-router" labels: - helm.sh/chart: router-1.13.2 + helm.sh/chart: router-1.14.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.13.2" + app.kubernetes.io/version: "v1.14.0" app.kubernetes.io/managed-by: Helm data: managedFederationApiKey: "UkVEQUNURUQ=" @@ -90,10 +90,10 @@ kind: ConfigMap metadata: name: release-name-router labels: - helm.sh/chart: router-1.13.2 + helm.sh/chart: router-1.14.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.13.2" + app.kubernetes.io/version: "v1.14.0" app.kubernetes.io/managed-by: Helm data: configuration.yaml: | @@ -117,10 +117,10 @@ kind: Service metadata: name: release-name-router labels: - helm.sh/chart: router-1.13.2 + helm.sh/chart: router-1.14.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.13.2" + app.kubernetes.io/version: "v1.14.0" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -143,10 +143,10 @@ kind: Deployment metadata: name: release-name-router labels: - helm.sh/chart: router-1.13.2 + helm.sh/chart: router-1.14.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.13.2" + app.kubernetes.io/version: "v1.14.0" app.kubernetes.io/managed-by: Helm annotations: @@ -172,7 +172,7 @@ spec: - name: router securityContext: {} - image: "ghcr.io/apollographql/router:v1.13.2" + image: "ghcr.io/apollographql/router:v1.14.0" imagePullPolicy: IfNotPresent args: - --hot-reload @@ -223,10 +223,10 @@ kind: Pod metadata: name: "release-name-router-test-connection" labels: - helm.sh/chart: router-1.13.2 + helm.sh/chart: router-1.14.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.13.2" + app.kubernetes.io/version: "v1.14.0" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test diff --git a/docs/source/customizations/coprocessor.mdx b/docs/source/customizations/coprocessor.mdx index b105689c6c..3ee35c2c73 100644 --- a/docs/source/customizations/coprocessor.mdx +++ b/docs/source/customizations/coprocessor.mdx @@ -83,13 +83,29 @@ coprocessor: body: false context: false sdl: false + path: false + method: false response: # By including this key, the `RouterService` sends a coprocessor request whenever it's about to send a client response. headers: true body: false context: false sdl: false -# You can uncomment this key and populate it like the router: key above to hook into the `SubgraphService`. -# subgraph: + status_code: false + subgraph: + all: + request: # By including this key, the `SubgraphService` sends a coprocessor request whenever it is about to make a request to a subgraph. + headers: true # These boolean properties indicate which request data to include in the coprocessor request. All are optional and false by default. + body: false + context: false + uri: false + method: false + service_name: false + response: # By including this key, the `SubgraphService` sends a coprocessor request whenever receives a subgraph response. + headers: true + body: false + context: false + service_name: false + status_code: false ``` ### Minimal configuration @@ -173,6 +189,8 @@ Properties of the JSON body are divided into two high-level categories: } }, "sdl": "..." // String omitted due to length + "path": "/", + "method": "POST" } ``` @@ -233,6 +251,7 @@ Properties of the JSON body are divided into two high-level categories: "accepts-wildcard": true } }, + "statusCode": 200, "sdl": "..." // Omitted due to length } ``` @@ -311,6 +330,7 @@ Properties of the JSON body are divided into two high-level categories: } }, "uri": "https://reviews.demo.starstuff.dev/", + "method": "POST", "serviceName": "reviews" } @@ -437,7 +457,8 @@ Properties of the JSON body are divided into two high-level categories: "apollo_telemetry::client_name": "" } }, - "serviceName": "reviews" + "serviceName": "reviews", + "statusCode": 200 } ``` @@ -548,6 +569,14 @@ A unique ID corresponding to the client request associated with this coprocessor + + + +**Data properties** + + + + @@ -570,6 +599,24 @@ This value is present only for coprocessor requests from the router's `SubgraphS +##### `path` + +`string` + + + + +The `RouterService` path that this coprocessor request pertains to. + + + + + + + + + + ##### `uri` `string` @@ -577,17 +624,37 @@ This value is present only for coprocessor requests from the router's `SubgraphS -The URL of the subgraph that this coprocessor request pertains to. +The full URI the subgraph request will be made to. -This value is present only for coprocessor requests from the router's `SubgraphService`. + + + + + + +##### `method` + +`string` + + + + +The HTTP method that is used by the request. - + -**Data properties** +##### `status_code` + +`number` + + + + +The HTTP status code received by a response. diff --git a/examples/cache-control/rhai/Cargo.toml b/examples/cache-control/rhai/Cargo.toml new file mode 100644 index 0000000000..70039854a6 --- /dev/null +++ b/examples/cache-control/rhai/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "cache-control" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[dependencies] +anyhow = "1" +apollo-router = { path = "../../../apollo-router" } +http = "0.2" +serde_json = "1" +tokio = { version = "1", features = ["full"] } +tower = { version = "0.4", features = ["full"] } diff --git a/examples/cache-control/rhai/README.md b/examples/cache-control/rhai/README.md new file mode 100644 index 0000000000..980126d1f5 --- /dev/null +++ b/examples/cache-control/rhai/README.md @@ -0,0 +1,9 @@ +# Rhai script + +Demonstrates header and context manipulation via Rhai script. + +Usage: + +```bash +cargo run -- -s ../../graphql/supergraph.graphql -c ./router.yaml +``` diff --git a/examples/cache-control/rhai/router.yaml b/examples/cache-control/rhai/router.yaml new file mode 100644 index 0000000000..f1e78d8831 --- /dev/null +++ b/examples/cache-control/rhai/router.yaml @@ -0,0 +1,3 @@ +rhai: + scripts: src + main: cache_control.rhai diff --git a/examples/cache-control/rhai/src/cache_control.rhai b/examples/cache-control/rhai/src/cache_control.rhai new file mode 100644 index 0000000000..9cee2d14ed --- /dev/null +++ b/examples/cache-control/rhai/src/cache_control.rhai @@ -0,0 +1,80 @@ +fn subgraph_service(service, subgraph) { + // collect the max-age and scope values from cache-control headers and store + // on the context for use in supergraph_service + service.map_response(|response| { + let cache_control = response.headers.values("cache-control").get(0); + + // if a subgraph response is uncacheable, the whole response is uncacheable + if cache_control == () { + response.context.cache_control_uncacheable = true; + return; + } + + let max_age = get_max_age(cache_control); + + // use the smallest max age + response.context.upsert("cache_control_max_age", |current| { + if current == () { + max_age + } else if max_age < current { + max_age + } else { + current + } + }); + + let scope = if cache_control.contains("public") { + "public" + } else { + "private" + }; + + // if the scope is ever private, it cannot become public + response.context.upsert("cache_control_scope", |current| { + if current == "private" || scope == "private" { + "private" + } else { + scope + } + }); + }); +} + +fn supergraph_service(service) { + // attach the cache-control header if enough data is available + service.map_response(|response| { + let uncacheable = response.context.cache_control_uncacheable; + let max_age = response.context.cache_control_max_age; + let scope = response.context.cache_control_scope; + + if uncacheable != true && max_age != () && scope != () { + response.headers["cache-control"] = `max-age=${max_age}, ${scope}`; + } + }); +} + +// find the the max-age= part and parse the value into an integer +fn get_max_age(str) { + let max_age = 0; + + for part in str.split(",") { + part.remove(" "); + + if part.starts_with("max-age=") { + let num = part.split("=").get(1); + + if num == () || num == "" { + break; + } + + try { + max_age = num.parse_int(); + } catch (err) { + log_error(`error parsing max-age from "${str}": ${err}`); + } + break; + } + } + + max_age +} diff --git a/examples/cache-control/rhai/src/main.rs b/examples/cache-control/rhai/src/main.rs new file mode 100644 index 0000000000..14d1d53e0b --- /dev/null +++ b/examples/cache-control/rhai/src/main.rs @@ -0,0 +1,151 @@ +use anyhow::Result; + +// `cargo run -- -s ../../graphql/supergraph.graphql -c ./router.yaml` +fn main() -> Result<()> { + apollo_router::main() +} + +#[cfg(test)] +mod tests { + use apollo_router::graphql; + use apollo_router::plugin::test; + use apollo_router::services::subgraph; + use apollo_router::services::supergraph; + use http::HeaderMap; + use http::StatusCode; + use tower::util::ServiceExt; + + async fn cache_control_header( + header_one: Option, + header_two: Option, + ) -> Option { + let mut mock_service1 = test::MockSubgraphService::new(); + let mut mock_service2 = test::MockSubgraphService::new(); + + mock_service1.expect_clone().return_once(|| { + let mut mock_service = test::MockSubgraphService::new(); + mock_service + .expect_call() + .once() + .returning(move |req: subgraph::Request| { + let mut headers = HeaderMap::new(); + if let Some(value) = &header_one { + headers.insert("cache-control", value.parse().unwrap()); + } + + Ok(subgraph::Response::fake_builder() + .headers(headers) + .context(req.context) + .build()) + }); + mock_service + }); + + mock_service2.expect_clone().return_once(move || { + let mut mock_service = test::MockSubgraphService::new(); + mock_service + .expect_call() + .once() + .returning(move |req: subgraph::Request| { + let mut headers = HeaderMap::new(); + if let Some(value) = &header_two { + headers.insert("cache-control", value.parse().unwrap()); + } + + Ok(subgraph::Response::fake_builder() + .headers(headers) + .context(req.context) + .build()) + }); + mock_service + }); + + let config = serde_json::json!({ + "rhai": { + "scripts": "src", + "main": "cache_control.rhai", + } + }); + + let test_harness = apollo_router::TestHarness::builder() + .configuration_json(config) + .unwrap() + .subgraph_hook(move |name, _| match name { + "accounts" => mock_service1.clone().boxed(), + _ => mock_service2.clone().boxed(), + }) + // .log_level("DEBUG") + .build_router() + .await + .unwrap(); + + let query = " + query TopProducts { + me { id } + topProducts { name } + } + "; + + let request = supergraph::Request::fake_builder() + .query(query) + .build() + .expect("a valid SupergraphRequest"); + + let mut service_response = test_harness + .oneshot(request.try_into().unwrap()) + .await + .unwrap(); + + let response: graphql::Response = serde_json::from_slice( + service_response + .next_response() + .await + .unwrap() + .unwrap() + .to_vec() + .as_slice(), + ) + .unwrap(); + assert_eq!(response.errors, []); + + assert_eq!(StatusCode::OK, service_response.response.status()); + + service_response + .response + .headers() + .get("cache-control") + .map(|v| v.to_str().expect("can parse header value").to_string()) + } + + #[tokio::test] + async fn test_subgraph_cache_control() { + assert_eq!( + cache_control_header( + Some("max-age=100, private".to_string()), + Some("max-age=50, public".to_string()) + ) + .await, + Some("max-age=50, private".to_owned()) + ); + } + + #[tokio::test] + async fn test_subgraph_cache_control_public() { + assert_eq!( + cache_control_header( + Some("max-age=100, public".to_string()), + Some("max-age=50, public".to_string()) + ) + .await, + Some("max-age=50, public".to_owned()) + ); + } + + #[tokio::test] + async fn test_subgraph_cache_control_missing() { + assert_eq!( + cache_control_header(Some("max-age=100, private".to_string()), None).await, + None + ); + } +} diff --git a/helm/chart/router/Chart.yaml b/helm/chart/router/Chart.yaml index d92ab51265..ecc1296df9 100644 --- a/helm/chart/router/Chart.yaml +++ b/helm/chart/router/Chart.yaml @@ -20,10 +20,10 @@ type: application # so it matches the shape of our release process and release automation. # By proxy of that decision, this version uses SemVer 2.0.0, though the prefix # of "v" is not included. -version: 1.13.2 +version: 1.14.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v1.13.2" +appVersion: "v1.14.0" diff --git a/helm/chart/router/README.md b/helm/chart/router/README.md index a1901d41b9..d709d2c8bb 100644 --- a/helm/chart/router/README.md +++ b/helm/chart/router/README.md @@ -2,7 +2,7 @@ [router](https://github.com/apollographql/router) Rust Graph Routing runtime for Apollo Federation -![Version: 1.13.2](https://img.shields.io/badge/Version-1.13.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.13.2](https://img.shields.io/badge/AppVersion-v1.13.2-informational?style=flat-square) +![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.14.0](https://img.shields.io/badge/AppVersion-v1.14.0-informational?style=flat-square) ## Prerequisites @@ -11,7 +11,7 @@ ## Get Repo Info ```console -helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.13.2 +helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.14.0 ``` ## Install Chart @@ -19,7 +19,7 @@ helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.13.2 **Important:** only helm3 is supported ```console -helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.13.2 --values my-values.yaml +helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.14.0 --values my-values.yaml ``` _See [configuration](#configuration) below._ @@ -44,9 +44,11 @@ helm show values oci://ghcr.io/apollographql/helm-charts/router | containerPorts.health | int | `8088` | For exposing the health check endpoint | | containerPorts.http | int | `80` | If you override the port in `router.configuration.server.listen` then make sure to match the listen port here | | containerPorts.metrics | int | `9090` | For exposing the metrics port when running a serviceMonitor for example | +| extraContainers | list | `[]` | An array of extra containers to include in the router pod Example: extraContainers: - name: coprocessor image: acme/coprocessor:1.0 ports: - containerPort: 4001 | | extraEnvVars | list | `[]` | | | extraEnvVarsCM | string | `""` | | | extraEnvVarsSecret | string | `""` | | +| extraLabels | object | `{}` | A map of extra labels to apply to the router deploment and containers Example: extraLabels: label_one_name: "label_one_value" label_two_name: "label_two_value" | | extraVolumeMounts | list | `[]` | | | extraVolumes | list | `[]` | | | fullnameOverride | string | `""` | | diff --git a/helm/chart/router/templates/deployment.yaml b/helm/chart/router/templates/deployment.yaml index 5c74c3443a..22a8fbff3d 100644 --- a/helm/chart/router/templates/deployment.yaml +++ b/helm/chart/router/templates/deployment.yaml @@ -4,6 +4,9 @@ metadata: name: {{ include "router.fullname" . }} labels: {{- include "router.labels" . | nindent 4 }} + {{- if .Values.extraLabels }} + {{- toYaml .Values.extraLabels | nindent 4 }} + {{- end }} {{/* There may not be much configuration so check that there is something */}} {{- if (((((.Values.router).configuration).telemetry).metrics).prometheus).enabled }} annotations: @@ -31,6 +34,9 @@ spec: {{- end }} labels: {{- include "router.selectorLabels" . | nindent 8 }} + {{- if .Values.extraLabels }} + {{- toYaml .Values.extraLabels | nindent 8 }} + {{- end }} spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: @@ -120,6 +126,9 @@ spec: {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumeMounts "context" $) | nindent 12 }} {{- end }} {{- end }} + {{- if .Values.extraContainers }} + {{- tpl (toYaml .Values.extraContainers) $ | nindent 10 }} + {{- end }} {{- if or .Values.router.configuration .Values.extraVolumes }} volumes: {{- if .Values.router.configuration }} diff --git a/helm/chart/router/values.yaml b/helm/chart/router/values.yaml index 1c61abe905..ea4909321c 100644 --- a/helm/chart/router/values.yaml +++ b/helm/chart/router/values.yaml @@ -77,6 +77,22 @@ containerPorts: # -- For exposing the health check endpoint health: 8088 +# -- An array of extra containers to include in the router pod +# Example: +# extraContainers: +# - name: coprocessor +# image: acme/coprocessor:1.0 +# ports: +# - containerPort: 4001 +extraContainers: [] + +# -- A map of extra labels to apply to the router deploment and containers +# Example: +# extraLabels: +# label_one_name: "label_one_value" +# label_two_name: "label_two_value" +extraLabels: {} + imagePullSecrets: [] nameOverride: "" fullnameOverride: "" diff --git a/licenses.html b/licenses.html index 3e67d955ef..291edd93b7 100644 --- a/licenses.html +++ b/licenses.html @@ -44,10 +44,10 @@

Third Party Licenses

Overview of licenses:

    -
  • MIT License (91)
  • -
  • Apache License 2.0 (55)
  • -
  • BSD 3-Clause "New" or "Revised" License (9)
  • +
  • MIT License (93)
  • +
  • Apache License 2.0 (56)
  • ISC License (9)
  • +
  • BSD 3-Clause "New" or "Revised" License (8)
  • Elastic License 2.0 (2)
  • Mozilla Public License 2.0 (2)
  • BSD 2-Clause "Simplified" License (1)
  • @@ -1078,6 +1078,23 @@

    Used by:

                                     Apache License
                                Version 2.0, January 2004
    @@ -1280,6 +1297,216 @@ 

    Used by:

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +
    + +
  • +

    Apache License 2.0

    +

    Used by:

    + +
                                     Apache License
    +                           Version 2.0, January 2004
    +                        http://www.apache.org/licenses/
    +
    +   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    +
    +   1. Definitions.
    +
    +      "License" shall mean the terms and conditions for use, reproduction,
    +      and distribution as defined by Sections 1 through 9 of this document.
    +
    +      "Licensor" shall mean the copyright owner or entity authorized by
    +      the copyright owner that is granting the License.
    +
    +      "Legal Entity" shall mean the union of the acting entity and all
    +      other entities that control, are controlled by, or are under common
    +      control with that entity. For the purposes of this definition,
    +      "control" means (i) the power, direct or indirect, to cause the
    +      direction or management of such entity, whether by contract or
    +      otherwise, or (ii) ownership of fifty percent (50%) or more of the
    +      outstanding shares, or (iii) beneficial ownership of such entity.
    +
    +      "You" (or "Your") shall mean an individual or Legal Entity
    +      exercising permissions granted by this License.
    +
    +      "Source" form shall mean the preferred form for making modifications,
    +      including but not limited to software source code, documentation
    +      source, and configuration files.
    +
    +      "Object" form shall mean any form resulting from mechanical
    +      transformation or translation of a Source form, including but
    +      not limited to compiled object code, generated documentation,
    +      and conversions to other media types.
    +
    +      "Work" shall mean the work of authorship, whether in Source or
    +      Object form, made available under the License, as indicated by a
    +      copyright notice that is included in or attached to the work
    +      (an example is provided in the Appendix below).
    +
    +      "Derivative Works" shall mean any work, whether in Source or Object
    +      form, that is based on (or derived from) the Work and for which the
    +      editorial revisions, annotations, elaborations, or other modifications
    +      represent, as a whole, an original work of authorship. For the purposes
    +      of this License, Derivative Works shall not include works that remain
    +      separable from, or merely link (or bind by name) to the interfaces of,
    +      the Work and Derivative Works thereof.
    +
    +      "Contribution" shall mean any work of authorship, including
    +      the original version of the Work and any modifications or additions
    +      to that Work or Derivative Works thereof, that is intentionally
    +      submitted to Licensor for inclusion in the Work by the copyright owner
    +      or by an individual or Legal Entity authorized to submit on behalf of
    +      the copyright owner. For the purposes of this definition, "submitted"
    +      means any form of electronic, verbal, or written communication sent
    +      to the Licensor or its representatives, including but not limited to
    +      communication on electronic mailing lists, source code control systems,
    +      and issue tracking systems that are managed by, or on behalf of, the
    +      Licensor for the purpose of discussing and improving the Work, but
    +      excluding communication that is conspicuously marked or otherwise
    +      designated in writing by the copyright owner as "Not a Contribution."
    +
    +      "Contributor" shall mean Licensor and any individual or Legal Entity
    +      on behalf of whom a Contribution has been received by Licensor and
    +      subsequently incorporated within the Work.
    +
    +   2. Grant of Copyright License. Subject to the terms and conditions of
    +      this License, each Contributor hereby grants to You a perpetual,
    +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +      copyright license to reproduce, prepare Derivative Works of,
    +      publicly display, publicly perform, sublicense, and distribute the
    +      Work and such Derivative Works in Source or Object form.
    +
    +   3. Grant of Patent License. Subject to the terms and conditions of
    +      this License, each Contributor hereby grants to You a perpetual,
    +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +      (except as stated in this section) patent license to make, have made,
    +      use, offer to sell, sell, import, and otherwise transfer the Work,
    +      where such license applies only to those patent claims licensable
    +      by such Contributor that are necessarily infringed by their
    +      Contribution(s) alone or by combination of their Contribution(s)
    +      with the Work to which such Contribution(s) was submitted. If You
    +      institute patent litigation against any entity (including a
    +      cross-claim or counterclaim in a lawsuit) alleging that the Work
    +      or a Contribution incorporated within the Work constitutes direct
    +      or contributory patent infringement, then any patent licenses
    +      granted to You under this License for that Work shall terminate
    +      as of the date such litigation is filed.
    +
    +   4. Redistribution. You may reproduce and distribute copies of the
    +      Work or Derivative Works thereof in any medium, with or without
    +      modifications, and in Source or Object form, provided that You
    +      meet the following conditions:
    +
    +      (a) You must give any other recipients of the Work or
    +          Derivative Works a copy of this License; and
    +
    +      (b) You must cause any modified files to carry prominent notices
    +          stating that You changed the files; and
    +
    +      (c) You must retain, in the Source form of any Derivative Works
    +          that You distribute, all copyright, patent, trademark, and
    +          attribution notices from the Source form of the Work,
    +          excluding those notices that do not pertain to any part of
    +          the Derivative Works; and
    +
    +      (d) If the Work includes a "NOTICE" text file as part of its
    +          distribution, then any Derivative Works that You distribute must
    +          include a readable copy of the attribution notices contained
    +          within such NOTICE file, excluding those notices that do not
    +          pertain to any part of the Derivative Works, in at least one
    +          of the following places: within a NOTICE text file distributed
    +          as part of the Derivative Works; within the Source form or
    +          documentation, if provided along with the Derivative Works; or,
    +          within a display generated by the Derivative Works, if and
    +          wherever such third-party notices normally appear. The contents
    +          of the NOTICE file are for informational purposes only and
    +          do not modify the License. You may add Your own attribution
    +          notices within Derivative Works that You distribute, alongside
    +          or as an addendum to the NOTICE text from the Work, provided
    +          that such additional attribution notices cannot be construed
    +          as modifying the License.
    +
    +      You may add Your own copyright statement to Your modifications and
    +      may provide additional or different license terms and conditions
    +      for use, reproduction, or distribution of Your modifications, or
    +      for any such Derivative Works as a whole, provided Your use,
    +      reproduction, and distribution of the Work otherwise complies with
    +      the conditions stated in this License.
    +
    +   5. Submission of Contributions. Unless You explicitly state otherwise,
    +      any Contribution intentionally submitted for inclusion in the Work
    +      by You to the Licensor shall be under the terms and conditions of
    +      this License, without any additional terms or conditions.
    +      Notwithstanding the above, nothing herein shall supersede or modify
    +      the terms of any separate license agreement you may have executed
    +      with Licensor regarding such Contributions.
    +
    +   6. Trademarks. This License does not grant permission to use the trade
    +      names, trademarks, service marks, or product names of the Licensor,
    +      except as required for reasonable and customary use in describing the
    +      origin of the Work and reproducing the content of the NOTICE file.
    +
    +   7. Disclaimer of Warranty. Unless required by applicable law or
    +      agreed to in writing, Licensor provides the Work (and each
    +      Contributor provides its Contributions) on an "AS IS" BASIS,
    +      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    +      implied, including, without limitation, any warranties or conditions
    +      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    +      PARTICULAR PURPOSE. You are solely responsible for determining the
    +      appropriateness of using or redistributing the Work and assume any
    +      risks associated with Your exercise of permissions under this License.
    +
    +   8. Limitation of Liability. In no event and under no legal theory,
    +      whether in tort (including negligence), contract, or otherwise,
    +      unless required by applicable law (such as deliberate and grossly
    +      negligent acts) or agreed to in writing, shall any Contributor be
    +      liable to You for damages, including any direct, indirect, special,
    +      incidental, or consequential damages of any character arising as a
    +      result of this License or out of the use or inability to use the
    +      Work (including but not limited to damages for loss of goodwill,
    +      work stoppage, computer failure or malfunction, or any and all
    +      other commercial damages or losses), even if such Contributor
    +      has been advised of the possibility of such damages.
    +
    +   9. Accepting Warranty or Additional Liability. While redistributing
    +      the Work or Derivative Works thereof, You may choose to offer,
    +      and charge a fee for, acceptance of support, warranty, indemnity,
    +      or other liability obligations and/or rights consistent with this
    +      License. However, in accepting such obligations, You may act only
    +      on Your own behalf and on Your sole responsibility, not on behalf
    +      of any other Contributor, and only if You agree to indemnify,
    +      defend, and hold each Contributor harmless for any liability
    +      incurred by, or claims asserted against, such Contributor by reason
    +      of your accepting any such warranty or additional liability.
    +
    +   END OF TERMS AND CONDITIONS
    +
    +   APPENDIX: How to apply the Apache License to your work.
    +
    +      To apply the Apache License to your work, attach the following
    +      boilerplate notice, with the fields enclosed by brackets "[]"
    +      replaced with your own identifying information. (Don't include
    +      the brackets!)  The text should be enclosed in the appropriate
    +      comment syntax for the file format. We also recommend that a
    +      file or class name and description of purpose be included on the
    +      same "printed page" as the copyright notice for easier
    +      identification within third-party archives.
    +
    +   Copyright 2020 Tomasz "Soveu" Marx
    +
    +   Licensed under the Apache License, Version 2.0 (the "License");
    +   you may not use this file except in compliance with the License.
    +   You may obtain a copy of the License at
    +
    +       http://www.apache.org/licenses/LICENSE-2.0
    +
    +   Unless required by applicable law or agreed to in writing, software
    +   distributed under the License is distributed on an "AS IS" BASIS,
    +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    +   See the License for the specific language governing permissions and
    +   limitations under the License.
    +
     
  • @@ -1287,6 +1514,7 @@

    Apache License 2.0

    Used by:

    • clap
    • +
    • clap_builder
    • clap_derive
    • clap_lex
    • opentelemetry
    • @@ -1301,8 +1529,6 @@

      Used by:

    • opentelemetry-zipkin
    • opentelemetry_api
    • opentelemetry_sdk
    • -
    • os_str_bytes
    • -
    • ryu
    • structopt
    • structopt-derive
    • unicode-linebreak
    • @@ -1932,6 +2158,7 @@

      Used by:

      Apache License 2.0

      Used by:

      Apache License
       Version 2.0, January 2004
      @@ -10636,79 +10866,6 @@ 

      Used by:

      contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -
      - -
    • -

      BSD 3-Clause "New" or "Revised" License

      -

      Used by:

      - -
      Copyright (c) 2016-2021 isis agora lovecruft. All rights reserved.
      -Copyright (c) 2016-2021 Henry de Valence. All rights reserved.
      -
      -Redistribution and use in source and binary forms, with or without
      -modification, are permitted provided that the following conditions are
      -met:
      -
      -1. Redistributions of source code must retain the above copyright
      -notice, this list of conditions and the following disclaimer.
      -
      -2. Redistributions in binary form must reproduce the above copyright
      -notice, this list of conditions and the following disclaimer in the
      -documentation and/or other materials provided with the distribution.
      -
      -3. Neither the name of the copyright holder nor the names of its
      -contributors may be used to endorse or promote products derived from
      -this software without specific prior written permission.
      -
      -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
      -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
      -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
      -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
      -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
      -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
      -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
      -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
      -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
      -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
      -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
      -
      -========================================================================
      -
      -Portions of curve25519-dalek were originally derived from Adam Langley's
      -Go ed25519 implementation, found at <https://github.com/agl/ed25519/>,
      -under the following licence:
      -
      -========================================================================
      -
      -Copyright (c) 2012 The Go Authors. All rights reserved.
      -
      -Redistribution and use in source and binary forms, with or without
      -modification, are permitted provided that the following conditions are
      -met:
      -
      -   * Redistributions of source code must retain the above copyright
      -notice, this list of conditions and the following disclaimer.
      -   * Redistributions in binary form must reproduce the above
      -copyright notice, this list of conditions and the following disclaimer
      -in the documentation and/or other materials provided with the
      -distribution.
      -   * Neither the name of Google Inc. nor the names of its
      -contributors may be used to endorse or promote products derived from
      -this software without specific prior written permission.
      -
       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
       IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
       TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
      @@ -10799,6 +10956,7 @@ 

      BSD 3-Clause "New" or "Revised" Licens

      Used by:

      Copyright (c) <year> <owner>. 
       
      @@ -11899,6 +12057,7 @@ 

      MIT License

      Used by:

      Copyright (c) 2017 Redox OS Developers
       
      @@ -13275,6 +13434,32 @@ 

      Used by:

      OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +
      +
    • +
    • +

      MIT License

      +

      Used by:

      + +
      Permission is hereby granted, free of charge, to any person obtaining
      +a copy of this software and associated documentation files (the
      +"Software"), to deal in the Software without restriction, including
      +without limitation the rights to use, copy, modify, merge, publish,
      +distribute, sublicense, and/or sell copies of the Software, and to
      +permit persons to whom the Software is furnished to do so, subject to
      +the following conditions:
      +
      +The above copyright notice and this permission notice shall be
      +included in all copies or substantial portions of the Software.
      +
      +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
      +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
      +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
      +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
      +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
      +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
      +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
       
    • @@ -13688,6 +13873,36 @@

      Used by:

      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +
    • +
    • +

      MIT License

      +

      Used by:

      + +
      The MIT License (MIT)
      +
      +Copyright (c) 2015-2020 Julien Cretin
      +Copyright (c) 2017-2020 Google Inc.
      +
      +Permission is hereby granted, free of charge, to any person obtaining a copy
      +of this software and associated documentation files (the "Software"), to deal
      +in the Software without restriction, including without limitation the rights
      +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
      +copies of the Software, and to permit persons to whom the Software is
      +furnished to do so, subject to the following conditions:
      +
      +The above copyright notice and this permission notice shall be included in all
      +copies or substantial portions of the Software.
      +
       THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
       IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
       FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
      diff --git a/scripts/install.sh b/scripts/install.sh
      index 1cc0582475..2a61df31ca 100755
      --- a/scripts/install.sh
      +++ b/scripts/install.sh
      @@ -11,7 +11,7 @@ BINARY_DOWNLOAD_PREFIX="https://github.com/apollographql/router/releases/downloa
       
       # Router version defined in apollo-router's Cargo.toml
       # Note: Change this line manually during the release steps.
      -PACKAGE_VERSION="v1.13.2"
      +PACKAGE_VERSION="v1.14.0"
       
       download_binary() {
           downloader --check
      diff --git a/xtask/Cargo.lock b/xtask/Cargo.lock
      index 0bc70aed77..cd7a0d71a3 100644
      --- a/xtask/Cargo.lock
      +++ b/xtask/Cargo.lock
      @@ -35,11 +35,51 @@ dependencies = [
        "winapi",
       ]
       
      +[[package]]
      +name = "anstream"
      +version = "0.2.6"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
      +dependencies = [
      + "anstyle",
      + "anstyle-parse",
      + "anstyle-wincon",
      + "concolor-override",
      + "concolor-query",
      + "is-terminal",
      + "utf8parse",
      +]
      +
      +[[package]]
      +name = "anstyle"
      +version = "0.3.5"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
      +
      +[[package]]
      +name = "anstyle-parse"
      +version = "0.1.1"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
      +dependencies = [
      + "utf8parse",
      +]
      +
      +[[package]]
      +name = "anstyle-wincon"
      +version = "0.2.0"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
      +dependencies = [
      + "anstyle",
      + "windows-sys 0.45.0",
      +]
      +
       [[package]]
       name = "anyhow"
      -version = "1.0.66"
      +version = "1.0.70"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
      +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
       
       [[package]]
       name = "ascii"
      @@ -49,24 +89,24 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e"
       
       [[package]]
       name = "async-recursion"
      -version = "1.0.0"
      +version = "1.0.4"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea"
      +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 2.0.13",
       ]
       
       [[package]]
       name = "async-trait"
      -version = "0.1.59"
      +version = "0.1.68"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
      +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 2.0.13",
       ]
       
       [[package]]
      @@ -87,6 +127,12 @@ version = "0.20.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
       checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
       
      +[[package]]
      +name = "base64"
      +version = "0.21.0"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
      +
       [[package]]
       name = "bitflags"
       version = "1.3.2"
      @@ -95,9 +141,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
       
       [[package]]
       name = "bumpalo"
      -version = "3.11.1"
      +version = "3.12.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
      +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
       
       [[package]]
       name = "byteorder"
      @@ -113,9 +159,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
       
       [[package]]
       name = "camino"
      -version = "1.1.1"
      +version = "1.1.4"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
      +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2"
       dependencies = [
        "serde",
       ]
      @@ -131,9 +177,9 @@ dependencies = [
       
       [[package]]
       name = "cargo_metadata"
      -version = "0.15.2"
      +version = "0.15.4"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "982a0cf6a99c350d7246035613882e376d58cebe571785abc5da4f648d53ac0a"
      +checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
       dependencies = [
        "camino",
        "cargo-platform",
      @@ -145,9 +191,9 @@ dependencies = [
       
       [[package]]
       name = "cc"
      -version = "1.0.77"
      +version = "1.0.79"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
      +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
       dependencies = [
        "jobserver",
       ]
      @@ -176,40 +222,45 @@ dependencies = [
       
       [[package]]
       name = "clap"
      -version = "4.1.10"
      +version = "4.2.1"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "ce38afc168d8665cfc75c7b1dd9672e50716a137f433f070991619744a67342a"
      +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
       dependencies = [
      - "bitflags",
      + "clap_builder",
        "clap_derive",
      - "clap_lex",
      - "is-terminal",
        "once_cell",
      +]
      +
      +[[package]]
      +name = "clap_builder"
      +version = "4.2.1"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
      +dependencies = [
      + "anstream",
      + "anstyle",
      + "bitflags",
      + "clap_lex",
        "strsim",
      - "termcolor",
       ]
       
       [[package]]
       name = "clap_derive"
      -version = "4.1.9"
      +version = "4.2.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "fddf67631444a3a3e3e5ac51c36a5e01335302de677bd78759eaa90ab1f46644"
      +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
       dependencies = [
        "heck",
      - "proc-macro-error",
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 2.0.13",
       ]
       
       [[package]]
       name = "clap_lex"
      -version = "0.3.3"
      +version = "0.4.1"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "033f6b7a4acb1f358c742aaca805c939ee73b4c6209ae4318ec7aca81c42e646"
      -dependencies = [
      - "os_str_bytes",
      -]
      +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
       
       [[package]]
       name = "codespan-reporting"
      @@ -234,6 +285,21 @@ dependencies = [
        "unreachable",
       ]
       
      +[[package]]
      +name = "concolor-override"
      +version = "1.0.0"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f"
      +
      +[[package]]
      +name = "concolor-query"
      +version = "0.3.3"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
      +dependencies = [
      + "windows-sys 0.45.0",
      +]
      +
       [[package]]
       name = "console"
       version = "0.15.5"
      @@ -259,9 +325,9 @@ dependencies = [
       
       [[package]]
       name = "core-foundation-sys"
      -version = "0.8.3"
      +version = "0.8.4"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
      +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
       
       [[package]]
       name = "crc32fast"
      @@ -274,9 +340,9 @@ dependencies = [
       
       [[package]]
       name = "crossbeam-channel"
      -version = "0.5.6"
      +version = "0.5.7"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
      +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c"
       dependencies = [
        "cfg-if",
        "crossbeam-utils",
      @@ -284,18 +350,18 @@ dependencies = [
       
       [[package]]
       name = "crossbeam-utils"
      -version = "0.8.14"
      +version = "0.8.15"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
      +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
       dependencies = [
        "cfg-if",
       ]
       
       [[package]]
       name = "cxx"
      -version = "1.0.83"
      +version = "1.0.94"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
      +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
       dependencies = [
        "cc",
        "cxxbridge-flags",
      @@ -305,9 +371,9 @@ dependencies = [
       
       [[package]]
       name = "cxx-build"
      -version = "1.0.83"
      +version = "1.0.94"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
      +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
       dependencies = [
        "cc",
        "codespan-reporting",
      @@ -315,24 +381,24 @@ dependencies = [
        "proc-macro2",
        "quote",
        "scratch",
      - "syn",
      + "syn 2.0.13",
       ]
       
       [[package]]
       name = "cxxbridge-flags"
      -version = "1.0.83"
      +version = "1.0.94"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
      +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
       
       [[package]]
       name = "cxxbridge-macro"
      -version = "1.0.83"
      +version = "1.0.94"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
      +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 2.0.13",
       ]
       
       [[package]]
      @@ -349,15 +415,15 @@ dependencies = [
       
       [[package]]
       name = "dyn-clone"
      -version = "1.0.9"
      +version = "1.0.11"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
      +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
       
       [[package]]
       name = "either"
      -version = "1.8.0"
      +version = "1.8.1"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
      +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
       
       [[package]]
       name = "encode_unicode"
      @@ -367,22 +433,22 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
       
       [[package]]
       name = "encoding_rs"
      -version = "0.8.31"
      +version = "0.8.32"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
      +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
       dependencies = [
        "cfg-if",
       ]
       
       [[package]]
       name = "errno"
      -version = "0.2.8"
      +version = "0.3.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
      +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
       dependencies = [
        "errno-dragonfly",
        "libc",
      - "winapi",
      + "windows-sys 0.45.0",
       ]
       
       [[package]]
      @@ -397,23 +463,23 @@ dependencies = [
       
       [[package]]
       name = "fastrand"
      -version = "1.8.0"
      +version = "1.9.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
      +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
       dependencies = [
        "instant",
       ]
       
       [[package]]
       name = "filetime"
      -version = "0.2.19"
      +version = "0.2.20"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
      +checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
       dependencies = [
        "cfg-if",
        "libc",
      - "redox_syscall",
      - "windows-sys 0.42.0",
      + "redox_syscall 0.2.16",
      + "windows-sys 0.45.0",
       ]
       
       [[package]]
      @@ -444,9 +510,9 @@ dependencies = [
       
       [[package]]
       name = "futures"
      -version = "0.3.25"
      +version = "0.3.28"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
      +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
       dependencies = [
        "futures-channel",
        "futures-core",
      @@ -459,9 +525,9 @@ dependencies = [
       
       [[package]]
       name = "futures-channel"
      -version = "0.3.25"
      +version = "0.3.28"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
      +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
       dependencies = [
        "futures-core",
        "futures-sink",
      @@ -469,15 +535,15 @@ dependencies = [
       
       [[package]]
       name = "futures-core"
      -version = "0.3.25"
      +version = "0.3.28"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
      +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
       
       [[package]]
       name = "futures-executor"
      -version = "0.3.25"
      +version = "0.3.28"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
      +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
       dependencies = [
        "futures-core",
        "futures-task",
      @@ -486,38 +552,38 @@ dependencies = [
       
       [[package]]
       name = "futures-io"
      -version = "0.3.25"
      +version = "0.3.28"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
      +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
       
       [[package]]
       name = "futures-macro"
      -version = "0.3.25"
      +version = "0.3.28"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
      +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 2.0.13",
       ]
       
       [[package]]
       name = "futures-sink"
      -version = "0.3.25"
      +version = "0.3.28"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
      +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
       
       [[package]]
       name = "futures-task"
      -version = "0.3.25"
      +version = "0.3.28"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
      +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
       
       [[package]]
       name = "futures-util"
      -version = "0.3.25"
      +version = "0.3.28"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
      +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
       dependencies = [
        "futures-channel",
        "futures-core",
      @@ -613,7 +679,7 @@ dependencies = [
        "quote",
        "serde",
        "serde_json",
      - "syn",
      + "syn 1.0.109",
       ]
       
       [[package]]
      @@ -624,14 +690,14 @@ checksum = "d52fc9cde811f44b15ec0692b31e56a3067f6f431c5ace712f286e47c1dacc98"
       dependencies = [
        "graphql_client_codegen",
        "proc-macro2",
      - "syn",
      + "syn 1.0.109",
       ]
       
       [[package]]
       name = "h2"
      -version = "0.3.15"
      +version = "0.3.16"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
      +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
       dependencies = [
        "bytes",
        "fnv",
      @@ -660,27 +726,24 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
       
       [[package]]
       name = "hermit-abi"
      -version = "0.1.19"
      +version = "0.2.6"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
      +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
       dependencies = [
        "libc",
       ]
       
       [[package]]
       name = "hermit-abi"
      -version = "0.2.6"
      +version = "0.3.1"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
      -dependencies = [
      - "libc",
      -]
      +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
       
       [[package]]
       name = "http"
      -version = "0.2.8"
      +version = "0.2.9"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
      +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
       dependencies = [
        "bytes",
        "fnv",
      @@ -712,9 +775,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
       
       [[package]]
       name = "hyper"
      -version = "0.14.23"
      +version = "0.14.25"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
      +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899"
       dependencies = [
        "bytes",
        "futures-channel",
      @@ -765,16 +828,16 @@ dependencies = [
       
       [[package]]
       name = "iana-time-zone"
      -version = "0.1.53"
      +version = "0.1.56"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
      +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
       dependencies = [
        "android_system_properties",
        "core-foundation-sys",
        "iana-time-zone-haiku",
        "js-sys",
        "wasm-bindgen",
      - "winapi",
      + "windows",
       ]
       
       [[package]]
      @@ -800,9 +863,9 @@ dependencies = [
       
       [[package]]
       name = "indexmap"
      -version = "1.9.2"
      +version = "1.9.3"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
      +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
       dependencies = [
        "autocfg",
        "hashbrown",
      @@ -819,30 +882,31 @@ dependencies = [
       
       [[package]]
       name = "io-lifetimes"
      -version = "1.0.4"
      +version = "1.0.10"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
      +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
       dependencies = [
      + "hermit-abi 0.3.1",
        "libc",
      - "windows-sys 0.42.0",
      + "windows-sys 0.48.0",
       ]
       
       [[package]]
       name = "ipnet"
      -version = "2.7.0"
      +version = "2.7.2"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
      +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
       
       [[package]]
       name = "is-terminal"
      -version = "0.4.2"
      +version = "0.4.6"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
      +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8"
       dependencies = [
      - "hermit-abi 0.2.6",
      + "hermit-abi 0.3.1",
        "io-lifetimes",
        "rustix",
      - "windows-sys 0.42.0",
      + "windows-sys 0.45.0",
       ]
       
       [[package]]
      @@ -856,35 +920,35 @@ dependencies = [
       
       [[package]]
       name = "itoa"
      -version = "1.0.4"
      +version = "1.0.6"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
      +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
       
       [[package]]
       name = "jobserver"
      -version = "0.1.25"
      +version = "0.1.26"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
      +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
       dependencies = [
        "libc",
       ]
       
       [[package]]
       name = "js-sys"
      -version = "0.3.60"
      +version = "0.3.61"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
      +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
       dependencies = [
        "wasm-bindgen",
       ]
       
       [[package]]
       name = "jsonwebtoken"
      -version = "8.2.0"
      +version = "8.3.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828"
      +checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
       dependencies = [
      - "base64 0.13.1",
      + "base64 0.21.0",
        "pem",
        "ring",
        "serde",
      @@ -906,9 +970,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
       
       [[package]]
       name = "libc"
      -version = "0.2.138"
      +version = "0.2.141"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
      +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
       
       [[package]]
       name = "libgit2-sys"
      @@ -952,18 +1016,18 @@ dependencies = [
       
       [[package]]
       name = "link-cplusplus"
      -version = "1.0.7"
      +version = "1.0.8"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
      +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
       dependencies = [
        "cc",
       ]
       
       [[package]]
       name = "linux-raw-sys"
      -version = "0.1.4"
      +version = "0.3.1"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
      +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
       
       [[package]]
       name = "lock_api"
      @@ -987,9 +1051,9 @@ dependencies = [
       
       [[package]]
       name = "matches"
      -version = "0.1.9"
      +version = "0.1.10"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
      +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
       
       [[package]]
       name = "memchr"
      @@ -1008,9 +1072,9 @@ dependencies = [
       
       [[package]]
       name = "mime"
      -version = "0.3.16"
      +version = "0.3.17"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
      +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
       
       [[package]]
       name = "mime_guess"
      @@ -1033,14 +1097,14 @@ dependencies = [
       
       [[package]]
       name = "mio"
      -version = "0.8.5"
      +version = "0.8.6"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
      +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
       dependencies = [
        "libc",
        "log",
        "wasi 0.11.0+wasi-snapshot-preview1",
      - "windows-sys 0.42.0",
      + "windows-sys 0.45.0",
       ]
       
       [[package]]
      @@ -1075,11 +1139,11 @@ dependencies = [
       
       [[package]]
       name = "num_cpus"
      -version = "1.14.0"
      +version = "1.15.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
      +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
       dependencies = [
      - "hermit-abi 0.1.19",
      + "hermit-abi 0.2.6",
        "libc",
       ]
       
      @@ -1115,9 +1179,9 @@ dependencies = [
       
       [[package]]
       name = "once_cell"
      -version = "1.16.0"
      +version = "1.17.1"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
      +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
       
       [[package]]
       name = "openssl-probe"
      @@ -1125,15 +1189,24 @@ version = "0.1.5"
       source = "registry+https://github.com/rust-lang/crates.io-index"
       checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
       
      +[[package]]
      +name = "openssl-src"
      +version = "111.25.2+1.1.1t"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431"
      +dependencies = [
      + "cc",
      +]
      +
       [[package]]
       name = "openssl-sys"
      -version = "0.9.79"
      +version = "0.9.84"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4"
      +checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa"
       dependencies = [
      - "autocfg",
        "cc",
        "libc",
      + "openssl-src",
        "pkg-config",
        "vcpkg",
       ]
      @@ -1157,12 +1230,6 @@ dependencies = [
        "thiserror",
       ]
       
      -[[package]]
      -name = "os_str_bytes"
      -version = "6.4.1"
      -source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
      -
       [[package]]
       name = "parking_lot"
       version = "0.12.1"
      @@ -1175,22 +1242,22 @@ dependencies = [
       
       [[package]]
       name = "parking_lot_core"
      -version = "0.9.5"
      +version = "0.9.7"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
      +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
       dependencies = [
        "cfg-if",
        "libc",
      - "redox_syscall",
      + "redox_syscall 0.2.16",
        "smallvec",
      - "windows-sys 0.42.0",
      + "windows-sys 0.45.0",
       ]
       
       [[package]]
       name = "pem"
      -version = "1.1.0"
      +version = "1.1.1"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4"
      +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
       dependencies = [
        "base64 0.13.1",
       ]
      @@ -1218,7 +1285,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 1.0.109",
       ]
       
       [[package]]
      @@ -1245,44 +1312,20 @@ version = "0.2.17"
       source = "registry+https://github.com/rust-lang/crates.io-index"
       checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
       
      -[[package]]
      -name = "proc-macro-error"
      -version = "1.0.4"
      -source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
      -dependencies = [
      - "proc-macro-error-attr",
      - "proc-macro2",
      - "quote",
      - "syn",
      - "version_check",
      -]
      -
      -[[package]]
      -name = "proc-macro-error-attr"
      -version = "1.0.4"
      -source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
      -dependencies = [
      - "proc-macro2",
      - "quote",
      - "version_check",
      -]
      -
       [[package]]
       name = "proc-macro2"
      -version = "1.0.47"
      +version = "1.0.56"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
      +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
       dependencies = [
        "unicode-ident",
       ]
       
       [[package]]
       name = "quote"
      -version = "1.0.21"
      +version = "1.0.26"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
      +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
       dependencies = [
        "proc-macro2",
       ]
      @@ -1367,11 +1410,20 @@ dependencies = [
        "bitflags",
       ]
       
      +[[package]]
      +name = "redox_syscall"
      +version = "0.3.5"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
      +dependencies = [
      + "bitflags",
      +]
      +
       [[package]]
       name = "regex"
      -version = "1.7.1"
      +version = "1.7.3"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
      +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
       dependencies = [
        "aho-corasick",
        "memchr",
      @@ -1380,26 +1432,17 @@ dependencies = [
       
       [[package]]
       name = "regex-syntax"
      -version = "0.6.28"
      +version = "0.6.29"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
      -
      -[[package]]
      -name = "remove_dir_all"
      -version = "0.5.3"
      -source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
      -dependencies = [
      - "winapi",
      -]
      +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
       
       [[package]]
       name = "reqwest"
      -version = "0.11.13"
      +version = "0.11.16"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
      +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
       dependencies = [
      - "base64 0.13.1",
      + "base64 0.21.0",
        "bytes",
        "encoding_rs",
        "futures-core",
      @@ -1526,23 +1569,23 @@ dependencies = [
       
       [[package]]
       name = "rustix"
      -version = "0.36.7"
      +version = "0.37.7"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
      +checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d"
       dependencies = [
        "bitflags",
        "errno",
        "io-lifetimes",
        "libc",
        "linux-raw-sys",
      - "windows-sys 0.42.0",
      + "windows-sys 0.45.0",
       ]
       
       [[package]]
       name = "rustls"
      -version = "0.20.7"
      +version = "0.20.8"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
      +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
       dependencies = [
        "log",
        "ring",
      @@ -1564,18 +1607,18 @@ dependencies = [
       
       [[package]]
       name = "rustls-pemfile"
      -version = "1.0.1"
      +version = "1.0.2"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
      +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
       dependencies = [
      - "base64 0.13.1",
      + "base64 0.21.0",
       ]
       
       [[package]]
       name = "ryu"
      -version = "1.0.11"
      +version = "1.0.13"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
      +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
       
       [[package]]
       name = "same-file"
      @@ -1588,19 +1631,18 @@ dependencies = [
       
       [[package]]
       name = "schannel"
      -version = "0.1.20"
      +version = "0.1.21"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
      +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
       dependencies = [
      - "lazy_static",
      - "windows-sys 0.36.1",
      + "windows-sys 0.42.0",
       ]
       
       [[package]]
       name = "schemars"
      -version = "0.8.11"
      +version = "0.8.12"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307"
      +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
       dependencies = [
        "bytes",
        "chrono",
      @@ -1614,14 +1656,14 @@ dependencies = [
       
       [[package]]
       name = "schemars_derive"
      -version = "0.8.11"
      +version = "0.8.12"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9"
      +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
       dependencies = [
        "proc-macro2",
        "quote",
        "serde_derive_internals",
      - "syn",
      + "syn 1.0.109",
       ]
       
       [[package]]
      @@ -1632,9 +1674,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
       
       [[package]]
       name = "scratch"
      -version = "1.0.2"
      +version = "1.0.5"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
      +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
       
       [[package]]
       name = "sct"
      @@ -1648,9 +1690,9 @@ dependencies = [
       
       [[package]]
       name = "security-framework"
      -version = "2.7.0"
      +version = "2.8.2"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
      +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
       dependencies = [
        "bitflags",
        "core-foundation",
      @@ -1661,9 +1703,9 @@ dependencies = [
       
       [[package]]
       name = "security-framework-sys"
      -version = "2.6.1"
      +version = "2.8.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
      +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
       dependencies = [
        "core-foundation-sys",
        "libc",
      @@ -1671,31 +1713,31 @@ dependencies = [
       
       [[package]]
       name = "semver"
      -version = "1.0.14"
      +version = "1.0.17"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
      +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
       dependencies = [
        "serde",
       ]
       
       [[package]]
       name = "serde"
      -version = "1.0.152"
      +version = "1.0.159"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
      +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
       dependencies = [
        "serde_derive",
       ]
       
       [[package]]
       name = "serde_derive"
      -version = "1.0.152"
      +version = "1.0.159"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
      +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 2.0.13",
       ]
       
       [[package]]
      @@ -1706,14 +1748,14 @@ checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 1.0.109",
       ]
       
       [[package]]
       name = "serde_json"
      -version = "1.0.89"
      +version = "1.0.95"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
      +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
       dependencies = [
        "itoa",
        "ryu",
      @@ -1755,9 +1797,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
       
       [[package]]
       name = "signal-hook-registry"
      -version = "1.4.0"
      +version = "1.4.1"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
      +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
       dependencies = [
        "libc",
       ]
      @@ -1771,14 +1813,14 @@ dependencies = [
        "num-bigint",
        "num-traits",
        "thiserror",
      - "time 0.3.17",
      + "time 0.3.20",
       ]
       
       [[package]]
       name = "slab"
      -version = "0.4.7"
      +version = "0.4.8"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
      +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
       dependencies = [
        "autocfg",
       ]
      @@ -1791,9 +1833,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
       
       [[package]]
       name = "socket2"
      -version = "0.4.7"
      +version = "0.4.9"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
      +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
       dependencies = [
        "libc",
        "winapi",
      @@ -1813,9 +1855,20 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
       
       [[package]]
       name = "syn"
      -version = "1.0.105"
      +version = "1.0.109"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
      +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
      +dependencies = [
      + "proc-macro2",
      + "quote",
      + "unicode-ident",
      +]
      +
      +[[package]]
      +name = "syn"
      +version = "2.0.13"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
       dependencies = [
        "proc-macro2",
        "quote",
      @@ -1841,62 +1894,62 @@ dependencies = [
       
       [[package]]
       name = "task-local-extensions"
      -version = "0.1.3"
      +version = "0.1.4"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "4167afbec18ae012de40f8cf1b9bf48420abb390678c34821caa07d924941cc4"
      +checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8"
       dependencies = [
      - "tokio",
      + "pin-utils",
       ]
       
       [[package]]
       name = "tempfile"
      -version = "3.3.0"
      +version = "3.5.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
      +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
       dependencies = [
        "cfg-if",
        "fastrand",
      - "libc",
      - "redox_syscall",
      - "remove_dir_all",
      - "winapi",
      + "redox_syscall 0.3.5",
      + "rustix",
      + "windows-sys 0.45.0",
       ]
       
       [[package]]
       name = "termcolor"
      -version = "1.1.3"
      +version = "1.2.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
      +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
       dependencies = [
        "winapi-util",
       ]
       
       [[package]]
       name = "thiserror"
      -version = "1.0.37"
      +version = "1.0.40"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
      +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
       dependencies = [
        "thiserror-impl",
       ]
       
       [[package]]
       name = "thiserror-impl"
      -version = "1.0.37"
      +version = "1.0.40"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
      +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 2.0.13",
       ]
       
       [[package]]
       name = "thread_local"
      -version = "1.1.4"
      +version = "1.1.7"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
      +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
       dependencies = [
      + "cfg-if",
        "once_cell",
       ]
       
      @@ -1913,9 +1966,9 @@ dependencies = [
       
       [[package]]
       name = "time"
      -version = "0.3.17"
      +version = "0.3.20"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
      +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
       dependencies = [
        "itoa",
        "serde",
      @@ -1931,9 +1984,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
       
       [[package]]
       name = "time-macros"
      -version = "0.2.6"
      +version = "0.2.8"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
      +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
       dependencies = [
        "time-core",
       ]
      @@ -1959,20 +2012,19 @@ dependencies = [
       
       [[package]]
       name = "tinyvec_macros"
      -version = "0.1.0"
      +version = "0.1.1"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
      +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
       
       [[package]]
       name = "tokio"
      -version = "1.25.0"
      +version = "1.27.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
      +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
       dependencies = [
        "autocfg",
        "bytes",
        "libc",
      - "memchr",
        "mio",
        "num_cpus",
        "parking_lot",
      @@ -1980,18 +2032,18 @@ dependencies = [
        "signal-hook-registry",
        "socket2",
        "tokio-macros",
      - "windows-sys 0.42.0",
      + "windows-sys 0.45.0",
       ]
       
       [[package]]
       name = "tokio-macros"
      -version = "1.8.2"
      +version = "2.0.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
      +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 2.0.13",
       ]
       
       [[package]]
      @@ -2007,9 +2059,9 @@ dependencies = [
       
       [[package]]
       name = "tokio-util"
      -version = "0.7.4"
      +version = "0.7.7"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740"
      +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
       dependencies = [
        "bytes",
        "futures-core",
      @@ -2045,7 +2097,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 1.0.109",
       ]
       
       [[package]]
      @@ -2096,9 +2148,9 @@ dependencies = [
       
       [[package]]
       name = "try-lock"
      -version = "0.2.3"
      +version = "0.2.4"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
      +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
       
       [[package]]
       name = "unicase"
      @@ -2111,15 +2163,15 @@ dependencies = [
       
       [[package]]
       name = "unicode-bidi"
      -version = "0.3.8"
      +version = "0.3.13"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
      +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
       
       [[package]]
       name = "unicode-ident"
      -version = "1.0.5"
      +version = "1.0.8"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
      +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
       
       [[package]]
       name = "unicode-normalization"
      @@ -2163,11 +2215,17 @@ dependencies = [
        "serde",
       ]
       
      +[[package]]
      +name = "utf8parse"
      +version = "0.2.1"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
      +
       [[package]]
       name = "uuid"
      -version = "1.2.2"
      +version = "1.3.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
      +checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
       
       [[package]]
       name = "valuable"
      @@ -2195,12 +2253,11 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
       
       [[package]]
       name = "walkdir"
      -version = "2.3.2"
      +version = "2.3.3"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
      +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
       dependencies = [
        "same-file",
      - "winapi",
        "winapi-util",
       ]
       
      @@ -2234,9 +2291,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
       
       [[package]]
       name = "wasm-bindgen"
      -version = "0.2.83"
      +version = "0.2.84"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
      +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
       dependencies = [
        "cfg-if",
        "wasm-bindgen-macro",
      @@ -2244,24 +2301,24 @@ dependencies = [
       
       [[package]]
       name = "wasm-bindgen-backend"
      -version = "0.2.83"
      +version = "0.2.84"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
      +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
       dependencies = [
        "bumpalo",
        "log",
        "once_cell",
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 1.0.109",
        "wasm-bindgen-shared",
       ]
       
       [[package]]
       name = "wasm-bindgen-futures"
      -version = "0.4.33"
      +version = "0.4.34"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
      +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
       dependencies = [
        "cfg-if",
        "js-sys",
      @@ -2271,9 +2328,9 @@ dependencies = [
       
       [[package]]
       name = "wasm-bindgen-macro"
      -version = "0.2.83"
      +version = "0.2.84"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
      +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
       dependencies = [
        "quote",
        "wasm-bindgen-macro-support",
      @@ -2281,28 +2338,28 @@ dependencies = [
       
       [[package]]
       name = "wasm-bindgen-macro-support"
      -version = "0.2.83"
      +version = "0.2.84"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
      +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
       dependencies = [
        "proc-macro2",
        "quote",
      - "syn",
      + "syn 1.0.109",
        "wasm-bindgen-backend",
        "wasm-bindgen-shared",
       ]
       
       [[package]]
       name = "wasm-bindgen-shared"
      -version = "0.2.83"
      +version = "0.2.84"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
      +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
       
       [[package]]
       name = "web-sys"
      -version = "0.3.60"
      +version = "0.3.61"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f"
      +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
       dependencies = [
        "js-sys",
        "wasm-bindgen",
      @@ -2329,9 +2386,9 @@ dependencies = [
       
       [[package]]
       name = "which"
      -version = "4.3.0"
      +version = "4.4.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
      +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
       dependencies = [
        "either",
        "libc",
      @@ -2370,16 +2427,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
       checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
       
       [[package]]
      -name = "windows-sys"
      -version = "0.36.1"
      +name = "windows"
      +version = "0.48.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
      +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
       dependencies = [
      - "windows_aarch64_msvc 0.36.1",
      - "windows_i686_gnu 0.36.1",
      - "windows_i686_msvc 0.36.1",
      - "windows_x86_64_gnu 0.36.1",
      - "windows_x86_64_msvc 0.36.1",
      + "windows-targets 0.48.0",
       ]
       
       [[package]]
      @@ -2388,86 +2441,146 @@ version = "0.42.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
       checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
       dependencies = [
      - "windows_aarch64_gnullvm",
      - "windows_aarch64_msvc 0.42.0",
      - "windows_i686_gnu 0.42.0",
      - "windows_i686_msvc 0.42.0",
      - "windows_x86_64_gnu 0.42.0",
      - "windows_x86_64_gnullvm",
      - "windows_x86_64_msvc 0.42.0",
      + "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",
      +]
      +
      +[[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",
      +]
      +
      +[[package]]
      +name = "windows-targets"
      +version = "0.48.0"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
      +dependencies = [
      + "windows_aarch64_gnullvm 0.48.0",
      + "windows_aarch64_msvc 0.48.0",
      + "windows_i686_gnu 0.48.0",
      + "windows_i686_msvc 0.48.0",
      + "windows_x86_64_gnu 0.48.0",
      + "windows_x86_64_gnullvm 0.48.0",
      + "windows_x86_64_msvc 0.48.0",
       ]
       
       [[package]]
       name = "windows_aarch64_gnullvm"
      -version = "0.42.0"
      +version = "0.42.2"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
      +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
      +
      +[[package]]
      +name = "windows_aarch64_gnullvm"
      +version = "0.48.0"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
       
       [[package]]
       name = "windows_aarch64_msvc"
      -version = "0.36.1"
      +version = "0.42.2"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
      +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
       
       [[package]]
       name = "windows_aarch64_msvc"
      -version = "0.42.0"
      +version = "0.48.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
      +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
       
       [[package]]
       name = "windows_i686_gnu"
      -version = "0.36.1"
      +version = "0.42.2"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
      +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
       
       [[package]]
       name = "windows_i686_gnu"
      -version = "0.42.0"
      +version = "0.48.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
      +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
       
       [[package]]
       name = "windows_i686_msvc"
      -version = "0.36.1"
      +version = "0.42.2"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
      +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
       
       [[package]]
       name = "windows_i686_msvc"
      -version = "0.42.0"
      +version = "0.48.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
      +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
       
       [[package]]
       name = "windows_x86_64_gnu"
      -version = "0.36.1"
      +version = "0.42.2"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
      +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
       
       [[package]]
       name = "windows_x86_64_gnu"
      -version = "0.42.0"
      +version = "0.48.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
      +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
       
       [[package]]
       name = "windows_x86_64_gnullvm"
      -version = "0.42.0"
      +version = "0.42.2"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
      +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
      +
      +[[package]]
      +name = "windows_x86_64_gnullvm"
      +version = "0.48.0"
      +source = "registry+https://github.com/rust-lang/crates.io-index"
      +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
       
       [[package]]
       name = "windows_x86_64_msvc"
      -version = "0.36.1"
      +version = "0.42.2"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
      +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
       
       [[package]]
       name = "windows_x86_64_msvc"
      -version = "0.42.0"
      +version = "0.48.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
      +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
       
       [[package]]
       name = "winreg"
      @@ -2525,15 +2638,15 @@ dependencies = [
       
       [[package]]
       name = "zeroize"
      -version = "1.5.7"
      +version = "1.6.0"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
      +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
       
       [[package]]
       name = "zip"
      -version = "0.6.3"
      +version = "0.6.4"
       source = "registry+https://github.com/rust-lang/crates.io-index"
      -checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080"
      +checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef"
       dependencies = [
        "byteorder",
        "crc32fast",
      diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
      index 4fe0ae8727..d40190d141 100644
      --- a/xtask/Cargo.toml
      +++ b/xtask/Cargo.toml
      @@ -13,14 +13,14 @@ ansi_term = "0.12"
       anyhow = "1"
       base64 = "0.20"
       camino = "1"
      -clap = {version="4.1.10", features=["derive"]}
      +clap = { version = "4.1.10", features = ["derive"] }
       cargo_metadata = "0.15"
       chrono = "0.4.24"
       console = "0.15.5"
       dialoguer = "0.10.3"
       flate2 = "1"
       graphql_client = { version = "0.12.0", features = ["reqwest-rustls"] }
      -git2 = "0.16.1"
      +git2 = { version = "0.16.1", features = ["vendored-openssl"] }
       itertools = "0.10.5"
       libc = "0.2"
       memorable-wordlist = "0.1.7"