diff --git a/Cargo.lock b/Cargo.lock index 935a2dfad..e06ff1d63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -156,12 +156,12 @@ dependencies = [ [[package]] name = "api_identity" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "omicron-workspace-hack", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -207,7 +207,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -229,7 +229,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -240,7 +240,7 @@ checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -438,6 +438,12 @@ version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +[[package]] +name = "bytecount" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" + [[package]] name = "byteorder" version = "1.4.3" @@ -446,9 +452,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ "serde", ] @@ -509,9 +515,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -578,7 +584,7 @@ version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -591,10 +597,10 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -752,7 +758,7 @@ dependencies = [ [[package]] name = "crucible" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=4661c23b248da18862012cf55af21b17b79a468e#4661c23b248da18862012cf55af21b17b79a468e" +source = "git+https://github.com/oxidecomputer/crucible?rev=5677c7be81b60d9ba9c30991d10376f279a1d3b7#5677c7be81b60d9ba9c30991d10376f279a1d3b7" dependencies = [ "aes-gcm-siv", "anyhow", @@ -761,6 +767,7 @@ dependencies = [ "base64 0.22.0", "bincode", "bytes", + "cfg-if", "chrono", "crucible-client-types", "crucible-common", @@ -789,30 +796,30 @@ dependencies = [ "tokio", "tokio-rustls 0.24.1", "tokio-util", - "toml 0.8.10", + "toml 0.8.12", "tracing", "usdt 0.5.0", - "uuid", + "uuid 1.8.0", "version_check", ] [[package]] name = "crucible-client-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=4661c23b248da18862012cf55af21b17b79a468e#4661c23b248da18862012cf55af21b17b79a468e" +source = "git+https://github.com/oxidecomputer/crucible?rev=5677c7be81b60d9ba9c30991d10376f279a1d3b7#5677c7be81b60d9ba9c30991d10376f279a1d3b7" dependencies = [ "base64 0.22.0", "crucible-workspace-hack", "schemars", "serde", "serde_json", - "uuid", + "uuid 1.8.0", ] [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=4661c23b248da18862012cf55af21b17b79a468e#4661c23b248da18862012cf55af21b17b79a468e" +source = "git+https://github.com/oxidecomputer/crucible?rev=5677c7be81b60d9ba9c30991d10376f279a1d3b7#5677c7be81b60d9ba9c30991d10376f279a1d3b7" dependencies = [ "anyhow", "atty", @@ -833,16 +840,16 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls 0.24.1", - "toml 0.8.10", + "toml 0.8.12", "twox-hash", - "uuid", + "uuid 1.8.0", "vergen", ] [[package]] name = "crucible-protocol" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=4661c23b248da18862012cf55af21b17b79a468e#4661c23b248da18862012cf55af21b17b79a468e" +source = "git+https://github.com/oxidecomputer/crucible?rev=5677c7be81b60d9ba9c30991d10376f279a1d3b7#5677c7be81b60d9ba9c30991d10376f279a1d3b7" dependencies = [ "anyhow", "bincode", @@ -855,7 +862,7 @@ dependencies = [ "strum_macros 0.26.1", "tokio", "tokio-util", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -965,7 +972,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -976,7 +983,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1126,10 +1133,11 @@ dependencies = [ [[package]] name = "dns-service-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "anyhow", "chrono", + "expectorate", "http 0.2.12", "omicron-workspace-hack", "progenitor", @@ -1178,11 +1186,11 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "dropshot" version = "0.10.1-dev" -source = "git+https://github.com/oxidecomputer/dropshot?branch=main#c3e8467092014278787ae2ec74a8eafc39505b42" +source = "git+https://github.com/oxidecomputer/dropshot?branch=main#773889e5ab24d6ee0eb9e49d6c8bc79ccc067060" dependencies = [ "async-stream", "async-trait", - "base64 0.21.7", + "base64 0.22.0", "bytes", "camino", "chrono", @@ -1193,13 +1201,12 @@ dependencies = [ "hostname", "http 0.2.12", "hyper", - "indexmap 2.2.5", + "indexmap 2.2.6", "multer", "openapiv3", "paste", "percent-encoding", - "proc-macro2", - "rustls 0.22.2", + "rustls 0.22.3", "rustls-pemfile 2.1.1", "schemars", "serde", @@ -1214,9 +1221,9 @@ dependencies = [ "slog-term", "tokio", "tokio-rustls 0.25.0", - "toml 0.8.10", + "toml 0.8.12", "usdt 0.5.0", - "uuid", + "uuid 1.8.0", "version_check", "waitgroup", ] @@ -1224,13 +1231,13 @@ dependencies = [ [[package]] name = "dropshot_endpoint" version = "0.10.1-dev" -source = "git+https://github.com/oxidecomputer/dropshot?branch=main#c3e8467092014278787ae2ec74a8eafc39505b42" +source = "git+https://github.com/oxidecomputer/dropshot?branch=main#773889e5ab24d6ee0eb9e49d6c8bc79ccc067060" dependencies = [ "proc-macro2", "quote", "serde", "serde_tokenstream 0.2.0", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1288,7 +1295,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -1367,9 +1374,9 @@ dependencies = [ [[package]] name = "expectorate" -version = "1.0.7" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710ab6a2d57038a835d66f78d5af3fa5d27c1ec4682f823b9203c48826cb0591" +checksum = "de6f19b25bdfa2747ae775f37cd109c31f1272d4e4c83095be0727840aa1d75f" dependencies = [ "console", "newline-converter", @@ -1493,7 +1500,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1585,7 +1592,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -1621,9 +1628,9 @@ dependencies = [ [[package]] name = "gateway-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ - "base64 0.21.7", + "base64 0.22.0", "chrono", "gateway-messages", "omicron-workspace-hack", @@ -1634,7 +1641,7 @@ dependencies = [ "serde", "serde_json", "slog", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -1648,7 +1655,7 @@ dependencies = [ "serde_repr", "static_assertions", "strum_macros 0.25.3", - "uuid", + "uuid 1.8.0", "zerocopy 0.6.6", ] @@ -1753,7 +1760,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.5", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -1791,6 +1798,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2032,9 +2045,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2075,7 +2088,7 @@ dependencies = [ [[package]] name = "internal-dns" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "anyhow", "chrono", @@ -2088,7 +2101,7 @@ dependencies = [ "slog", "thiserror", "trust-dns-resolver", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -2420,6 +2433,22 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mg-admin-client" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/maghemite?rev=8207cb9c90cd7144c3f351823bfb2ae3e221ad10#8207cb9c90cd7144c3f351823bfb2ae3e221ad10" +dependencies = [ + "anyhow", + "chrono", + "percent-encoding", + "progenitor", + "reqwest", + "schemars", + "serde", + "serde_json", + "slog", +] + [[package]] name = "mime" version = "0.3.17" @@ -2526,7 +2555,7 @@ checksum = "6a5ff2b31594942586c1520da8f1e5c705729ec67b3c2ad0fe459f0b576e4d9a" dependencies = [ "schemars", "serde", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -2541,7 +2570,7 @@ dependencies = [ [[package]] name = "nexus-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "chrono", "futures", @@ -2549,30 +2578,33 @@ dependencies = [ "nexus-types", "omicron-common", "omicron-passwords", + "omicron-uuid-kinds", "omicron-workspace-hack", "progenitor", - "regress 0.8.0", + "regress", "reqwest", "schemars", "serde", "serde_json", "slog", - "uuid", + "uuid 1.8.0", ] [[package]] name = "nexus-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "anyhow", "api_identity", - "base64 0.21.7", + "base64 0.22.0", "chrono", "dns-service-client", "futures", "gateway-client", "humantime", + "ipnetwork", + "newtype-uuid", "omicron-common", "omicron-passwords", "omicron-uuid-kinds", @@ -2586,8 +2618,9 @@ dependencies = [ "sled-agent-client", "steno", "strum", + "tabled", "thiserror", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -2792,7 +2825,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -2874,7 +2907,7 @@ dependencies = [ [[package]] name = "omicron-common" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "anyhow", "api_identity", @@ -2888,13 +2921,15 @@ dependencies = [ "http 0.2.12", "ipnetwork", "macaddr", + "mg-admin-client", "omicron-uuid-kinds", "omicron-workspace-hack", "once_cell", "parse-display", "progenitor", + "progenitor-client", "rand", - "regress 0.8.0", + "regress", "reqwest", "schemars", "semver 1.0.22", @@ -2903,16 +2938,17 @@ dependencies = [ "serde_json", "serde_with", "slog", + "slog-error-chain", "strum", "thiserror", "tokio", - "uuid", + "uuid 1.8.0", ] [[package]] name = "omicron-passwords" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "argon2", "omicron-workspace-hack", @@ -2926,7 +2962,7 @@ dependencies = [ [[package]] name = "omicron-uuid-kinds" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "newtype-uuid", "schemars", @@ -2982,7 +3018,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc02deea53ffe807708244e5914f6b099ad7015a207ee24317c22112e17d9c5c" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_json", ] @@ -3010,7 +3046,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3064,7 +3100,7 @@ dependencies = [ [[package]] name = "oximeter" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "bytes", "chrono", @@ -3078,13 +3114,13 @@ dependencies = [ "serde_json", "strum", "thiserror", - "uuid", + "uuid 1.8.0", ] [[package]] name = "oximeter-instruments" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "cfg-if", "chrono", @@ -3095,24 +3131,24 @@ dependencies = [ "slog", "thiserror", "tokio", - "uuid", + "uuid 1.8.0", ] [[package]] name = "oximeter-macro-impl" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "omicron-workspace-hack", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] name = "oximeter-producer" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "chrono", "dropshot", @@ -3126,7 +3162,7 @@ dependencies = [ "slog-dtrace", "thiserror", "tokio", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -3191,6 +3227,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "papergrid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb" +dependencies = [ + "bytecount", + "fnv", + "unicode-width", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -3236,7 +3283,7 @@ dependencies = [ "regex", "regex-syntax 0.8.2", "structmeta", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3302,7 +3349,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3323,7 +3370,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_derive", ] @@ -3362,7 +3409,7 @@ dependencies = [ "tokio-tungstenite", "toml 0.7.8", "tracing", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -3381,7 +3428,7 @@ dependencies = [ "tracing-appender", "tracing-bunyan-formatter", "tracing-subscriber", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -3415,7 +3462,7 @@ dependencies = [ "phd-testcase", "propolis-client", "tracing", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -3467,7 +3514,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3505,7 +3552,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3634,9 +3681,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -3644,7 +3691,7 @@ dependencies = [ [[package]] name = "progenitor" version = "0.6.0" -source = "git+https://github.com/oxidecomputer/progenitor?branch=main#90d3282f488a17f9c85e25c26845fef2d92af435" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#85fab0d8aeb2b5181c3c9c36a0838cc29be5d195" dependencies = [ "progenitor-client", "progenitor-impl", @@ -3655,7 +3702,7 @@ dependencies = [ [[package]] name = "progenitor-client" version = "0.6.0" -source = "git+https://github.com/oxidecomputer/progenitor?branch=main#90d3282f488a17f9c85e25c26845fef2d92af435" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#85fab0d8aeb2b5181c3c9c36a0838cc29be5d195" dependencies = [ "bytes", "futures-core", @@ -3669,12 +3716,12 @@ dependencies = [ [[package]] name = "progenitor-impl" version = "0.6.0" -source = "git+https://github.com/oxidecomputer/progenitor?branch=main#90d3282f488a17f9c85e25c26845fef2d92af435" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#85fab0d8aeb2b5181c3c9c36a0838cc29be5d195" dependencies = [ "getopts", - "heck", + "heck 0.4.1", "http 0.2.12", - "indexmap 2.2.5", + "indexmap 2.2.6", "openapiv3", "proc-macro2", "quote", @@ -3682,7 +3729,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.52", + "syn 2.0.58", "thiserror", "typify", "unicode-ident", @@ -3691,7 +3738,7 @@ dependencies = [ [[package]] name = "progenitor-macro" version = "0.6.0" -source = "git+https://github.com/oxidecomputer/progenitor?branch=main#90d3282f488a17f9c85e25c26845fef2d92af435" +source = "git+https://github.com/oxidecomputer/progenitor?branch=main#85fab0d8aeb2b5181c3c9c36a0838cc29be5d195" dependencies = [ "openapiv3", "proc-macro2", @@ -3702,7 +3749,7 @@ dependencies = [ "serde_json", "serde_tokenstream 0.2.0", "serde_yaml", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -3745,7 +3792,7 @@ dependencies = [ "thiserror", "tokio", "usdt 0.5.0", - "uuid", + "uuid 1.8.0", "viona_api", ] @@ -3768,7 +3815,7 @@ dependencies = [ "slog-term", "tokio", "tokio-tungstenite", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -3788,7 +3835,7 @@ dependencies = [ "thiserror", "tokio", "tokio-tungstenite", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -3817,7 +3864,7 @@ dependencies = [ "thiserror", "tokio", "tokio-tungstenite", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -3884,7 +3931,7 @@ dependencies = [ "tokio-util", "toml 0.7.8", "usdt 0.5.0", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -3925,7 +3972,7 @@ dependencies = [ "tar", "tokio", "toml 0.7.8", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -3950,7 +3997,7 @@ dependencies = [ "schemars", "serde", "thiserror", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -4064,9 +4111,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -4108,19 +4155,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "regress" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5f39ba4513916c1b2657b72af6ec671f091cd637992f58d0ede5cae4e5dea0" -dependencies = [ - "hashbrown 0.14.3", - "memchr", -] - -[[package]] -name = "regress" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06f9a1f7cd8473611ba1a480cf35f9c5cffc2954336ba90a982fdb7e7d7f51e" +checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479" dependencies = [ "hashbrown 0.14.3", "memchr", @@ -4128,9 +4165,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", @@ -4308,9 +4345,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "99008d7ad0bbbea527ec27bddbc0e432c5b87d8175178cee68d2eec9c4a1813c" dependencies = [ "log", "ring 0.17.7", @@ -4438,7 +4475,8 @@ dependencies = [ "schemars_derive", "serde", "serde_json", - "uuid", + "uuid 0.8.2", + "uuid 1.8.0", ] [[package]] @@ -4476,7 +4514,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -4580,7 +4618,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -4605,9 +4643,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -4616,9 +4654,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ "itoa", "serde", @@ -4632,7 +4670,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -4673,7 +4711,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -4690,15 +4728,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.6.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" +checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" dependencies = [ "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_derive", "serde_json", @@ -4708,14 +4746,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.6.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" +checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -4724,7 +4762,7 @@ version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -4843,7 +4881,7 @@ dependencies = [ [[package]] name = "sled-agent-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#87c9b13037e8e9d9ec12abc6d997336674993760" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#03432f6b8f662317abb5e9b9a9b56d3537b3f05c" dependencies = [ "anyhow", "async-trait", @@ -4852,12 +4890,12 @@ dependencies = [ "omicron-common", "omicron-workspace-hack", "progenitor", - "regress 0.8.0", + "regress", "reqwest", "schemars", "serde", "slog", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -4919,6 +4957,25 @@ dependencies = [ "slog-term", ] +[[package]] +name = "slog-error-chain" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/slog-error-chain?branch=main#15f69041f45774602108e47fb25e705dc23acfb2" +dependencies = [ + "slog", + "slog-error-chain-derive", +] + +[[package]] +name = "slog-error-chain-derive" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/slog-error-chain?branch=main#15f69041f45774602108e47fb25e705dc23acfb2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "slog-json" version = "2.6.1" @@ -4989,7 +5046,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -5084,7 +5141,7 @@ dependencies = [ "slog", "thiserror", "tokio", - "uuid", + "uuid 1.8.0", ] [[package]] @@ -5102,7 +5159,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -5113,7 +5170,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -5131,11 +5188,11 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -5144,11 +5201,11 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -5180,9 +5237,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -5228,6 +5285,30 @@ dependencies = [ "libc", ] +[[package]] +name = "tabled" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e" +dependencies = [ + "papergrid", + "tabled_derive", + "unicode-width", +] + +[[package]] +name = "tabled_derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c138f99377e5d653a371cdad263615634cfc8467685dfe8e73e2b8e98f44b17" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "take_mut" version = "0.2.2" @@ -5361,22 +5442,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -5447,9 +5528,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -5482,7 +5563,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -5511,7 +5592,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.3", "rustls-pki-types", "tokio", ] @@ -5565,14 +5646,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.9", ] [[package]] @@ -5590,7 +5671,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -5599,11 +5680,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -5690,7 +5771,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -5840,7 +5921,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "typify" version = "0.0.16" -source = "git+https://github.com/oxidecomputer/typify#c5ebe0a2bf08ad8a743be5b593b1a8526a3fff4a" +source = "git+https://github.com/oxidecomputer/typify#739717cc8432fe2029cfbab27d4642d397bb4497" dependencies = [ "typify-impl", "typify-macro", @@ -5849,16 +5930,16 @@ dependencies = [ [[package]] name = "typify-impl" version = "0.0.16" -source = "git+https://github.com/oxidecomputer/typify#c5ebe0a2bf08ad8a743be5b593b1a8526a3fff4a" +source = "git+https://github.com/oxidecomputer/typify#739717cc8432fe2029cfbab27d4642d397bb4497" dependencies = [ - "heck", + "heck 0.5.0", "log", "proc-macro2", "quote", - "regress 0.9.0", + "regress", "schemars", "serde_json", - "syn 2.0.52", + "syn 2.0.58", "thiserror", "unicode-ident", ] @@ -5866,7 +5947,7 @@ dependencies = [ [[package]] name = "typify-macro" version = "0.0.16" -source = "git+https://github.com/oxidecomputer/typify#c5ebe0a2bf08ad8a743be5b593b1a8526a3fff4a" +source = "git+https://github.com/oxidecomputer/typify#739717cc8432fe2029cfbab27d4642d397bb4497" dependencies = [ "proc-macro2", "quote", @@ -5874,7 +5955,7 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream 0.2.0", - "syn 2.0.52", + "syn 2.0.58", "typify-impl", ] @@ -6016,7 +6097,7 @@ dependencies = [ "proc-macro2", "quote", "serde_tokenstream 0.2.0", - "syn 2.0.52", + "syn 2.0.58", "usdt-impl 0.5.0", ] @@ -6054,7 +6135,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.52", + "syn 2.0.58", "thiserror", "thread-id", "version_check", @@ -6084,7 +6165,7 @@ dependencies = [ "proc-macro2", "quote", "serde_tokenstream 0.2.0", - "syn 2.0.52", + "syn 2.0.58", "usdt-impl 0.5.0", ] @@ -6102,9 +6183,15 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.7.0" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + +[[package]] +name = "uuid" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", "serde", @@ -6223,7 +6310,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -6257,7 +6344,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6699,7 +6786,7 @@ checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -6710,7 +6797,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.58", ] [[package]] @@ -6746,7 +6833,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef224b009d070d3b1adb9e375fcf8ec2f1948a412c3bbf8755c0ef4e3f91ef94" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -6758,7 +6845,7 @@ name = "zone_cfg_derive" version = "0.3.0" source = "git+https://github.com/oxidecomputer/zone#5503b472dd87a3e6443624e1b42844882d6f769c" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 2a5639fea..962bb54cc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -78,8 +78,8 @@ oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch = oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } # Crucible -crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "4661c23b248da18862012cf55af21b17b79a468e" } -crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "4661c23b248da18862012cf55af21b17b79a468e" } +crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "5677c7be81b60d9ba9c30991d10376f279a1d3b7" } +crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "5677c7be81b60d9ba9c30991d10376f279a1d3b7" } # External dependencies anyhow = "1.0"