From 5aa1ae648d479a264462d69b3b26eca3a501fa73 Mon Sep 17 00:00:00 2001 From: iximeow Date: Sat, 3 May 2025 00:54:44 +0000 Subject: [PATCH] update Progenitor to 0.10.0 (Crucible and Propolis come with) both Crucible and Propolis are trivial bumps - the only changes in each are a similar bump of Progenitor. --- Cargo.lock | 537 ++++++++++++++++++++++-------------- Cargo.toml | 20 +- openapi/nexus-internal.json | 2 +- openapi/wicketd.json | 14 +- package-manifest.toml | 16 +- workspace-hack/Cargo.toml | 24 +- 6 files changed, 363 insertions(+), 250 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8f0c10bdb5c..616acb17c6d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -166,7 +166,7 @@ dependencies = [ "omicron-workspace-hack", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -408,7 +408,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -476,7 +476,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -493,7 +493,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -561,7 +561,7 @@ dependencies = [ "quote", "serde", "serde_tokenstream", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -691,7 +691,7 @@ dependencies = [ [[package]] name = "bhyve_api" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=060a204d91e401a368c700a09d24510b7cd2b0e4#060a204d91e401a368c700a09d24510b7cd2b0e4" +source = "git+https://github.com/oxidecomputer/propolis?rev=71dd30f454f35c1d33cd8ea0198116f680ac1689#71dd30f454f35c1d33cd8ea0198116f680ac1689" dependencies = [ "bhyve_api_sys", "libc", @@ -701,7 +701,7 @@ dependencies = [ [[package]] name = "bhyve_api_sys" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=060a204d91e401a368c700a09d24510b7cd2b0e4#060a204d91e401a368c700a09d24510b7cd2b0e4" +source = "git+https://github.com/oxidecomputer/propolis?rev=71dd30f454f35c1d33cd8ea0198116f680ac1689#71dd30f454f35c1d33cd8ea0198116f680ac1689" dependencies = [ "libc", "strum", @@ -726,7 +726,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.98", + "syn 2.0.101", "which", ] @@ -747,7 +747,7 @@ dependencies = [ "regex", "rustc-hash 2.1.1", "shlex", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -794,7 +794,7 @@ checksum = "adc0846593a56638b74e136a45610f9934c052e14761bebca6b092d5522599e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -958,7 +958,7 @@ dependencies = [ "omicron-uuid-kinds", "omicron-workspace-hack", "oxnet", - "progenitor 0.9.1", + "progenitor 0.10.0", "regress", "reqwest", "schemars", @@ -1095,7 +1095,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "thiserror 1.0.69", @@ -1109,7 +1109,7 @@ checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" dependencies = [ "camino", "cargo-platform", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "thiserror 2.0.12", @@ -1379,7 +1379,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -1435,7 +1435,7 @@ dependencies = [ "clickhouse-admin-types", "omicron-uuid-kinds", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "reqwest", "schemars", "serde", @@ -1450,7 +1450,7 @@ dependencies = [ "clickhouse-admin-types", "omicron-uuid-kinds", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "reqwest", "schemars", "serde", @@ -1465,7 +1465,7 @@ dependencies = [ "clickhouse-admin-types", "omicron-uuid-kinds", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "reqwest", "schemars", "serde", @@ -1581,7 +1581,7 @@ dependencies = [ "chrono", "omicron-uuid-kinds", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "reqwest", "schemars", "serde", @@ -1952,13 +1952,13 @@ dependencies = [ [[package]] name = "crucible-agent-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=45801597f410685015ac2704d044919a41e3ff75#45801597f410685015ac2704d044919a41e3ff75" +source = "git+https://github.com/oxidecomputer/crucible?rev=e164393a88e7b62598897dc4f53315f083e25333#e164393a88e7b62598897dc4f53315f083e25333" dependencies = [ "anyhow", "chrono", "crucible-workspace-hack", "percent-encoding", - "progenitor 0.9.1", + "progenitor 0.10.0", "reqwest", "schemars", "serde", @@ -1968,7 +1968,7 @@ dependencies = [ [[package]] name = "crucible-client-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=45801597f410685015ac2704d044919a41e3ff75#45801597f410685015ac2704d044919a41e3ff75" +source = "git+https://github.com/oxidecomputer/crucible?rev=e164393a88e7b62598897dc4f53315f083e25333#e164393a88e7b62598897dc4f53315f083e25333" dependencies = [ "base64 0.22.1", "crucible-workspace-hack", @@ -1981,7 +1981,7 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=45801597f410685015ac2704d044919a41e3ff75#45801597f410685015ac2704d044919a41e3ff75" +source = "git+https://github.com/oxidecomputer/crucible?rev=e164393a88e7b62598897dc4f53315f083e25333#e164393a88e7b62598897dc4f53315f083e25333" dependencies = [ "anyhow", "atty", @@ -2010,13 +2010,13 @@ dependencies = [ [[package]] name = "crucible-pantry-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=45801597f410685015ac2704d044919a41e3ff75#45801597f410685015ac2704d044919a41e3ff75" +source = "git+https://github.com/oxidecomputer/crucible?rev=e164393a88e7b62598897dc4f53315f083e25333#e164393a88e7b62598897dc4f53315f083e25333" dependencies = [ "anyhow", "chrono", "crucible-workspace-hack", "percent-encoding", - "progenitor 0.9.1", + "progenitor 0.10.0", "reqwest", "schemars", "serde", @@ -2027,7 +2027,7 @@ dependencies = [ [[package]] name = "crucible-smf" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=45801597f410685015ac2704d044919a41e3ff75#45801597f410685015ac2704d044919a41e3ff75" +source = "git+https://github.com/oxidecomputer/crucible?rev=e164393a88e7b62598897dc4f53315f083e25333#e164393a88e7b62598897dc4f53315f083e25333" dependencies = [ "crucible-workspace-hack", "libc", @@ -2136,7 +2136,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2160,7 +2160,7 @@ checksum = "1c3ea205baff86c8c0fc59f725aa55acfe159aaad7b1a99d84bcd203e4103245" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2184,7 +2184,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2195,7 +2195,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2238,7 +2238,7 @@ dependencies = [ "quote", "serde", "serde_tokenstream", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2282,7 +2282,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2315,7 +2315,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2336,7 +2336,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2347,7 +2347,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2368,7 +2368,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2378,7 +2378,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2391,7 +2391,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2488,7 +2488,7 @@ dependencies = [ "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2497,7 +2497,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2559,7 +2559,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2626,7 +2626,7 @@ dependencies = [ "omicron-workspace-hack", "openapi-manager-types", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", ] @@ -2639,7 +2639,7 @@ dependencies = [ "http", "internal-dns-types", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "reqwest", "schemars", "serde", @@ -2720,7 +2720,7 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "indexmap 2.7.1", + "indexmap 2.9.0", "multer", "openapiv3", "paste", @@ -2729,7 +2729,7 @@ dependencies = [ "rustls-pemfile 2.2.0", "schemars", "scopeguard", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "serde_path_to_error", @@ -2759,10 +2759,10 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_tokenstream", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2776,7 +2776,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -2964,7 +2964,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3012,7 +3012,7 @@ dependencies = [ "omicron-workspace-hack", "openapi-manager-types", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "thiserror 1.0.69", @@ -3029,7 +3029,7 @@ dependencies = [ "http", "omicron-uuid-kinds", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "reqwest", "schemars", "serde", @@ -3261,7 +3261,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3395,7 +3395,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -3490,7 +3490,7 @@ dependencies = [ "daft", "gateway-messages", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "rand 0.8.5", "reqwest", "schemars", @@ -3739,13 +3739,13 @@ dependencies = [ "debug-ignore", "fixedbitset 0.5.7", "guppy-workspace-hack", - "indexmap 2.7.1", + "indexmap 2.9.0", "itertools 0.14.0", "nested", "once_cell", "pathdiff", "petgraph 0.7.1", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "smallvec 1.14.0", @@ -3771,7 +3771,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.7.1", + "indexmap 2.9.0", "slab", "tokio", "tokio-util", @@ -4077,9 +4077,9 @@ dependencies = [ [[package]] name = "http" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", "fnv", @@ -4487,7 +4487,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -4622,9 +4622,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", "hashbrown 0.15.1", @@ -4680,7 +4680,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -4710,7 +4710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c" dependencies = [ "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -4788,7 +4788,7 @@ dependencies = [ "installinator-common", "omicron-common", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "regress", "reqwest", "schemars", @@ -4862,10 +4862,10 @@ dependencies = [ "omicron-test-utils", "omicron-uuid-kinds", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "qorb", "reqwest", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "sled", @@ -5047,7 +5047,7 @@ checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -5115,7 +5115,7 @@ version = "0.1.0" source = "git+https://github.com/oxidecomputer/opte?rev=88adb1a5df689b3e2daddab9325ee94047f6ffad#88adb1a5df689b3e2daddab9325ee94047f6ffad" dependencies = [ "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -5428,7 +5428,7 @@ version = "0.1.0" dependencies = [ "omicron-workspace-hack", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -5467,9 +5467,9 @@ checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" dependencies = [ "value-bag", ] @@ -5860,7 +5860,7 @@ dependencies = [ "omicron-uuid-kinds", "omicron-workspace-hack", "oxnet", - "progenitor 0.9.1", + "progenitor 0.10.0", "regress", "reqwest", "schemars", @@ -5980,7 +5980,7 @@ dependencies = [ "ref-cast", "regex", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "sled-agent-client", @@ -6059,7 +6059,7 @@ dependencies = [ "regex", "rustls 0.22.4", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "serde_with", @@ -6174,7 +6174,7 @@ dependencies = [ "omicron-workspace-hack", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -6362,7 +6362,7 @@ dependencies = [ "gateway-client", "id-map", "illumos-utils", - "indexmap 2.7.1", + "indexmap 2.9.0", "internal-dns-resolver", "ipnet", "itertools 0.14.0", @@ -6439,7 +6439,7 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", - "indexmap 2.7.1", + "indexmap 2.9.0", "nexus-inventory", "nexus-reconfigurator-planning", "nexus-types", @@ -6577,7 +6577,7 @@ version = "0.1.0" dependencies = [ "omicron-workspace-hack", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -6618,7 +6618,7 @@ dependencies = [ "proptest", "regex", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "serde_with", @@ -6787,7 +6787,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -7042,14 +7042,14 @@ dependencies = [ "omicron-workspace-hack", "oxnet", "parse-display", - "progenitor-client 0.9.1", + "progenitor-client 0.10.0", "proptest", "protocol", "rand 0.8.5", "regress", "reqwest", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_human_bytes", "serde_json", @@ -7075,7 +7075,7 @@ dependencies = [ "omicron-common", "omicron-workspace-hack", "oxnet", - "progenitor-client 0.9.1", + "progenitor-client 0.10.0", "reqwest", "serde", "sled-hardware-types", @@ -7335,8 +7335,8 @@ dependencies = [ "petgraph 0.7.1", "pq-sys", "pretty_assertions", - "progenitor-client 0.9.1", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=060a204d91e401a368c700a09d24510b7cd2b0e4)", + "progenitor-client 0.10.0", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=71dd30f454f35c1d33cd8ea0198116f680ac1689)", "qorb", "rand 0.8.5", "range-requests", @@ -7349,7 +7349,7 @@ dependencies = [ "rustls-pemfile 2.2.0", "samael", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "serde_urlencoded", @@ -7480,7 +7480,7 @@ dependencies = [ "rayon", "reqwest", "ring", - "semver 1.0.25", + "semver 1.0.26", "serde", "shell-words", "sled-hardware", @@ -7574,7 +7574,7 @@ dependencies = [ "omicron-workspace-hack", "omicron-zone-package", "reqwest", - "semver 1.0.25", + "semver 1.0.26", "serde", "sha2", "shell-words", @@ -7698,7 +7698,7 @@ dependencies = [ "oximeter-producer", "oxnet", "pretty_assertions", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=060a204d91e401a368c700a09d24510b7cd2b0e4)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=71dd30f454f35c1d33cd8ea0198116f680ac1689)", "propolis-mock-server", "propolis_api_types", "rand 0.8.5", @@ -7860,7 +7860,7 @@ dependencies = [ "hyper-rustls 0.27.3", "hyper-util", "idna", - "indexmap 2.7.1", + "indexmap 2.9.0", "indicatif", "inout", "ipnetwork", @@ -7905,7 +7905,7 @@ dependencies = [ "rustls-webpki 0.102.8", "schemars", "scopeguard", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "sha1", @@ -7918,7 +7918,7 @@ dependencies = [ "strum", "subtle", "syn 1.0.109", - "syn 2.0.98", + "syn 2.0.101", "time", "time-macros", "tokio", @@ -7962,7 +7962,7 @@ dependencies = [ "futures-util", "hex", "reqwest", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_derive", "serde_json", @@ -8000,7 +8000,7 @@ version = "0.4.0" source = "git+https://github.com/oxidecomputer/openapi-lint?branch=main#ef442ee4343e97b6d9c217d3e7533962fe7d7236" dependencies = [ "heck 0.4.1", - "indexmap 2.7.1", + "indexmap 2.9.0", "lazy_static", "openapiv3", "regex", @@ -8038,7 +8038,7 @@ dependencies = [ "owo-colors", "oximeter-api", "repo-depot-api", - "semver 1.0.25", + "semver 1.0.26", "serde_json", "sha2", "similar", @@ -8058,7 +8058,7 @@ dependencies = [ "camino", "omicron-workspace-hack", "paste", - "semver 1.0.25", + "semver 1.0.26", ] [[package]] @@ -8067,7 +8067,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc02deea53ffe807708244e5914f6b099ad7015a207ee24317c22112e17d9c5c" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.9.0", "serde", "serde_json", ] @@ -8095,7 +8095,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -8205,8 +8205,8 @@ dependencies = [ "http", "hyper", "omicron-workspace-hack", - "progenitor 0.9.1", - "progenitor-client 0.9.1", + "progenitor 0.10.0", + "progenitor-client 0.10.0", "rand 0.8.5", "regress", "reqwest", @@ -8246,7 +8246,7 @@ dependencies = [ "oximeter-timeseries-macro 0.1.0", "oximeter-types 0.1.0", "prettyplease", - "syn 2.0.98", + "syn 2.0.101", "toml 0.8.20", "uuid", ] @@ -8265,7 +8265,7 @@ dependencies = [ "oximeter-timeseries-macro 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "oximeter-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "prettyplease", - "syn 2.0.98", + "syn 2.0.101", "toml 0.8.20", "uuid", ] @@ -8291,7 +8291,7 @@ dependencies = [ "futures", "omicron-common", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "reqwest", "serde", "slog", @@ -8328,7 +8328,7 @@ dependencies = [ "rand 0.8.5", "reqwest", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "slog", @@ -8371,7 +8371,7 @@ dependencies = [ "gethostname", "highway", "iana-time-zone", - "indexmap 2.7.1", + "indexmap 2.9.0", "itertools 0.14.0", "libc", "nom", @@ -8443,7 +8443,7 @@ dependencies = [ "omicron-workspace-hack", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -8454,7 +8454,7 @@ dependencies = [ "omicron-workspace-hack", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -8499,7 +8499,7 @@ dependencies = [ "schemars", "serde", "slog-error-chain", - "syn 2.0.98", + "syn 2.0.101", "toml 0.8.20", ] @@ -8520,7 +8520,7 @@ dependencies = [ "schemars", "serde", "slog-error-chain", - "syn 2.0.98", + "syn 2.0.101", "toml 0.8.20", ] @@ -8549,7 +8549,7 @@ dependencies = [ "oximeter-types 0.1.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -8562,7 +8562,7 @@ dependencies = [ "oximeter-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -8810,7 +8810,7 @@ dependencies = [ "regex", "regex-syntax 0.8.5", "structmeta", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -8997,7 +8997,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -9018,7 +9018,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset 0.4.2", - "indexmap 2.7.1", + "indexmap 2.9.0", "serde", "serde_derive", ] @@ -9030,7 +9030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" dependencies = [ "fixedbitset 0.5.7", - "indexmap 2.7.1", + "indexmap 2.9.0", ] [[package]] @@ -9101,7 +9101,7 @@ checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -9412,7 +9412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1ccf34da56fc294e7d4ccf69a85992b7dfb826b7cf57bac6a70bba3494cc08a" dependencies = [ "proc-macro2", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -9486,14 +9486,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -9520,6 +9520,17 @@ dependencies = [ "progenitor-macro 0.9.1", ] +[[package]] +name = "progenitor" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced2eadb9776a201d0585b4b072fd44d7d2104e0f3452d967b5a78966f4855cf" +dependencies = [ + "progenitor-client 0.10.0", + "progenitor-impl 0.10.0", + "progenitor-macro 0.10.0", +] + [[package]] name = "progenitor-client" version = "0.8.0" @@ -9550,6 +9561,21 @@ dependencies = [ "serde_urlencoded", ] +[[package]] +name = "progenitor-client" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "296003fd74e64c77aeb2c10eae850eb543211a8557dd3b3de6f4230b5071e44b" +dependencies = [ + "bytes", + "futures-core", + "percent-encoding", + "reqwest", + "serde", + "serde_json", + "serde_urlencoded", +] + [[package]] name = "progenitor-impl" version = "0.8.0" @@ -9558,7 +9584,7 @@ checksum = "d85934a440963a69f9f04f48507ff6e7aa2952a5b2d8f96cc37fa3dd5c270f66" dependencies = [ "heck 0.5.0", "http", - "indexmap 2.7.1", + "indexmap 2.9.0", "openapiv3", "proc-macro2", "quote", @@ -9566,7 +9592,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.98", + "syn 2.0.101", "thiserror 1.0.69", "typify 0.2.0", "unicode-ident", @@ -9580,7 +9606,7 @@ checksum = "37adc80a94c9cae890e82deeeecc9d8f2a5cb153256caaf1bf0f03611e537214" dependencies = [ "heck 0.5.0", "http", - "indexmap 2.7.1", + "indexmap 2.9.0", "openapiv3", "proc-macro2", "quote", @@ -9588,12 +9614,34 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.98", + "syn 2.0.101", "thiserror 2.0.12", "typify 0.3.0", "unicode-ident", ] +[[package]] +name = "progenitor-impl" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b17e5363daa50bf1cccfade6b0fb970d2278758fd5cfa9ab69f25028e4b1afa3" +dependencies = [ + "heck 0.5.0", + "http", + "indexmap 2.9.0", + "openapiv3", + "proc-macro2", + "quote", + "regex", + "schemars", + "serde", + "serde_json", + "syn 2.0.101", + "thiserror 2.0.12", + "typify 0.4.1", + "unicode-ident", +] + [[package]] name = "progenitor-macro" version = "0.8.0" @@ -9609,7 +9657,7 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -9627,20 +9675,38 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn 2.0.98", + "syn 2.0.101", +] + +[[package]] +name = "progenitor-macro" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4972aec926d1e06d6abc11ab3f063d2f7063be3dd46fd2839442c14d8e48f3ed" +dependencies = [ + "openapiv3", + "proc-macro2", + "progenitor-impl 0.10.0", + "quote", + "schemars", + "serde", + "serde_json", + "serde_tokenstream", + "serde_yaml", + "syn 2.0.101", ] [[package]] name = "propolis-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=060a204d91e401a368c700a09d24510b7cd2b0e4#060a204d91e401a368c700a09d24510b7cd2b0e4" +source = "git+https://github.com/oxidecomputer/propolis?rev=71dd30f454f35c1d33cd8ea0198116f680ac1689#71dd30f454f35c1d33cd8ea0198116f680ac1689" dependencies = [ "async-trait", "base64 0.21.7", "crucible-client-types", "futures", - "progenitor 0.9.1", - "progenitor-client 0.9.1", + "progenitor 0.10.0", + "progenitor-client 0.10.0", "propolis_api_types", "rand 0.8.5", "reqwest", @@ -9678,7 +9744,7 @@ dependencies = [ [[package]] name = "propolis-mock-server" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=060a204d91e401a368c700a09d24510b7cd2b0e4#060a204d91e401a368c700a09d24510b7cd2b0e4" +source = "git+https://github.com/oxidecomputer/propolis?rev=71dd30f454f35c1d33cd8ea0198116f680ac1689#71dd30f454f35c1d33cd8ea0198116f680ac1689" dependencies = [ "anyhow", "atty", @@ -9687,13 +9753,13 @@ dependencies = [ "dropshot", "futures", "hyper", - "progenitor 0.9.1", + "progenitor 0.10.0", "propolis_api_types", "propolis_types", "rand 0.8.5", "reqwest", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "slog", @@ -9722,7 +9788,7 @@ dependencies = [ [[package]] name = "propolis_api_types" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=060a204d91e401a368c700a09d24510b7cd2b0e4#060a204d91e401a368c700a09d24510b7cd2b0e4" +source = "git+https://github.com/oxidecomputer/propolis?rev=71dd30f454f35c1d33cd8ea0198116f680ac1689#71dd30f454f35c1d33cd8ea0198116f680ac1689" dependencies = [ "crucible-client-types", "propolis_types", @@ -9735,7 +9801,7 @@ dependencies = [ [[package]] name = "propolis_types" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=060a204d91e401a368c700a09d24510b7cd2b0e4#060a204d91e401a368c700a09d24510b7cd2b0e4" +source = "git+https://github.com/oxidecomputer/propolis?rev=71dd30f454f35c1d33cd8ea0198116f680ac1689#71dd30f454f35c1d33cd8ea0198116f680ac1689" dependencies = [ "schemars", "serde", @@ -9875,9 +9941,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -10099,7 +10165,7 @@ dependencies = [ "omicron-uuid-kinds", "omicron-workspace-hack", "pq-sys", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "slog", @@ -10203,7 +10269,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -10273,7 +10339,7 @@ name = "repo-depot-client" version = "0.1.0" dependencies = [ "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "reqwest", "schemars", "serde", @@ -10449,7 +10515,7 @@ dependencies = [ "regex", "relative-path", "rustc_version 0.4.1", - "syn 2.0.98", + "syn 2.0.101", "unicode-ident", ] @@ -10611,7 +10677,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.25", + "semver 1.0.26", ] [[package]] @@ -10889,7 +10955,7 @@ dependencies = [ "chrono", "dyn-clone", "schemars_derive", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "url", @@ -10905,7 +10971,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -10931,7 +10997,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -11018,9 +11084,9 @@ checksum = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac" [[package]] name = "semver" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" dependencies = [ "serde", ] @@ -11062,7 +11128,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -11073,7 +11139,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -11134,7 +11200,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -11155,7 +11221,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -11180,7 +11246,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.7.1", + "indexmap 2.9.0", "serde", "serde_derive", "serde_json", @@ -11197,7 +11263,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -11206,7 +11272,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.9.0", "itoa", "ryu", "serde", @@ -11407,8 +11473,8 @@ dependencies = [ "omicron-uuid-kinds", "omicron-workspace-hack", "oxnet", - "progenitor 0.9.1", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=060a204d91e401a368c700a09d24510b7cd2b0e4)", + "progenitor 0.10.0", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=71dd30f454f35c1d33cd8ea0198116f680ac1689)", "regress", "reqwest", "schemars", @@ -11469,7 +11535,7 @@ dependencies = [ "omicron-uuid-kinds", "omicron-workspace-hack", "oxnet", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=060a204d91e401a368c700a09d24510b7cd2b0e4)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=71dd30f454f35c1d33cd8ea0198116f680ac1689)", "rcgen", "schemars", "serde", @@ -11663,7 +11729,7 @@ source = "git+https://github.com/oxidecomputer/slog-error-chain?branch=main#15f6 dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -11801,7 +11867,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -11916,7 +11982,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12058,7 +12124,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta-derive", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12069,7 +12135,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12104,7 +12170,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12117,7 +12183,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12164,9 +12230,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.98" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -12196,7 +12262,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12264,7 +12330,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12405,7 +12471,7 @@ dependencies = [ "proc-macro2", "quote", "structmeta", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12446,7 +12512,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12457,7 +12523,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12595,7 +12661,7 @@ checksum = "8d9ef545650e79f30233c0003bcc2504d7efac6dad25fca40744de773fe2049c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12665,7 +12731,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -12825,7 +12891,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.9.0", "serde", "serde_spanned", "toml_datetime", @@ -12838,7 +12904,7 @@ version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ - "indexmap 2.7.1", + "indexmap 2.9.0", "serde", "serde_spanned", "toml_datetime", @@ -12933,7 +12999,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -13107,7 +13173,7 @@ dependencies = [ "clap", "console", "humantime", - "semver 1.0.25", + "semver 1.0.26", "slog", "slog-async", "slog-envlogger", @@ -13126,7 +13192,7 @@ dependencies = [ "hex", "proptest", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_human_bytes", "strum", @@ -13139,7 +13205,7 @@ name = "tufaceous-brand-metadata" version = "0.1.0" source = "git+https://github.com/oxidecomputer/tufaceous?branch=main#04681f26ba09e144e5467dd6bd22c4887692a670" dependencies = [ - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "tar", @@ -13171,7 +13237,7 @@ dependencies = [ "itertools 0.13.0", "parse-size", "rand 0.8.5", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "serde_path_to_error", @@ -13288,6 +13354,16 @@ dependencies = [ "typify-macro 0.3.0", ] +[[package]] +name = "typify" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc5bec3cdff70fd542e579aa2e52967833e543a25fae0d14579043d2e868a50" +dependencies = [ + "typify-impl 0.4.1", + "typify-macro 0.4.1", +] + [[package]] name = "typify-impl" version = "0.2.0" @@ -13300,10 +13376,10 @@ dependencies = [ "quote", "regress", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", - "syn 2.0.98", + "syn 2.0.101", "thiserror 1.0.69", "unicode-ident", ] @@ -13320,10 +13396,30 @@ dependencies = [ "quote", "regress", "schemars", - "semver 1.0.25", + "semver 1.0.26", + "serde", + "serde_json", + "syn 2.0.101", + "thiserror 2.0.12", + "unicode-ident", +] + +[[package]] +name = "typify-impl" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b52a67305054e1da6f3d99ad94875dcd0c7c49adbd17b4b64f0eefb7ae5bf8ab" +dependencies = [ + "heck 0.5.0", + "log", + "proc-macro2", + "quote", + "regress", + "schemars", + "semver 1.0.26", "serde", "serde_json", - "syn 2.0.98", + "syn 2.0.101", "thiserror 2.0.12", "unicode-ident", ] @@ -13337,11 +13433,11 @@ dependencies = [ "proc-macro2", "quote", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "serde_tokenstream", - "syn 2.0.98", + "syn 2.0.101", "typify-impl 0.2.0", ] @@ -13354,14 +13450,31 @@ dependencies = [ "proc-macro2", "quote", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "serde_tokenstream", - "syn 2.0.98", + "syn 2.0.101", "typify-impl 0.3.0", ] +[[package]] +name = "typify-macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ff5799be156e4f635c348c6051d165e1c59997827155133351a8c4d333d9841" +dependencies = [ + "proc-macro2", + "quote", + "schemars", + "semver 1.0.26", + "serde", + "serde_json", + "serde_tokenstream", + "syn 2.0.101", + "typify-impl 0.4.1", +] + [[package]] name = "ucd-trie" version = "0.1.7" @@ -13391,9 +13504,9 @@ checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-linebreak" @@ -13507,7 +13620,7 @@ dependencies = [ "omicron-test-utils", "omicron-workspace-hack", "rand 0.8.5", - "semver 1.0.25", + "semver 1.0.26", "sha2", "slog", "tar", @@ -13538,7 +13651,7 @@ dependencies = [ "either", "futures", "indent_write", - "indexmap 2.7.1", + "indexmap 2.9.0", "indicatif", "indoc 2.0.6", "libsw", @@ -13598,7 +13711,7 @@ dependencies = [ "proc-macro2", "quote", "serde_tokenstream", - "syn 2.0.98", + "syn 2.0.101", "usdt-impl", ] @@ -13616,7 +13729,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.98", + "syn 2.0.101", "thiserror 1.0.69", "thread-id", "version_check", @@ -13632,7 +13745,7 @@ dependencies = [ "proc-macro2", "quote", "serde_tokenstream", - "syn 2.0.98", + "syn 2.0.101", "usdt-impl", ] @@ -13838,7 +13951,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", "wasm-bindgen-shared", ] @@ -13872,7 +13985,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -13966,7 +14079,7 @@ dependencies = [ "futures", "hex", "humantime", - "indexmap 2.7.1", + "indexmap 2.9.0", "indicatif", "itertools 0.14.0", "maplit", @@ -13978,7 +14091,7 @@ dependencies = [ "ratatui", "reqwest", "rpassword", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "shell-words", @@ -14106,7 +14219,7 @@ dependencies = [ "rand 0.8.5", "reqwest", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "sha2", @@ -14146,7 +14259,7 @@ dependencies = [ "omicron-uuid-kinds", "omicron-workspace-hack", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "sled-hardware-types", "slog", @@ -14163,11 +14276,11 @@ dependencies = [ "omicron-common", "omicron-uuid-kinds", "omicron-workspace-hack", - "progenitor 0.9.1", + "progenitor 0.10.0", "regress", "reqwest", "schemars", - "semver 1.0.25", + "semver 1.0.26", "serde", "serde_json", "sled-agent-types", @@ -14255,7 +14368,7 @@ checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -14266,7 +14379,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -14706,7 +14819,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", "synstructure", ] @@ -14747,7 +14860,7 @@ checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -14758,7 +14871,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -14769,7 +14882,7 @@ checksum = "593e7c96176495043fcb9e87cf7659f4d18679b5bab6b92bdef359c76a7795dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -14789,7 +14902,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", "synstructure", ] @@ -14810,7 +14923,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -14832,7 +14945,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.98", + "syn 2.0.101", ] [[package]] @@ -14859,7 +14972,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "flate2", - "indexmap 2.7.1", + "indexmap 2.9.0", "memchr", "zopfli", "zstd", diff --git a/Cargo.toml b/Cargo.toml index 34f639c3a29..9860b2b1ffc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -389,10 +389,10 @@ crossterm = { version = "0.28.1", features = ["event-stream"] } # NOTE: if you change the pinned revision of the `crucible` dependencies, you # must also update the references in package-manifest.toml to match the new # revision. -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "45801597f410685015ac2704d044919a41e3ff75" } -crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "45801597f410685015ac2704d044919a41e3ff75" } -crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "45801597f410685015ac2704d044919a41e3ff75" } -crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "45801597f410685015ac2704d044919a41e3ff75" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e164393a88e7b62598897dc4f53315f083e25333" } +crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e164393a88e7b62598897dc4f53315f083e25333" } +crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "e164393a88e7b62598897dc4f53315f083e25333" } +crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "e164393a88e7b62598897dc4f53315f083e25333" } # NOTE: See above! csv = "1.3.1" curve25519-dalek = "4" @@ -601,15 +601,15 @@ pretty_assertions = "1.4.1" pretty-hex = "0.4.1" prettyplease = { version = "0.2.30", features = ["verbatim"] } proc-macro2 = "1.0" -progenitor = "0.9.1" -progenitor-client = "0.9.1" +progenitor = "0.10.0" +progenitor-client = "0.10.0" # NOTE: if you change the pinned revision of the `bhyve_api` and propolis # dependencies, you must also update the references in package-manifest.toml to # match the new revision. -bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "060a204d91e401a368c700a09d24510b7cd2b0e4" } -propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "060a204d91e401a368c700a09d24510b7cd2b0e4" } -propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "060a204d91e401a368c700a09d24510b7cd2b0e4" } -propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "060a204d91e401a368c700a09d24510b7cd2b0e4" } +bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "71dd30f454f35c1d33cd8ea0198116f680ac1689" } +propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "71dd30f454f35c1d33cd8ea0198116f680ac1689" } +propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "71dd30f454f35c1d33cd8ea0198116f680ac1689" } +propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "71dd30f454f35c1d33cd8ea0198116f680ac1689" } # NOTE: see above! proptest = "1.6.0" qorb = "0.3.1" diff --git a/openapi/nexus-internal.json b/openapi/nexus-internal.json index a9c6d4fa074..61b3b737ecf 100644 --- a/openapi/nexus-internal.json +++ b/openapi/nexus-internal.json @@ -6535,7 +6535,7 @@ ] }, "SpType": { - "description": "SpType\n\n
JSON schema\n\n```json { \"type\": \"string\", \"enum\": [ \"sled\", \"power\", \"switch\" ] } ```
", + "description": "`SpType`\n\n
JSON schema\n\n```json { \"type\": \"string\", \"enum\": [ \"sled\", \"power\", \"switch\" ] } ```
", "type": "string", "enum": [ "sled", diff --git a/openapi/wicketd.json b/openapi/wicketd.json index 0e74d18b333..cba018bcd59 100644 --- a/openapi/wicketd.json +++ b/openapi/wicketd.json @@ -3582,7 +3582,7 @@ ] }, "RotImageError": { - "description": "RotImageError\n\n
JSON schema\n\n```json { \"type\": \"string\", \"enum\": [ \"unchecked\", \"first_page_erased\", \"partially_programmed\", \"invalid_length\", \"header_not_programmed\", \"bootloader_too_small\", \"bad_magic\", \"header_image_size\", \"unaligned_length\", \"unsupported_type\", \"reset_vector_not_thumb2\", \"reset_vector\", \"signature\" ] } ```
", + "description": "`RotImageError`\n\n
JSON schema\n\n```json { \"type\": \"string\", \"enum\": [ \"unchecked\", \"first_page_erased\", \"partially_programmed\", \"invalid_length\", \"header_not_programmed\", \"bootloader_too_small\", \"bad_magic\", \"header_image_size\", \"unaligned_length\", \"unsupported_type\", \"reset_vector_not_thumb2\", \"reset_vector\", \"signature\" ] } ```
", "type": "string", "enum": [ "unchecked", @@ -3645,7 +3645,7 @@ ] }, "RotSlot": { - "description": "RotSlot\n\n
JSON schema\n\n```json { \"oneOf\": [ { \"type\": \"object\", \"required\": [ \"slot\" ], \"properties\": { \"slot\": { \"type\": \"string\", \"enum\": [ \"a\" ] } } }, { \"type\": \"object\", \"required\": [ \"slot\" ], \"properties\": { \"slot\": { \"type\": \"string\", \"enum\": [ \"b\" ] } } } ] } ```
", + "description": "`RotSlot`\n\n
JSON schema\n\n```json { \"oneOf\": [ { \"type\": \"object\", \"required\": [ \"slot\" ], \"properties\": { \"slot\": { \"type\": \"string\", \"enum\": [ \"a\" ] } } }, { \"type\": \"object\", \"required\": [ \"slot\" ], \"properties\": { \"slot\": { \"type\": \"string\", \"enum\": [ \"b\" ] } } } ] } ```
", "oneOf": [ { "type": "object", @@ -3678,7 +3678,7 @@ ] }, "RotState": { - "description": "RotState\n\n
JSON schema\n\n```json { \"oneOf\": [ { \"type\": \"object\", \"required\": [ \"active\", \"persistent_boot_preference\", \"state\" ], \"properties\": { \"active\": { \"$ref\": \"#/components/schemas/RotSlot\" }, \"pending_persistent_boot_preference\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotSlot\" } ] } ] }, \"persistent_boot_preference\": { \"$ref\": \"#/components/schemas/RotSlot\" }, \"slot_a_sha3_256_digest\": { \"type\": [ \"string\", \"null\" ] }, \"slot_b_sha3_256_digest\": { \"type\": [ \"string\", \"null\" ] }, \"state\": { \"type\": \"string\", \"enum\": [ \"v2\" ] }, \"transient_boot_preference\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotSlot\" } ] } ] } } }, { \"type\": \"object\", \"required\": [ \"message\", \"state\" ], \"properties\": { \"message\": { \"type\": \"string\" }, \"state\": { \"type\": \"string\", \"enum\": [ \"communication_failed\" ] } } }, { \"type\": \"object\", \"required\": [ \"active\", \"persistent_boot_preference\", \"slot_a_fwid\", \"slot_b_fwid\", \"stage0_fwid\", \"stage0next_fwid\", \"state\" ], \"properties\": { \"active\": { \"$ref\": \"#/components/schemas/RotSlot\" }, \"pending_persistent_boot_preference\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotSlot\" } ] } ] }, \"persistent_boot_preference\": { \"$ref\": \"#/components/schemas/RotSlot\" }, \"slot_a_error\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotImageError\" } ] } ] }, \"slot_a_fwid\": { \"type\": \"string\" }, \"slot_b_error\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotImageError\" } ] } ] }, \"slot_b_fwid\": { \"type\": \"string\" }, \"stage0_error\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotImageError\" } ] } ] }, \"stage0_fwid\": { \"type\": \"string\" }, \"stage0next_error\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotImageError\" } ] } ] }, \"stage0next_fwid\": { \"type\": \"string\" }, \"state\": { \"type\": \"string\", \"enum\": [ \"v3\" ] }, \"transient_boot_preference\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotSlot\" } ] } ] } } } ] } ```
", + "description": "`RotState`\n\n
JSON schema\n\n```json { \"oneOf\": [ { \"type\": \"object\", \"required\": [ \"active\", \"persistent_boot_preference\", \"state\" ], \"properties\": { \"active\": { \"$ref\": \"#/components/schemas/RotSlot\" }, \"pending_persistent_boot_preference\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotSlot\" } ] } ] }, \"persistent_boot_preference\": { \"$ref\": \"#/components/schemas/RotSlot\" }, \"slot_a_sha3_256_digest\": { \"type\": [ \"string\", \"null\" ] }, \"slot_b_sha3_256_digest\": { \"type\": [ \"string\", \"null\" ] }, \"state\": { \"type\": \"string\", \"enum\": [ \"v2\" ] }, \"transient_boot_preference\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotSlot\" } ] } ] } } }, { \"type\": \"object\", \"required\": [ \"message\", \"state\" ], \"properties\": { \"message\": { \"type\": \"string\" }, \"state\": { \"type\": \"string\", \"enum\": [ \"communication_failed\" ] } } }, { \"type\": \"object\", \"required\": [ \"active\", \"persistent_boot_preference\", \"slot_a_fwid\", \"slot_b_fwid\", \"stage0_fwid\", \"stage0next_fwid\", \"state\" ], \"properties\": { \"active\": { \"$ref\": \"#/components/schemas/RotSlot\" }, \"pending_persistent_boot_preference\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotSlot\" } ] } ] }, \"persistent_boot_preference\": { \"$ref\": \"#/components/schemas/RotSlot\" }, \"slot_a_error\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotImageError\" } ] } ] }, \"slot_a_fwid\": { \"type\": \"string\" }, \"slot_b_error\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotImageError\" } ] } ] }, \"slot_b_fwid\": { \"type\": \"string\" }, \"stage0_error\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotImageError\" } ] } ] }, \"stage0_fwid\": { \"type\": \"string\" }, \"stage0next_error\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotImageError\" } ] } ] }, \"stage0next_fwid\": { \"type\": \"string\" }, \"state\": { \"type\": \"string\", \"enum\": [ \"v3\" ] }, \"transient_boot_preference\": { \"oneOf\": [ { \"type\": \"null\" }, { \"allOf\": [ { \"$ref\": \"#/components/schemas/RotSlot\" } ] } ] } } } ] } ```
", "oneOf": [ { "type": "object", @@ -4207,7 +4207,7 @@ ] }, "SpComponentCaboose": { - "description": "SpComponentCaboose\n\n
JSON schema\n\n```json { \"type\": \"object\", \"required\": [ \"board\", \"git_commit\", \"name\", \"version\" ], \"properties\": { \"board\": { \"type\": \"string\" }, \"epoch\": { \"type\": [ \"string\", \"null\" ] }, \"git_commit\": { \"type\": \"string\" }, \"name\": { \"type\": \"string\" }, \"sign\": { \"type\": [ \"string\", \"null\" ] }, \"version\": { \"type\": \"string\" } } } ```
", + "description": "`SpComponentCaboose`\n\n
JSON schema\n\n```json { \"type\": \"object\", \"required\": [ \"board\", \"git_commit\", \"name\", \"version\" ], \"properties\": { \"board\": { \"type\": \"string\" }, \"epoch\": { \"type\": [ \"string\", \"null\" ] }, \"git_commit\": { \"type\": \"string\" }, \"name\": { \"type\": \"string\" }, \"sign\": { \"type\": [ \"string\", \"null\" ] }, \"version\": { \"type\": \"string\" } } } ```
", "type": "object", "properties": { "board": { @@ -4330,7 +4330,7 @@ ] }, "SpIdentifier": { - "description": "SpIdentifier\n\n
JSON schema\n\n```json { \"type\": \"object\", \"required\": [ \"slot\", \"type\" ], \"properties\": { \"slot\": { \"type\": \"integer\", \"format\": \"uint32\", \"minimum\": 0.0 }, \"type\": { \"$ref\": \"#/components/schemas/SpType\" } } } ```
", + "description": "`SpIdentifier`\n\n
JSON schema\n\n```json { \"type\": \"object\", \"required\": [ \"slot\", \"type\" ], \"properties\": { \"slot\": { \"type\": \"integer\", \"format\": \"uint32\", \"minimum\": 0.0 }, \"type\": { \"$ref\": \"#/components/schemas/SpType\" } } } ```
", "type": "object", "properties": { "slot": { @@ -4539,7 +4539,7 @@ ] }, "SpState": { - "description": "SpState\n\n
JSON schema\n\n```json { \"type\": \"object\", \"required\": [ \"base_mac_address\", \"hubris_archive_id\", \"model\", \"power_state\", \"revision\", \"rot\", \"serial_number\" ], \"properties\": { \"base_mac_address\": { \"type\": \"array\", \"items\": { \"type\": \"integer\", \"format\": \"uint8\", \"minimum\": 0.0 }, \"maxItems\": 6, \"minItems\": 6 }, \"hubris_archive_id\": { \"type\": \"string\" }, \"model\": { \"type\": \"string\" }, \"power_state\": { \"$ref\": \"#/components/schemas/PowerState\" }, \"revision\": { \"type\": \"integer\", \"format\": \"uint32\", \"minimum\": 0.0 }, \"rot\": { \"$ref\": \"#/components/schemas/RotState\" }, \"serial_number\": { \"type\": \"string\" } } } ```
", + "description": "`SpState`\n\n
JSON schema\n\n```json { \"type\": \"object\", \"required\": [ \"base_mac_address\", \"hubris_archive_id\", \"model\", \"power_state\", \"revision\", \"rot\", \"serial_number\" ], \"properties\": { \"base_mac_address\": { \"type\": \"array\", \"items\": { \"type\": \"integer\", \"format\": \"uint8\", \"minimum\": 0.0 }, \"maxItems\": 6, \"minItems\": 6 }, \"hubris_archive_id\": { \"type\": \"string\" }, \"model\": { \"type\": \"string\" }, \"power_state\": { \"$ref\": \"#/components/schemas/PowerState\" }, \"revision\": { \"type\": \"integer\", \"format\": \"uint32\", \"minimum\": 0.0 }, \"rot\": { \"$ref\": \"#/components/schemas/RotState\" }, \"serial_number\": { \"type\": \"string\" } } } ```
", "type": "object", "properties": { "base_mac_address": { @@ -4584,7 +4584,7 @@ ] }, "SpType": { - "description": "SpType\n\n
JSON schema\n\n```json { \"type\": \"string\", \"enum\": [ \"sled\", \"power\", \"switch\" ] } ```
", + "description": "`SpType`\n\n
JSON schema\n\n```json { \"type\": \"string\", \"enum\": [ \"sled\", \"power\", \"switch\" ] } ```
", "type": "string", "enum": [ "sled", diff --git a/package-manifest.toml b/package-manifest.toml index 1f058a32b83..0b955f9dd3b 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -579,10 +579,10 @@ only_for_targets.image = "standard" # 3. Use source.type = "manual" instead of "prebuilt" source.type = "prebuilt" source.repo = "crucible" -source.commit = "45801597f410685015ac2704d044919a41e3ff75" +source.commit = "e164393a88e7b62598897dc4f53315f083e25333" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible.sha256.txt -source.sha256 = "bbb971dd03a7ca90e44ee039e9863c36f52e7fb40a9c67eb3ba0df1062371fec" +source.sha256 = "b24edb558348db08a0c012649fe1c3a4853ed4185b88cb3354905b6937acce20" output.type = "zone" output.intermediate_only = true @@ -591,10 +591,10 @@ service_name = "crucible_pantry_prebuilt" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "crucible" -source.commit = "45801597f410685015ac2704d044919a41e3ff75" +source.commit = "e164393a88e7b62598897dc4f53315f083e25333" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-pantry.sha256.txt -source.sha256 = "564980b6879aa9cc6bf175083ed62cc1fdab9c4b871b55c336ac30c660f14dd8" +source.sha256 = "f768ffe134a1e2362a68730750649cbd42b4977cbd81ae364c24c7f7fcb7ce86" output.type = "zone" output.intermediate_only = true @@ -608,10 +608,10 @@ service_name = "crucible_dtrace" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "crucible" -source.commit = "45801597f410685015ac2704d044919a41e3ff75" +source.commit = "e164393a88e7b62598897dc4f53315f083e25333" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-dtrace.sha256.txt -source.sha256 = "15349c177d50776fa16817d585582f7dcca8627d5306d72a7798db04b5de5839" +source.sha256 = "4d572964c46185595c6027e091e5215a5eb012d5e322f2c70cac0abf88893465" output.type = "tarball" # Refer to @@ -622,10 +622,10 @@ service_name = "propolis-server" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "propolis" -source.commit = "060a204d91e401a368c700a09d24510b7cd2b0e4" +source.commit = "71dd30f454f35c1d33cd8ea0198116f680ac1689" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image//propolis-server.sha256.txt -source.sha256 = "1a86f30bf2078d24326cbc7d999519f9669c123e072464468007fb72f8fe07d9" +source.sha256 = "e1fe40e66b92c84503613f83de2693c8446b3b05c8e5bad914299d2ab7d7fb00" output.type = "zone" [package.mg-ddm-gz] diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 8c4f4c52de9..0bc43bed267 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -66,14 +66,14 @@ hickory-proto = { version = "0.24.4", features = ["text-parsing"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } hyper = { version = "1.6.0", features = ["full"] } idna = { version = "1.0.3" } -indexmap = { version = "2.7.1", features = ["serde"] } +indexmap = { version = "2.9.0", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnetwork = { version = "0.21.1", features = ["schemars", "serde"] } itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" } lalrpop-util = { version = "0.19.12" } lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] } libc = { version = "0.2.171", features = ["extra_traits"] } -log = { version = "0.4.22", default-features = false, features = ["kv_unstable", "std"] } +log = { version = "0.4.27", default-features = false, features = ["kv_unstable", "std"] } managed = { version = "0.8.0", default-features = false, features = ["alloc", "map"] } memchr = { version = "2.7.4" } newtype-uuid = { version = "1.2.1" } @@ -94,8 +94,8 @@ phf_shared = { version = "0.11.2" } pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption", "pem", "std"] } postgres-types = { version = "0.2.9", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } predicates = { version = "3.1.3" } -proc-macro2 = { version = "1.0.94" } -quote = { version = "1.0.39" } +proc-macro2 = { version = "1.0.95" } +quote = { version = "1.0.40" } rand = { version = "0.8.5", features = ["small_rng"] } regex = { version = "1.11.1" } regex-automata = { version = "0.4.8", default-features = false, features = ["dfa-onepass", "dfa-search", "hybrid", "meta", "nfa", "perf", "unicode"] } @@ -106,7 +106,7 @@ rustls = { version = "0.23.19", features = ["ring"] } rustls-webpki = { version = "0.102.8", default-features = false, features = ["aws_lc_rs", "ring", "std"] } schemars = { version = "0.8.22", features = ["bytes", "chrono", "semver", "url", "uuid1"] } scopeguard = { version = "1.2.0" } -semver = { version = "1.0.25", features = ["serde"] } +semver = { version = "1.0.26", features = ["serde"] } serde = { version = "1.0.219", features = ["alloc", "derive", "rc"] } serde_json = { version = "1.0.140", features = ["raw_value", "unbounded_depth"] } sha1 = { version = "0.10.6", features = ["oid"] } @@ -118,7 +118,7 @@ spin = { version = "0.9.8" } string_cache = { version = "0.8.9" } strum = { version = "0.26.3", features = ["derive"] } subtle = { version = "2.6.1" } -syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.98", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } +syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.101", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] } tokio = { version = "1.43.1", features = ["full", "test-util"] } tokio-postgres = { version = "0.7.13", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } @@ -189,14 +189,14 @@ hickory-proto = { version = "0.24.4", features = ["text-parsing"] } hmac = { version = "0.12.1", default-features = false, features = ["reset"] } hyper = { version = "1.6.0", features = ["full"] } idna = { version = "1.0.3" } -indexmap = { version = "2.7.1", features = ["serde"] } +indexmap = { version = "2.9.0", features = ["serde"] } inout = { version = "0.1.3", default-features = false, features = ["std"] } ipnetwork = { version = "0.21.1", features = ["schemars", "serde"] } itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" } lalrpop-util = { version = "0.19.12" } lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] } libc = { version = "0.2.171", features = ["extra_traits"] } -log = { version = "0.4.22", default-features = false, features = ["kv_unstable", "std"] } +log = { version = "0.4.27", default-features = false, features = ["kv_unstable", "std"] } managed = { version = "0.8.0", default-features = false, features = ["alloc", "map"] } memchr = { version = "2.7.4" } newtype-uuid = { version = "1.2.1" } @@ -217,8 +217,8 @@ phf_shared = { version = "0.11.2" } pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption", "pem", "std"] } postgres-types = { version = "0.2.9", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] } predicates = { version = "3.1.3" } -proc-macro2 = { version = "1.0.94" } -quote = { version = "1.0.39" } +proc-macro2 = { version = "1.0.95" } +quote = { version = "1.0.40" } rand = { version = "0.8.5", features = ["small_rng"] } regex = { version = "1.11.1" } regex-automata = { version = "0.4.8", default-features = false, features = ["dfa-onepass", "dfa-search", "hybrid", "meta", "nfa", "perf", "unicode"] } @@ -229,7 +229,7 @@ rustls = { version = "0.23.19", features = ["ring"] } rustls-webpki = { version = "0.102.8", default-features = false, features = ["aws_lc_rs", "ring", "std"] } schemars = { version = "0.8.22", features = ["bytes", "chrono", "semver", "url", "uuid1"] } scopeguard = { version = "1.2.0" } -semver = { version = "1.0.25", features = ["serde"] } +semver = { version = "1.0.26", features = ["serde"] } serde = { version = "1.0.219", features = ["alloc", "derive", "rc"] } serde_json = { version = "1.0.140", features = ["raw_value", "unbounded_depth"] } sha1 = { version = "0.10.6", features = ["oid"] } @@ -242,7 +242,7 @@ string_cache = { version = "0.8.9" } strum = { version = "0.26.3", features = ["derive"] } subtle = { version = "2.6.1" } syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extra-traits", "fold", "full", "visit"] } -syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.98", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } +syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.101", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] } time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] } time-macros = { version = "0.2.18", default-features = false, features = ["formatting", "parsing"] } tokio = { version = "1.43.1", features = ["full", "test-util"] }