diff options
52 files changed, 624 insertions, 243 deletions
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index ca8d2ba9..cd5f9364 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -44,4 +44,6 @@ jobs: if: github.ref == 'refs/heads/main' with: github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./docs/book + publish_dir: ./docs/book/html + destination_dir: html + @@ -19,7 +19,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent_interface" -version = "0.6.3" +version = "0.6.4" dependencies = [ "csv", "download", @@ -72,9 +72,9 @@ checksum = "be69f70ef5497dd6ab331a50bd95c6ac6b8f7f17a7967838332743fbd58dc3b5" dependencies = [ "argh_shared", "heck 0.3.3", - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] @@ -105,9 +105,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", "synstructure", ] @@ -117,9 +117,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] @@ -186,14 +186,35 @@ dependencies = [ ] [[package]] +name = "async-stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +dependencies = [ + "async-stream-impl", + "futures-core", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +dependencies = [ + "proc-macro2 1.0.38", + "quote 1.0.18", + "syn 1.0.94", +] + +[[package]] name = "async-trait" version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] @@ -250,7 +271,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "batcher" -version = "0.6.3" +version = "0.6.4" dependencies = [ "time", "tokio", @@ -337,7 +358,7 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "c8y_api" -version = "0.6.3" +version = "0.6.4" dependencies = [ "agent_interface", "anyhow", @@ -368,13 +389,13 @@ dependencies = [ [[package]] name = "c8y_configuration_plugin" -version = "0.6.3" +version = "0.6.4" dependencies = [ "anyhow", "assert_matches", "c8y_api", "c8y_smartrest", - "clap 3.1.15", + "clap 3.1.18", "csv", "download", "mockall 0.11.0", @@ -396,9 +417,10 @@ dependencies = [ [[package]] name = "c8y_smartrest" -version = "0.6.3" +version = "0.6.4" dependencies = [ "agent_interface", + "anyhow", "assert-json-diff", "assert_matches", "csv", @@ -419,7 +441,7 @@ dependencies = [ [[package]] name = "c8y_translator" -version = "0.6.3" +version = "0.6.4" dependencies = [ "anyhow", "assert-json-diff", @@ -427,6 +449,7 @@ dependencies = [ "clock", "criterion", "json-writer", + "pretty_assertions", "proptest", "serde_json", "test-case", @@ -458,7 +481,7 @@ checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "certificate" -version = "0.6.3" +version = "0.6.4" dependencies = [ "anyhow", "assert_matches", @@ -497,9 +520,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.15" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a35a599b11c089a7f49105658d089b8f2cf0882993c17daf6de15285c2c35d" +checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ "atty", "bitflags", @@ -514,15 +537,15 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.7" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" +checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" dependencies = [ "heck 0.4.0", "proc-macro-error", - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] @@ -536,7 +559,7 @@ dependencies = [ [[package]] name = "clock" -version = "0.6.3" +version = "0.6.4" dependencies = [ "mockall 0.10.2", "time", @@ -711,7 +734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] @@ -729,12 +752,18 @@ dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint", + "num-bigint 0.4.3", "num-traits", "rusticata-macros", ] [[package]] +name = "diff" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" + +[[package]] name = "difference" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -792,9 +821,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] @@ -817,7 +846,7 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "download" -version = "0.6.3" +version = "0.6.4" dependencies = [ "anyhow", "backoff", @@ -828,10 +857,12 @@ dependencies = [ "reqwest", "serde", "serde_json", + "tedge_utils", "tempfile", "test-case", "thiserror", "tokio", + "tokio-test", "url", ] @@ -923,7 +954,7 @@ dependencies = [ [[package]] name = "flockfile" -version = "0.6.3" +version = "0.6.4" dependencies = [ "assert_matches", "nix", @@ -1024,9 +1055,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] @@ -1118,6 +1149,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] +name = "hamcrest2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f837c62de05dc9cc71ff6486cd85de8856a330395ae338a04bfcefe5e91075" +dependencies = [ + "num", + "regex", +] + +[[package]] name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1255,7 +1296,7 @@ dependencies = [ "hyper", "rustls 0.20.4", "tokio", - "tokio-rustls 0.23.3", + "tokio-rustls 0.23.4", ] [[package]] @@ -1358,7 +1399,7 @@ dependencies = [ [[package]] name = "json-writer" -version = "0.6.3" +version = "0.6.4" dependencies = [ "anyhow", "serde_json", @@ -1399,11 +1440,16 @@ dependencies = [ [[package]] name = "logged_command" -version = "0.6.3" +version = "0.6.4" dependencies = [ "anyhow", + "assert_matches", + "async-trait", "log", + "serial_test", "tempfile", + "test-case", + "thiserror", "tokio", ] @@ -1471,25 +1517,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" dependencies = [ "libc", "log", - "miow", - "ntapi", "wasi 0.11.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "windows-sys", ] [[package]] @@ -1529,9 +1564,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7e25b214433f669161f414959594216d8e6ba83b6679d3db96899c0b4639033" dependencies = [ "cfg-if 1.0.0", - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] @@ -1541,9 +1576,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79ef208208a0dea3f72221e26e904cdc6db2e481d9ade89081ddd494f1dbaa6b" dependencies = [ "cfg-if 1.0.0", - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] @@ -1566,7 +1601,7 @@ dependencies = [ [[package]] name = "mqtt_channel" -version = "0.6.3" +version = "0.6.4" dependencies = [ "anyhow", "async-trait", @@ -1581,7 +1616,7 @@ dependencies = [ [[package]] name = "mqtt_tests" -version = "0.6.3" +version = "0.6.4" dependencies = [ "anyhow", "fastrand", @@ -1659,12 +1694,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] -name = "ntapi" -version = "0.3.7" +name = "num" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" dependencies = [ - "winapi", + "num-bigint 0.2.6", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", ] [[package]] @@ -1679,6 +1730,16 @@ dependencies = [ ] [[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1689,6 +1750,29 @@ dependencies = [ ] [[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg", + "num-bigint 0.2.6", + "num-integer", + "num-traits", +] + +[[package]] name = "num-traits" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1709,18 +1793,18 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.28.3" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" +checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ "memchr", ] @@ -1759,6 +1843,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" [[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi", +] + +[[package]] name = "parking_lot" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1836,9 +1929,9 @@ version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] @@ -1883,10 +1976,11 @@ dependencies = [ [[package]] name = "plugin_sm" -version = "0.6.3" +version = "0.6.4" dependencies = [ "agent_interface", "anyhow", + "assert_matches", "async-trait", "csv", "download", @@ -1960,6 +2054,18 @@ dependencies = [ ] [[package]] +name = "pretty_assertions" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563" +dependencies = [ + "ansi_term", + "ctor", + "diff", + "output_vt100", +] + +[[package]] name = "pretty_env_logger" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1976,9 +2082,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", "version_check", ] @@ -1988,7 +2094,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", "version_check", ] @@ -2004,9 +2110,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" dependencies = [ "unicode-xid 0.2.3", ] @@ -2058,7 +2164,7 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", ] [[package]] @@ -2218,7 +2324,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.23.3", + "tokio-rustls 0.23.4", "tokio-util 0.6.9", "url", "wasm-bindgen", @@ -2379,6 +2485,12 @@ dependencies = [ ] [[package]] +name = "rustversion" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" + +[[package]] name = "rusty-fork" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2413,7 +2525,7 @@ dependencies = [ [[package]] name = "sawtooth_publisher" -version = "0.6.3" +version = "0.6.4" dependencies = [ "async-log", "env_logger 0.9.0", @@ -2499,16 +2611,16 @@ version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.38", "quote 1.0.18", - "syn 1.0.92", + "syn 1.0.94", ] [[package]] name = "serde_json" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f972498cf015f7c0746cac89ebe1d6ef10c293b94175a243a2d9442c163d9944" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "itoa 1.0.1", "ryu", @@ -2529,9 +2641,9 @@ dependencies = [ [[package]] name = "serial_test" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d"</ |