aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.lock116
-rw-r--r--zone/Cargo.toml18
-rw-r--r--zone_core/Cargo.toml4
-rw-r--r--zone_core/src/container.rs8
4 files changed, 103 insertions, 43 deletions
diff --git a/Cargo.lock b/Cargo.lock
index fbd1c89..bcecd57 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -22,9 +22,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.53"
+version = "1.0.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
+checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
[[package]]
name = "async-trait"
@@ -90,7 +90,7 @@ dependencies = [
"sha-1 0.10.0",
"sync_wrapper",
"tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.16.1",
"tower",
"tower-http",
"tower-layer",
@@ -208,16 +208,16 @@ dependencies = [
[[package]]
name = "clap"
-version = "3.0.13"
+version = "3.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08799f92c961c7a1cf0cc398a9073da99e21ce388b46372c37f3191f2f3eed3e"
+checksum = "6aad2534fad53df1cc12519c5cda696dd3e20e6118a027e24054aea14a0bdcbe"
dependencies = [
"atty",
"bitflags",
"clap_derive",
+ "clap_lex",
"indexmap",
"lazy_static",
- "os_str_bytes",
"strsim",
"termcolor",
"textwrap",
@@ -225,18 +225,18 @@ dependencies = [
[[package]]
name = "clap_complete"
-version = "3.0.5"
+version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4dabb7e2f006497e1da045feaa512acf0686f76b68d94925da2d9422dcb521"
+checksum = "df6f3613c0a3cddfd78b41b10203eb322cb29b600cbdf808a7d3db95691b8e25"
dependencies = [
"clap",
]
[[package]]
name = "clap_derive"
-version = "3.0.5"
+version = "3.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41a0645a430ec9136d2d701e54a95d557de12649a9dd7109ced3187e648ac824"
+checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
dependencies = [
"heck 0.4.0",
"proc-macro-error",
@@ -246,6 +246,15 @@ dependencies = [
]
[[package]]
+name = "clap_lex"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "189ddd3b5d32a70b35e7686054371742a937b0d99128e76dde6340210e966669"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
name = "core-foundation"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -802,9 +811,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.14"
+version = "0.4.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8"
dependencies = [
"cfg-if 1.0.0",
]
@@ -974,15 +983,12 @@ name = "os_str_bytes"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
-dependencies = [
- "memchr",
-]
[[package]]
name = "papergrid"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daff3d017ba874371c984a4eb5662e446362f13d11ee6bdb7fadbe1e3c223333"
+checksum = "63709d10e2c2ec58f7bd91d8258d27ce80de090064b0ddf3a4bf38b907b61b8a"
dependencies = [
"unicode-width",
]
@@ -1252,9 +1258,9 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.11.9"
+version = "0.11.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525"
+checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb"
dependencies = [
"base64",
"bytes 1.1.0",
@@ -1387,12 +1393,12 @@ dependencies = [
[[package]]
name = "serde_urlencoded"
-version = "0.7.0"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
- "itoa 0.4.8",
+ "itoa 1.0.1",
"ryu",
"serde",
]
@@ -1516,9 +1522,9 @@ checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8"
[[package]]
name = "tabled"
-version = "0.4.2"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a0dca82254bf1031c194833992b10c8a8148a8f4966ae2d3b0afdabcb1bb4c8"
+checksum = "d15827061abcf689257b1841c8e2732b1dfcc3ef825b24ce6c606e1e9e1a7bde"
dependencies = [
"papergrid",
"tabled_derive",
@@ -1526,9 +1532,9 @@ dependencies = [
[[package]]
name = "tabled_derive"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a224735cbc8c30f06e52dc3891dc4b8eed07e5d4c8fb6f4cb6a839458e5a6465"
+checksum = "278ea3921cee8c5a69e0542998a089f7a14fa43c9c4e4f9951295da89bd0c943"
dependencies = [
"proc-macro2",
"quote",
@@ -1560,9 +1566,9 @@ dependencies = [
[[package]]
name = "textwrap"
-version = "0.14.2"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
+checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
[[package]]
name = "thiserror"
@@ -1660,6 +1666,17 @@ dependencies = [
]
[[package]]
+name = "tokio-stream"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
name = "tokio-tungstenite"
version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1668,7 +1685,19 @@ dependencies = [
"futures-util",
"log",
"tokio",
- "tungstenite",
+ "tungstenite 0.16.0",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite 0.17.2",
]
[[package]]
@@ -1841,6 +1870,25 @@ dependencies = [
]
[[package]]
+name = "tungstenite"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5"
+dependencies = [
+ "base64",
+ "byteorder",
+ "bytes 1.1.0",
+ "http",
+ "httparse",
+ "log",
+ "rand",
+ "sha-1 0.10.0",
+ "thiserror",
+ "url",
+ "utf-8",
+]
+
+[[package]]
name = "typenum"
version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2115,9 +2163,9 @@ checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
[[package]]
name = "winreg"
-version = "0.7.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
dependencies = [
"winapi",
]
@@ -2156,10 +2204,16 @@ dependencies = [
"anyhow",
"clap",
"clap_complete",
+ "futures",
+ "futures-channel",
"log",
"reqwest",
+ "serde_json",
"simplelog",
"tabled",
+ "tokio",
+ "tokio-stream",
+ "tokio-tungstenite 0.17.1",
"zone_core",
]
diff --git a/zone/Cargo.toml b/zone/Cargo.toml
index bd08d3b..ee79291 100644
--- a/zone/Cargo.toml
+++ b/zone/Cargo.toml
@@ -13,11 +13,17 @@ keywords = ["zone", "zoned", "container", "containers"]
workspace = ".."
[dependencies]
-anyhow = "1.0.53"
-clap = { version = "3.0.13", features = ["derive", "env"] }
-clap_complete = "3.0.5"
-log = "0.4.14"
-reqwest = { version = "0.11.9", features = ["blocking", "json"] }
+anyhow = "1.0.56"
+clap = { version = "3.1.9", features = ["derive", "env"] }
+clap_complete = "3.1.1"
+futures = "0.3.21"
+futures-channel = "0.3.21"
+log = "0.4.16"
+reqwest = { version = "0.11.10", features = ["blocking", "json"] }
+serde_json = "1.0.79"
simplelog = "0.11.2"
-tabled = "0.4.2"
+tabled = "0.6.1"
+tokio = "1.17.0"
+tokio-stream = "0.1.8"
+tokio-tungstenite = "0.17.1"
zone_core = { version = "0.1.0", path = "../zone_core" }
diff --git a/zone_core/Cargo.toml b/zone_core/Cargo.toml
index 0c557b3..a4e2072 100644
--- a/zone_core/Cargo.toml
+++ b/zone_core/Cargo.toml
@@ -12,12 +12,12 @@ keywords = ["zone", "zoned"]
workspace = ".."
[dependencies]
-clap = { version = "3.0.13", default-features = false, features = ["std", "derive"] }
+clap = { version = "3.1.9", default-features = false, features = ["std", "derive"] }
derive_builder = "0.10.2"
serde = "1.0.136"
strum = "0.23.0"
strum_macros = "0.23.1"
-tabled = "0.4.2"
+tabled = "0.6.1"
thiserror = "1.0.30"
zone_nspawn = { version = "0.1.0", path = "../zone_nspawn" }
zone_zfs = { version = "0.1.0", path = "../zone_zfs" }
diff --git a/zone_core/src/container.rs b/zone_core/src/container.rs
index 9296fb6..2020b20 100644
--- a/zone_core/src/container.rs
+++ b/zone_core/src/container.rs
@@ -18,16 +18,16 @@ mod status;
)]
#[serde(rename_all = "camelCase")]
pub struct Container {
- #[header("ID")]
+ #[tabled("ID")]
pub id: u64,
- #[header("Template")]
+ #[tabled("Template")]
pub template: String,
- #[header("User")]
+ #[tabled("User")]
pub user: String,
- #[header("Status")]
+ #[tabled("Status")]
pub status: ContainerStatus,
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-20 04:41:57 +0000