From 36986595391ae73815809b80abe9bbdf4fb45d2a Mon Sep 17 00:00:00 2001 From: Taylor Thomas Date: Wed, 12 Jan 2022 11:32:29 -0700 Subject: [PATCH 1/2] chore(*): Bumps version for 0.7 release --- Cargo.lock | 351 +++++++++++++++++++++++++------------------------ Cargo.toml | 6 +- deny.toml | 8 ++ docs/README.md | 2 +- 4 files changed, 194 insertions(+), 173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b2326b4..099a827 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,15 +33,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.51" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203" +checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3" [[package]] name = "async-trait" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ "proc-macro2", "quote", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "bindle" -version = "0.6.0" +version = "0.7.0" dependencies = [ "anyhow", "async-trait", @@ -112,7 +112,7 @@ dependencies = [ "serde", "serde_cbor", "serde_json", - "sha2", + "sha2 0.10.1", "sled", "tempfile", "thiserror", @@ -158,6 +158,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +dependencies = [ + "generic-array", +] + [[package]] name = "blowfish" version = "0.8.0" @@ -181,9 +190,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.8.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] name = "byteorder" @@ -234,33 +243,17 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.0-beta.5" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63" +checksum = "12e8611f9ae4e068fa3e56931fded356ff745e70987ff76924a6e0ab1c8ef2e3" dependencies = [ "atty", "bitflags", - "clap_derive", "indexmap", - "lazy_static", "os_str_bytes", "strsim", "termcolor", "textwrap", - "unicase", -] - -[[package]] -name = "clap_derive" -version = "3.0.0-beta.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", ] [[package]] @@ -299,9 +292,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762" dependencies = [ "cfg-if", "crossbeam-utils", @@ -312,14 +305,23 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" dependencies = [ "cfg-if", "lazy_static", ] +[[package]] +name = "crypto-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" +dependencies = [ + "generic-array", +] + [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -327,7 +329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", - "digest", + "digest 0.9.0", "rand_core 0.5.1", "subtle", "zeroize", @@ -348,6 +350,17 @@ dependencies = [ "generic-array", ] +[[package]] +name = "digest" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" +dependencies = [ + "block-buffer 0.10.0", + "crypto-common", + "generic-array", +] + [[package]] name = "dirs" version = "4.0.0" @@ -387,7 +400,7 @@ dependencies = [ "ed25519", "rand 0.7.3", "serde", - "sha2", + "sha2 0.9.9", "zeroize", ] @@ -399,13 +412,22 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "encoding_rs" -version = "0.8.29" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" +checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" dependencies = [ "cfg-if", ] +[[package]] +name = "fastrand" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" +dependencies = [ + "instant", +] + [[package]] name = "fnv" version = "1.0.7" @@ -449,9 +471,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" +checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" dependencies = [ "futures-channel", "futures-core", @@ -464,9 +486,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" +checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" dependencies = [ "futures-core", "futures-sink", @@ -474,15 +496,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" +checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" [[package]] name = "futures-executor" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" +checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" dependencies = [ "futures-core", "futures-task", @@ -491,15 +513,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" +checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" [[package]] name = "futures-macro" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" +checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" dependencies = [ "proc-macro2", "quote", @@ -508,21 +530,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" +checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" [[package]] name = "futures-task" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" +checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" [[package]] name = "futures-util" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" +checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" dependencies = [ "futures-channel", "futures-core", @@ -547,9 +569,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", @@ -581,9 +603,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.7" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" +checksum = "0c9de88456263e249e241fcd211d3954e2c9b0ef7ccfc235a444eb367cae3689" dependencies = [ "bytes", "fnv", @@ -644,15 +666,6 @@ dependencies = [ "http", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "hermit-abi" version = "0.1.19" @@ -664,13 +677,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes", "fnv", - "itoa", + "itoa 1.0.1", ] [[package]] @@ -698,9 +711,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.15" +version = "0.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c" +checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" dependencies = [ "bytes", "futures-channel", @@ -711,7 +724,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa", + "itoa 0.4.8", "pin-project-lite", "socket2", "tokio", @@ -730,7 +743,7 @@ dependencies = [ "hyper", "rustls 0.20.2", "tokio", - "tokio-rustls 0.23.1", + "tokio-rustls 0.23.2", ] [[package]] @@ -794,6 +807,12 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + [[package]] name = "js-sys" version = "0.3.55" @@ -805,9 +824,9 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "8.0.0-beta.6" +version = "8.0.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af96e092f359a7ac2b8464cf2c74d7671558a75255ca4454007320140d84b3bf" +checksum = "a87e7bf0fee595b438897abfcb4523d238ee74102bf742f84d68723032b1b75a" dependencies = [ "base64", "pem", @@ -825,9 +844,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.109" +version = "0.2.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01" +checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" [[package]] name = "lock_api" @@ -849,9 +868,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c748cfe47cb8da225c37595b3108bea1c198c84aaae8ea0ba76d01dda9fc803" +checksum = "274353858935c992b13c0ca408752e2121da852d07dec7ce5f108c77dfa14d1f" dependencies = [ "hashbrown 0.11.2", ] @@ -1058,9 +1077,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -1081,16 +1100,16 @@ dependencies = [ "serde", "serde_json", "serde_path_to_error", - "sha2", + "sha2 0.9.9", "thiserror", "url", ] [[package]] name = "once_cell" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" [[package]] name = "opaque-debug" @@ -1132,15 +1151,15 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.71" +version = "0.9.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73" +checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" dependencies = [ "autocfg", "cc", @@ -1151,9 +1170,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "4.2.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" dependencies = [ "memchr", ] @@ -1185,13 +1204,11 @@ dependencies = [ [[package]] name = "pem" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06673860db84d02a63942fa69cd9543f2624a5df3aea7f33173048fa7ad5cf1a" +checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ "base64", - "once_cell", - "regex", ] [[package]] @@ -1202,18 +1219,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", @@ -1222,9 +1239,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -1234,15 +1251,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a3ea4f0dd7f1f3e512cf97bf100819aa547f36a6eccac8dbaae839eb92363e" +checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "ppv-lite86" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "proc-macro-error" @@ -1270,9 +1287,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] @@ -1294,9 +1311,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.10" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" dependencies = [ "proc-macro2", ] @@ -1438,15 +1455,16 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.7" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bea77bc708afa10e59905c3d4af7c8fd43c9214251673095ff8b14345fcbc5" +checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525" dependencies = [ "base64", "bytes", "encoding_rs", "futures-core", "futures-util", + "h2", "http", "http-body", "hyper", @@ -1467,7 +1485,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls 0.23.1", + "tokio-rustls 0.23.2", "tokio-util", "url", "wasm-bindgen", @@ -1494,9 +1512,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2288c66aeafe3b2ed227c981f364f9968fa952ef0b30e84ada4486e7ee24d00a" +checksum = "d912f35156a3f99a66ee3e11ac2e0b3f34ac85a07e05263d05a7e2c8810d616f" dependencies = [ "cfg-if", "proc-macro2", @@ -1550,9 +1568,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" [[package]] name = "safemem" @@ -1636,9 +1654,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.130" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" dependencies = [ "serde_derive", ] @@ -1655,9 +1673,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" dependencies = [ "proc-macro2", "quote", @@ -1666,21 +1684,21 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.72" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" +checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" dependencies = [ "indexmap", - "itoa", + "itoa 1.0.1", "ryu", "serde", ] [[package]] name = "serde_path_to_error" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0421d4f173fab82d72d6babf36d57fae38b994ca5c2d78e704260ba6d12118b" +checksum = "9bd186dd4e1748b2798a2e86789dd77f5834ecda0bf15db76962e8e104bfc9bd" dependencies = [ "serde", ] @@ -1692,7 +1710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ "form_urlencoded", - "itoa", + "itoa 0.4.8", "ryu", "serde", ] @@ -1703,26 +1721,37 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] +[[package]] +name = "sha2" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99c3bd8169c58782adad9290a9af5939994036b76187f7b4f0e6de91dbbfc0ec" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.1", +] + [[package]] name = "sharded-slab" version = "0.1.4" @@ -1743,9 +1772,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" [[package]] name = "simple_asn1" @@ -1817,9 +1846,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.82" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" dependencies = [ "proc-macro2", "quote", @@ -1840,13 +1869,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if", + "fastrand", "libc", - "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi", @@ -1866,9 +1895,6 @@ name = "textwrap" version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" -dependencies = [ - "unicode-width", -] [[package]] name = "thiserror" @@ -1916,7 +1942,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" dependencies = [ - "itoa", + "itoa 0.4.8", "libc", "quickcheck", "serde", @@ -1946,11 +1972,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144" +checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" dependencies = [ - "autocfg", "bytes", "libc", "memchr", @@ -1966,9 +1991,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2", "quote", @@ -1998,9 +2023,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4baa378e417d780beff82bf54ceb0d195193ea6a00c14e22359e7f39456b5689" +checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" dependencies = [ "rustls 0.20.2", "tokio", @@ -2116,9 +2141,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3" +checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594" dependencies = [ "ansi_term", "lazy_static", @@ -2168,9 +2193,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "unicase" @@ -2196,18 +2221,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - [[package]] name = "unicode-xid" version = "0.2.2" @@ -2286,9 +2299,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "want" @@ -2441,11 +2454,11 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.21.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" dependencies = [ - "webpki 0.21.4", + "webpki 0.22.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c168625..fb61a7c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bindle" -version = "0.6.0" +version = "0.7.0" authors = [ "Matt Butcher ", "Taylor Thomas " @@ -42,7 +42,7 @@ toml = "0.5.8" serde = { version = "1.0.130", features = ["derive"] } serde_json = "1.0.68" tempfile = "3.2.0" -sha2 = "0.9.8" +sha2 = "0.10" thiserror = "1.0.29" semver = { version = "1.0.4", features = ["serde"] } tokio = { version = "1.11.0", features = ["full"] } @@ -81,7 +81,7 @@ atty = {version = "0.2", optional = true} indexmap = "~1.6.2" [dev-dependencies] -rstest = "0.11.0" +rstest = "0.12.0" [[bin]] name = "bindle-server" diff --git a/deny.toml b/deny.toml index 0dbdd18..9d69899 100644 --- a/deny.toml +++ b/deny.toml @@ -121,6 +121,14 @@ license-files = [ { path = "LICENSE", hash = 0xbd0eed23 }, ] +[[licenses.clarify]] +name = "encoding_rs" +version = "*" +expression = "(Apache-2.0 OR MIT) AND BSD-3-Clause" +license-files = [ + { path = "COPYRIGHT", hash = 0x39f8ad31 } +] + [licenses.private] # If true, ignores workspace crates that aren't published, or are only # published to private registries diff --git a/docs/README.md b/docs/README.md index c124f69..db8d90b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -27,7 +27,7 @@ on Linux, MacOS, and Windows (in PowerShell): 1. Download your desired version from [the releases page](https://github.com/deislabs/bindles/releases) -1. Unpack it (`tar -xzf bindle-v0.6.0-linux-amd64.tar.gz`) +1. Unpack it (`tar -xzf bindle-v0.7.0-linux-amd64.tar.gz`) 1. Move the bindle and bindle CLIs to their desired destinations somewhere in your `$PATH` (e.g. `mv bindle bindle-server /usr/local/bin/` on Unix-like systems or `mv *.exe C:\Windows\system32\` on Windows) From 561a4506ad211d6e74cd7c839cb3c1836d9cdb91 Mon Sep 17 00:00:00 2001 From: Taylor Thomas Date: Wed, 12 Jan 2022 12:22:47 -0700 Subject: [PATCH 2/2] Update code to handle clap 3 upgrade --- Cargo.lock | 21 ++++++++++ Cargo.toml | 2 +- bin/client/opts.rs | 90 ++++++++++++++++++++-------------------- bin/server.rs | 28 ++++++------- examples/as2bindle.rs | 4 +- examples/cargo2bindle.rs | 4 +- 6 files changed, 85 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 099a827..3216202 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -249,13 +249,28 @@ checksum = "12e8611f9ae4e068fa3e56931fded356ff745e70987ff76924a6e0ab1c8ef2e3" dependencies = [ "atty", "bitflags", + "clap_derive", "indexmap", + "lazy_static", "os_str_bytes", "strsim", "termcolor", "textwrap", ] +[[package]] +name = "clap_derive" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "517358c28fcef6607bf6f76108e02afad7e82297d132a6b846dcc1fc3efcd153" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "core-foundation" version = "0.9.2" @@ -666,6 +681,12 @@ dependencies = [ "http", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" diff --git a/Cargo.toml b/Cargo.toml index fb61a7c..242f238 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ warp = { version = "0.3", features = ["tls"], optional = true } bytes = "1.1.0" async-trait = "0.1.51" futures = "0.3.17" -clap = { version = "3.0.0-beta.5", optional = true } +clap = { version = "3", features = ["derive", "env", "cargo"], optional = true } reqwest = { version = "0.11.4", features = ["stream"] } hyper = "0.14.12" url = "2.2.2" diff --git a/bin/client/opts.rs b/bin/client/opts.rs index 5608c6e..3f9d10d 100644 --- a/bin/client/opts.rs +++ b/bin/client/opts.rs @@ -15,14 +15,14 @@ pub struct Opts { short = 's', long = "server", env = "BINDLE_URL", - about = "The address of the bindle server. For the default local server, this should be http://localhost:8080/v1" + help = "The address of the bindle server. For the default local server, this should be http://localhost:8080/v1" )] pub server_url: String, #[clap( short = 'd', long = "bindle-dir", env = "BINDLE_DIRECTORY", - about = "The directory where bindles are stored/cached, defaults to $XDG_CACHE_HOME" + help = "The directory where bindles are stored/cached, defaults to $XDG_CACHE_HOME" )] pub bindle_dir: Option, @@ -30,7 +30,7 @@ pub struct Opts { short = 'r', long = "keyring", env = "BINDLE_KEYRING", - about = "The path to the keyring file. Defaults to $XDG_CONFIG/bindle/keyring.toml" + help = "The path to the keyring file. Defaults to $XDG_CONFIG/bindle/keyring.toml" )] pub keyring: Option, @@ -38,13 +38,13 @@ pub struct Opts { short = 't', long = "token-file", env = "BINDLE_TOKEN_FILE", - about = "The path to the login token file. If running `bindle login` this is where the file will be saved to. Defaults to $XDG_CONFIG/bindle/.token" + help = "The path to the login token file. If running `bindle login` this is where the file will be saved to. Defaults to $XDG_CONFIG/bindle/.token" )] pub token_file: Option, #[clap( long = "http-user", - about = "Username for HTTP Basic auth", + help = "Username for HTTP Basic auth", requires = "http-password", env = "BINDLE_HTTP_PASSWORD", hide_env_values = true @@ -53,7 +53,7 @@ pub struct Opts { #[clap( long = "http-password", - about = "Password for HTTP Basic auth", + help = "Password for HTTP Basic auth", requires = "http-user", env = "BINDLE_HTTP_USER" )] @@ -62,7 +62,7 @@ pub struct Opts { #[clap( short = 'k', long = "insecure", - about = "If set, ignore server certificate errors", + help = "If set, ignore server certificate errors", takes_value = false )] pub insecure: bool, @@ -135,19 +135,19 @@ pub struct Info { #[clap( index = 1, value_name = "BINDLE", - about = "The name of the bindle, e.g. example.com/mybindle/1.2.3" + help = "The name of the bindle, e.g. example.com/mybindle/1.2.3" )] pub bindle_id: String, #[clap( short = 'y', long = "yanked", - about = "Whether or not to fetch a yanked bindle. If you attempt to fetch a yanked bindle without this set, it will error" + help = "Whether or not to fetch a yanked bindle. If you attempt to fetch a yanked bindle without this set, it will error" )] pub yanked: bool, #[clap( short = 'f', long = "output-format", - about = "choose an output format", + help = "choose an output format", possible_values = &["json", "toml"], )] pub output: Option, @@ -158,14 +158,14 @@ pub struct Push { #[clap( index = 1, value_name = "BINDLE", - about = "The name of the bindle, e.g. foo/bar/baz/1.2.3" + help = "The name of the bindle, e.g. foo/bar/baz/1.2.3" )] pub bindle_id: String, #[clap( short = 'p', long = "path", default_value = "./", - about = "A path where the standalone bindle directory is located" + help = "A path where the standalone bindle directory is located" )] pub path: PathBuf, } @@ -175,19 +175,19 @@ pub struct Get { #[clap( index = 1, value_name = "BINDLE", - about = "The name of the bindle, e.g. example.com/mybindle/1.2.3" + help = "The name of the bindle, e.g. example.com/mybindle/1.2.3" )] pub bindle_id: String, #[clap( short = 'y', long = "yanked", - about = "Whether or not to fetch a yanked bindle. If you attempt to fetch a yanked bindle without this set, it will error" + help = "Whether or not to fetch a yanked bindle. If you attempt to fetch a yanked bindle without this set, it will error" )] pub yanked: bool, #[clap( short = 'e', long = "export", - about = "If specified, export the bindle as a standlone bindle in the given directory" + help = "If specified, export the bindle as a standlone bindle in the given directory" )] pub export: Option, } @@ -197,7 +197,7 @@ pub struct Yank { #[clap( index = 1, value_name = "BINDLE", - about = "The name of the bindle, e.g. example.com/mybindle/1.2.3" + help = "The name of the bindle, e.g. example.com/mybindle/1.2.3" )] pub bindle_id: String, } @@ -220,33 +220,33 @@ pub struct Search { #[clap( short = 'q', long = "query", - about = "Filter bindles by this query. Typically, the query is a bindle name or part of a name" + help = "Filter bindles by this query. Typically, the query is a bindle name or part of a name" )] pub query: Option, - #[clap(short = 'b', long = "bindle-version", about = "version constraint of the bindle to search for", long_about = VERSION_QUERY)] + #[clap(short = 'b', long = "bindle-version", help = "version constraint of the bindle to search for", long_help = VERSION_QUERY)] pub version: Option, #[clap( long = "offset", - about = "The offset where to start the next page of results" + help = "The offset where to start the next page of results" )] pub offset: Option, - #[clap(long = "limit", about = "the limit of results per page")] + #[clap(long = "limit", help = "the limit of results per page")] pub limit: Option, #[clap( long = "strict", - about = "Whether or not to use strict mode", - long_about = "Whether or not to use strict mode. Please note that bindle servers must implement a strict mode per the specification, a non-strict (standard) mode is optional" + help = "Whether or not to use strict mode", + long_help = "Whether or not to use strict mode. Please note that bindle servers must implement a strict mode per the specification, a non-strict (standard) mode is optional" )] pub strict: Option, #[clap( long = "yanked", - about = "Whether or not to include yanked bindles in the search result" + help = "Whether or not to include yanked bindles in the search result" )] pub yanked: Option, #[clap( short = 'f', long = "output-format", - about = "choose an output format", + help = "choose an output format", possible_values = &["json", "toml", "table"], )] pub output: Option, @@ -270,20 +270,20 @@ pub struct GetParcel { #[clap( index = 1, value_name = "BINDLE_ID", - about = "The name of the bindle, e.g. example.com/mybindle/1.2.3" + help = "The name of the bindle, e.g. example.com/mybindle/1.2.3" )] pub bindle_id: bindle::Id, #[clap( index = 2, value_name = "PARCEL_SHA", - about = "The SHA256 of the parcel" + help = "The SHA256 of the parcel" )] pub sha: String, #[clap( short = 'o', long = "output", default_value = "./parcel.dat", - about = "The location where to output the parcel to" + help = "The location where to output the parcel to" )] pub output: PathBuf, } @@ -293,20 +293,20 @@ pub struct GetInvoice { #[clap( index = 1, value_name = "BINDLE", - about = "The name of the bindle, e.g. example.com/mybindle/1.2.3" + help = "The name of the bindle, e.g. example.com/mybindle/1.2.3" )] pub bindle_id: String, #[clap( short = 'o', long = "output", default_value = "./invoice.toml", - about = "The location where to output the invoice to" + help = "The location where to output the invoice to" )] pub output: PathBuf, #[clap( short = 'y', long = "yanked", - about = "Whether or not to fetch a yanked bindle. If you attempt to fetch a yanked bindle without this set, it will error" + help = "Whether or not to fetch a yanked bindle. If you attempt to fetch a yanked bindle without this set, it will error" )] pub yanked: bool, } @@ -316,19 +316,19 @@ pub struct GenerateLabel { #[clap( index = 1, value_name = "FILE", - about = "The path to a file. This will generate a label for the file at that path" + help = "The path to a file. This will generate a label for the file at that path" )] pub path: PathBuf, #[clap( short = 'n', long = "name", - about = "The name of the parcel, defaults to the name + extension of the file" + help = "The name of the parcel, defaults to the name + extension of the file" )] pub name: Option, #[clap( short = 'm', long = "media-type", - about = "The media (mime) type of the file. If not provided, the tool will attempt to guess the mime type. If guessing fails, the default is `application/octet-stream`" + help = "The media (mime) type of the file. If not provided, the tool will attempt to guess the mime type. If guessing fails, the default is `application/octet-stream`" )] pub media_type: Option, } @@ -338,13 +338,13 @@ pub struct CreateKey { #[clap( index = 1, value_name = "LABEL", - about = "The name of the key, such as 'Matt '" + help = "The name of the key, such as 'Matt '" )] pub label: String, #[clap( short = 'f', long = "secrets-file", - about = "The path to the file where secrets should be stored. If it does not exist, it will be created. If it does exist, the key will be appended." + help = "The path to the file where secrets should be stored. If it does not exist, it will be created. If it does exist, the key will be appended." )] pub secret_file: Option, } @@ -355,14 +355,14 @@ pub struct PrintKey { short = 'f', long = "secrets-file", value_name = "KEYFILE_PATH", - about = "The path to the private key file. If not set, the default location will be checked." + help = "The path to the private key file. If not set, the default location will be checked." )] pub secret_file: Option, #[clap( short = 'l', long = "label", value_name = "LABEL", - about = "The label to search for. If supplied, this will return each key that contains this string in its label. For example, '--label=ample' will match 'label: Examples'." + help = "The label to search for. If supplied, this will return each key that contains this string in its label. For example, '--label=ample' will match 'label: Examples'." )] pub label: Option, } @@ -372,25 +372,25 @@ pub struct SignInvoice { #[clap( index = 1, value_name = "INVOICE", - about = "the path to the invoice to sign" + help = "the path to the invoice to sign" )] pub invoice: String, #[clap( short = 'f', long = "secrets-file", - about = "the path to the file where secret keys are stored. Use 'create-key' to create a new key" + help = "the path to the file where secret keys are stored. Use 'create-key' to create a new key" )] pub secret_file: Option, #[clap( short = 'r', long = "role", - about = "the role to sign with. Values are: c[reator], a[pprover], h[ost], p[roxy]. If no role is specified, 'creator' is used" + help = "the role to sign with. Values are: c[reator], a[pprover], h[ost], p[roxy]. If no role is specified, 'creator' is used" )] pub role: Option, #[clap( short = 'o', long = "out", - about = "the location to write the modified invoice. By default, it will write to invoice-HASH.toml, where HASH is computed on name and version" + help = "the location to write the modified invoice. By default, it will write to invoice-HASH.toml, where HASH is computed on name and version" )] pub destination: Option, } @@ -401,7 +401,7 @@ pub struct PushInvoice { index = 1, value_name = "FILE", default_value = "./invoice.toml", - about = "The path to the invoice TOML file" + help = "The path to the invoice TOML file" )] pub path: PathBuf, } @@ -413,19 +413,19 @@ pub struct PushFile { #[clap( index = 2, value_name = "FILE", - about = "The path to the file that should be pushed as a parcel" + help = "The path to the file that should be pushed as a parcel" )] pub path: PathBuf, #[clap( short = 'n', long = "name", - about = "the name of the parcel, defaults to the name + extension of the file" + help = "the name of the parcel, defaults to the name + extension of the file" )] pub name: Option, #[clap( short = 'm', long = "media-type", - about = "the media (mime) type of the file. If not provided, the tool will attempt to guess the mime type. If guessing fails, the default is `application/octet-stream`" + help = "the media (mime) type of the file. If not provided, the tool will attempt to guess the mime type. If guessing fails, the default is `application/octet-stream`" )] pub media_type: Option, } diff --git a/bin/server.rs b/bin/server.rs index 0ad3fcd..c61955f 100644 --- a/bin/server.rs +++ b/bin/server.rs @@ -35,7 +35,7 @@ struct Opts { short = 'i', long = "address", env = "BINDLE_IP_ADDRESS_PORT", - about = "the IP address and port to listen on [default: 127.0.0.1:8080]" + help = "the IP address and port to listen on [default: 127.0.0.1:8080]" )] address: Option, #[clap( @@ -43,7 +43,7 @@ struct Opts { short = 'd', long = "directory", env = "BINDLE_DIRECTORY", - about = "the path to the directory in which bindles will be stored [default: $XDG_DATA_HOME/bindle]" + help = "the path to the directory in which bindles will be stored [default: $XDG_DATA_HOME/bindle]" )] bindle_directory: Option, #[clap( @@ -52,7 +52,7 @@ struct Opts { long = "tls-cert", env = "BINDLE_TLS_CERT", requires = "key_path", - about = "the path to the TLS certificate to use. If set, --key-path must be set as well. If not set, the server will use HTTP" + help = "the path to the TLS certificate to use. If set, --key-path must be set as well. If not set, the server will use HTTP" )] cert_path: Option, #[clap( @@ -61,20 +61,20 @@ struct Opts { long = "tls-key", env = "BINDLE_TLS_KEY", requires = "cert_path", - about = "the path to the TLS certificate key to use. If set, --cert-path must be set as well. If not set, the server will use HTTP" + help = "the path to the TLS certificate key to use. If set, --cert-path must be set as well. If not set, the server will use HTTP" )] key_path: Option, #[clap( name = "config_file", long = "config-path", - about = "the path to a configuration file" + help = "the path to a configuration file" )] config_file: Option, #[clap( name = "keyring", short = 'r', long = "keyring", - about = "the path to the public keyring file used for verifying signatures" + help = "the path to the public keyring file used for verifying signatures" )] keyring_file: Option, @@ -82,7 +82,7 @@ struct Opts { name = "signing_keys", long = "signing-keys", env = "BINDLE_SIGNING_KEYS", - about = "location of the TOML file that holds the signing keys used for creating signatures" + help = "location of the TOML file that holds the signing keys used for creating signatures" )] signing_file: Option, @@ -90,7 +90,7 @@ struct Opts { name = "verification_strategy", long = "strategy", env = "BINDLE_VERIFICATION_STRATEGY", - about = "The verification strategy to use on the server. Must be one of: CreativeIntegrity, AuthoritativeIntegrity, GreedyVerification, ExhaustiveVerification, MultipleAttestation, MultipleAttestationGreedy. For either of the multiple attestation strategies, you can specify the roles using the following syntax: `MultipleAttestation[Creator, Approver]`" + help = "The verification strategy to use on the server. Must be one of: CreativeIntegrity, AuthoritativeIntegrity, GreedyVerification, ExhaustiveVerification, MultipleAttestation, MultipleAttestationGreedy. For either of the multiple attestation strategies, you can specify the roles using the following syntax: `MultipleAttestation[Creator, Approver]`" )] verification_strategy: Option, @@ -99,7 +99,7 @@ struct Opts { long = "use-embedded-db", short = 'e', env = "BINDLE_USE_EMBEDDED_DB", - about = "Use the new embedded database provider. This is currently experimental, but fairly stable and more efficient. In the future, this will be the default" + help = "Use the new embedded database provider. This is currently experimental, but fairly stable and more efficient. In the future, this will be the default" )] #[serde(default)] use_embedded_db: bool, @@ -108,7 +108,7 @@ struct Opts { name = "htpasswd-file", long = "htpasswd-file", env = "BINDLE_HTPASSWD_FILE", - about = "If set, this will turn on HTTP Basic Auth for Bindle and load the given htpasswd file. Use 'htpasswd -Bc' to create one." + help = "If set, this will turn on HTTP Basic Auth for Bindle and load the given htpasswd file. Use 'htpasswd -Bc' to create one." )] htpasswd_file: Option, @@ -117,7 +117,7 @@ struct Opts { long = "oidc-client-id", env = "BINDLE_OIDC_CLIENT_ID", requires_all = &["oidc-device-url", "oidc-issuer-url"], - about = "The OIDC client ID to use for Oauth2 token authentication" + help = "The OIDC client ID to use for Oauth2 token authentication" )] oidc_client_id: Option, @@ -129,7 +129,7 @@ struct Opts { long = "oidc-device-url", env = "BINDLE_OIDC_DEVICE_URL", requires_all = &["oidc-client-id", "oidc-issuer-url"], - about = "The URL to the device code authentication for your OIDC provider" + help = "The URL to the device code authentication for your OIDC provider" )] oidc_device_url: Option, @@ -138,14 +138,14 @@ struct Opts { long = "oidc-issuer-url", env = "BINDLE_OIDC_ISSUER_URL", requires_all = &["oidc-device-url", "oidc-client-id"], - about = "The URL of the OIDC issuer your tokens should be issued by. This is used for verification of the token and for OIDC discovery" + help = "The URL of the OIDC issuer your tokens should be issued by. This is used for verification of the token and for OIDC discovery" )] oidc_issuer_url: Option, #[clap( name = "unauthenticated", long = "unauthenticated", - about = "Run server in develepment mode" + help = "Run server in develepment mode" )] #[serde(default)] unauthenticated: bool, diff --git a/examples/as2bindle.rs b/examples/as2bindle.rs index 449d41e..e2d2cb5 100644 --- a/examples/as2bindle.rs +++ b/examples/as2bindle.rs @@ -26,14 +26,14 @@ async fn main() { .about(DESCRIPTION) .arg( Arg::new("src") - .about("path to directory with package.json") + .help("path to directory with package.json") .short('s') .long("src") .takes_value(true), ) .arg( Arg::new("bindir") - .about("path to bindle directory") + .help("path to bindle directory") .short('b') .long("bindle") .takes_value(true), diff --git a/examples/cargo2bindle.rs b/examples/cargo2bindle.rs index 23ed1a1..8847081 100644 --- a/examples/cargo2bindle.rs +++ b/examples/cargo2bindle.rs @@ -29,14 +29,14 @@ async fn main() { .about(DESCRIPTION) .arg( Arg::new("cargo") - .about("path to directory with cargo.toml") + .help("path to directory with cargo.toml") .short('c') .long("cargo") .takes_value(true), ) .arg( Arg::new("bindir") - .about("path to bindle directory") + .help("path to bindle directory") .short('b') .long("bindle") .takes_value(true),