diff --git a/Cargo.lock b/Cargo.lock index ebe93c31a61..a02019ced6b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1608,7 +1608,7 @@ dependencies = [ [[package]] name = "client-common" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=ce015cde17a1ebc839ae482026d522cf0e369a3b#ce015cde17a1ebc839ae482026d522cf0e369a3b" +source = "git+https://github.com/oxidecomputer/maghemite?rev=b0c192ae209ff7c14c52c54b22f32b5eac48bcbf#b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" [[package]] name = "clipboard-win" @@ -2665,7 +2665,7 @@ dependencies = [ [[package]] name = "ddm-admin-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=ce015cde17a1ebc839ae482026d522cf0e369a3b#ce015cde17a1ebc839ae482026d522cf0e369a3b" +source = "git+https://github.com/oxidecomputer/maghemite?rev=b0c192ae209ff7c14c52c54b22f32b5eac48bcbf#b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" dependencies = [ "ddm-api-types-versions", "oxnet", @@ -2679,7 +2679,7 @@ dependencies = [ [[package]] name = "ddm-api-types-versions" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=ce015cde17a1ebc839ae482026d522cf0e369a3b#ce015cde17a1ebc839ae482026d522cf0e369a3b" +source = "git+https://github.com/oxidecomputer/maghemite?rev=b0c192ae209ff7c14c52c54b22f32b5eac48bcbf#b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" dependencies = [ "ddm-protocol", "oxnet", @@ -2692,7 +2692,7 @@ dependencies = [ [[package]] name = "ddm-protocol" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=ce015cde17a1ebc839ae482026d522cf0e369a3b#ce015cde17a1ebc839ae482026d522cf0e369a3b" +source = "git+https://github.com/oxidecomputer/maghemite?rev=b0c192ae209ff7c14c52c54b22f32b5eac48bcbf#b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" dependencies = [ "oxnet", "schemars 0.8.22", @@ -6909,7 +6909,7 @@ dependencies = [ [[package]] name = "mg-admin-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=ce015cde17a1ebc839ae482026d522cf0e369a3b#ce015cde17a1ebc839ae482026d522cf0e369a3b" +source = "git+https://github.com/oxidecomputer/maghemite?rev=b0c192ae209ff7c14c52c54b22f32b5eac48bcbf#b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" dependencies = [ "chrono", "client-common", @@ -6929,7 +6929,7 @@ dependencies = [ [[package]] name = "mg-api-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=ce015cde17a1ebc839ae482026d522cf0e369a3b#ce015cde17a1ebc839ae482026d522cf0e369a3b" +source = "git+https://github.com/oxidecomputer/maghemite?rev=b0c192ae209ff7c14c52c54b22f32b5eac48bcbf#b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" dependencies = [ "mg-api-types-versions", ] @@ -6937,7 +6937,7 @@ dependencies = [ [[package]] name = "mg-api-types-versions" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=ce015cde17a1ebc839ae482026d522cf0e369a3b#ce015cde17a1ebc839ae482026d522cf0e369a3b" +source = "git+https://github.com/oxidecomputer/maghemite?rev=b0c192ae209ff7c14c52c54b22f32b5eac48bcbf#b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" dependencies = [ "chrono", "nom 8.0.0", @@ -13536,9 +13536,9 @@ checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" [[package]] name = "serde" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" dependencies = [ "serde_core", "serde_derive", @@ -13586,22 +13586,22 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 3.0.3", ] [[package]] @@ -15267,6 +15267,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync-ptr" version = "0.1.4" diff --git a/Cargo.toml b/Cargo.toml index e6bf19b3047..b446a0f354f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -625,8 +625,8 @@ ntp-admin-api = { path = "ntp-admin/api" } ntp-admin-client = { path = "clients/ntp-admin-client" } ntp-admin-types = { path = "ntp-admin/types" } ntp-admin-types-versions = { path = "ntp-admin/types/versions" } -mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "ce015cde17a1ebc839ae482026d522cf0e369a3b" } -ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "ce015cde17a1ebc839ae482026d522cf0e369a3b" } +mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" } +ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" } multimap = "0.10.1" nexus-auth = { path = "nexus/auth" } nexus-background-task-interface = { path = "nexus/background-task-interface" } @@ -769,7 +769,7 @@ rats-corim = { git = "https://github.com/oxidecomputer/rats-corim.git", rev = "f raw-cpuid = { git = "https://github.com/oxidecomputer/rust-cpuid.git", rev = "a4cf01df76f35430ff5d39dc2fe470bcb953503b" } rayon = "1.10" rcgen = { version = "0.12.1", default-features = false, features = ["aws_lc_rs", "pem"] } -mg-api-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "ce015cde17a1ebc839ae482026d522cf0e369a3b" } +mg-api-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" } reconfigurator-cli = { path = "dev-tools/reconfigurator-cli" } reedline = "0.40.0" ref-cast = "1.0" diff --git a/package-manifest.toml b/package-manifest.toml index edb753576ce..eb86d01a43e 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -683,10 +683,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "ce015cde17a1ebc839ae482026d522cf0e369a3b" +source.commit = "b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm-gz.sha256.txt -source.sha256 = "279cb103525d4a554082fbea11f7b841fc1515f337cf895849b5e7c0950b925d" +source.sha256 = "9c678fd2d05f8e282da85e5ab84ff47f7e7aaf7b22d1509974ee3c37525b03f4" output.type = "tarball" [package.mg-ddm] @@ -699,10 +699,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "ce015cde17a1ebc839ae482026d522cf0e369a3b" +source.commit = "b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm.sha256.txt -source.sha256 = "742d0bec146634695f40133b41f9da8a2de2bc36a905de0927c7515a6672e1ce" +source.sha256 = "e213ea02e23e7a74b3f97427622d5069d960460835608460031440b2cbba4223" output.type = "zone" output.intermediate_only = true @@ -714,10 +714,10 @@ source.repo = "maghemite" # `tools/maghemite_openapi_version`. Failing to do so will cause a failure when # building `ddm-admin-client` (which will instruct you to update # `tools/maghemite_openapi_version`). -source.commit = "ce015cde17a1ebc839ae482026d522cf0e369a3b" +source.commit = "b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mgd.sha256.txt -source.sha256 = "a8ef9f24f794c9ac3c4e66b60e738d50aa1b22f86c7aa7baf7b07d300411ecde" +source.sha256 = "5e4a1885d851ddf0d0c3968193d023df4bb5ad04f7699daabb9ab732a9e4d857" output.type = "zone" output.intermediate_only = true diff --git a/tools/maghemite_ddm_openapi_version b/tools/maghemite_ddm_openapi_version index f0271268b96..81e35c9f058 100644 --- a/tools/maghemite_ddm_openapi_version +++ b/tools/maghemite_ddm_openapi_version @@ -1 +1 @@ -COMMIT="ce015cde17a1ebc839ae482026d522cf0e369a3b" +COMMIT="b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" diff --git a/tools/maghemite_mg_openapi_version b/tools/maghemite_mg_openapi_version index f0271268b96..81e35c9f058 100644 --- a/tools/maghemite_mg_openapi_version +++ b/tools/maghemite_mg_openapi_version @@ -1 +1 @@ -COMMIT="ce015cde17a1ebc839ae482026d522cf0e369a3b" +COMMIT="b0c192ae209ff7c14c52c54b22f32b5eac48bcbf" diff --git a/tools/maghemite_mgd_checksums b/tools/maghemite_mgd_checksums index c1c5300e1e7..e5b535eae95 100644 --- a/tools/maghemite_mgd_checksums +++ b/tools/maghemite_mgd_checksums @@ -1,4 +1,4 @@ -CIDL_SHA256="a8ef9f24f794c9ac3c4e66b60e738d50aa1b22f86c7aa7baf7b07d300411ecde" -MGD_LINUX_SHA256="87dd10c30ae6f8fe23e944dd1abb32bc0c92550015bb5dbd59dd573babc36b0f" -MG_DDM_SHA256="742d0bec146634695f40133b41f9da8a2de2bc36a905de0927c7515a6672e1ce" -DDMD_LINUX_SHA256="fd3cd3fee51bd9eaf7d422d8349df607f340b8ac1ece68ac837fa4ba50e386f1" \ No newline at end of file +CIDL_SHA256="5e4a1885d851ddf0d0c3968193d023df4bb5ad04f7699daabb9ab732a9e4d857" +MGD_LINUX_SHA256="93d03317a7d69a463620c1b0ce371c0705f82643ad10153976894af2e050d9c1" +MG_DDM_SHA256="e213ea02e23e7a74b3f97427622d5069d960460835608460031440b2cbba4223" +DDMD_LINUX_SHA256="38db1582b07cb42472c2757fa9221c4b6290dd45c63f1549812b1a96a8063d50" \ No newline at end of file diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 6b210613ff1..c90cc6ae02d 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -122,8 +122,8 @@ rustls = { version = "0.23.41" } schemars = { version = "0.8.22", features = ["bytes", "chrono", "semver", "url", "uuid1"] } scopeguard = { version = "1.2.0" } semver = { version = "1.0.28", features = ["serde"] } -serde = { version = "1.0.228", features = ["alloc", "derive", "rc"] } -serde_core = { version = "1.0.228", features = ["alloc", "rc"] } +serde = { version = "1.0.229", features = ["alloc", "derive", "rc"] } +serde_core = { version = "1.0.229", features = ["alloc", "rc"] } serde_json = { version = "1.0.151", features = ["alloc", "raw_value", "unbounded_depth"] } serde_with = { version = "3.21.0", features = ["hex", "schemars_0_8"] } sha2 = { version = "0.10.9", features = ["oid"] } @@ -272,8 +272,8 @@ rustls = { version = "0.23.41" } schemars = { version = "0.8.22", features = ["bytes", "chrono", "semver", "url", "uuid1"] } scopeguard = { version = "1.2.0" } semver = { version = "1.0.28", features = ["serde"] } -serde = { version = "1.0.228", features = ["alloc", "derive", "rc"] } -serde_core = { version = "1.0.228", features = ["alloc", "rc"] } +serde = { version = "1.0.229", features = ["alloc", "derive", "rc"] } +serde_core = { version = "1.0.229", features = ["alloc", "rc"] } serde_json = { version = "1.0.151", features = ["alloc", "raw_value", "unbounded_depth"] } serde_with = { version = "3.21.0", features = ["hex", "schemars_0_8"] } serde_with_macros = { version = "3.21.0", default-features = false, features = ["schemars_0_8"] }