Update dendrite

Cargo.toml

@@ -670,11 +670,13 @@ tokio-util = { version = "0.7.12", features = ["io", "io-util"] }
 toml = "0.8.19"
 toml_edit = "0.22.22"
 tough = { version = "0.19.0", features = [ "http" ] }
+transceiver-decode = { git = "https://github.com/oxidecomputer/transceiver-control", features = [ "api-traits" ] }
 trybuild = "1.0.101"
 tufaceous = { path = "tufaceous" }
 tufaceous-lib = { path = "tufaceous-lib" }
 tui-tree-widget = "0.22.0"
 typed-rng = { path = "typed-rng" }
+typify = "0.3.0"
 unicode-width = "0.1.13"
 update-common = { path = "update-common" }
 update-engine = { path = "update-engine" }

clients/dpd-client/Cargo.toml

@@ -8,18 +8,19 @@ license = "MPL-2.0"
 workspace = true
 
 [dependencies]
+chrono.workspace = true
 futures.workspace = true
+http.workspace = true
+omicron-workspace-hack.workspace = true
 progenitor-client.workspace = true
+rand.workspace = true
+regress.workspace = true
 reqwest = { workspace = true, features = ["json", "stream", "rustls-tls"] }
+schemars.workspace = true
 serde.workspace = true
 slog.workspace = true
-regress.workspace = true
+transceiver-decode.workspace = true
 uuid.workspace = true
-chrono.workspace = true
-http.workspace = true
-schemars.workspace = true
-rand.workspace = true
-omicron-workspace-hack.workspace = true
 
 [build-dependencies]
 anyhow.workspace = true
@@ -29,3 +30,4 @@ quote.workspace = true
 rustfmt-wrapper.workspace = true
 serde_json.workspace = true
 toml.workspace = true
+typify.workspace = true

clients/dpd-client/build.rs

@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-// Copyright 2024 Oxide Computer Company
+// Copyright 2025 Oxide Computer Company
 //
 // TODO: remove
 // This code is only required at the moment because the source repo
@@ -20,6 +20,7 @@ use quote::quote;
 use std::env;
 use std::fs;
 use std::path::Path;
+use typify::TypeSpaceImpl;
 
 const DENDRITE_ASIC_PACKAGE: PackageName =
     PackageName::new_const("dendrite-asic");
@@ -92,7 +93,61 @@ fn main() -> Result<()> {
                     slog::debug!(state.log, "client response"; "result" => ?result);
                 }
             })
-	    .with_derive("PartialEq")
+            .with_derive("PartialEq")
+            // NOTE: This should all go away when we can open-source the real
+            // `dpd-client` from the repo itself. These are used to ensure that
+            // we pick up things like the display implementations.
+            .with_replacement(
+                "ActiveCableMediaInterfaceId",
+                "transceiver_decode::ActiveCableMediaInterfaceId",
+                std::iter::once(TypeSpaceImpl::Display)
+            )
+            .with_replacement(
+                "ApplicationDescriptor", "transceiver_decode::ApplicationDescriptor",
+                std::iter::once(TypeSpaceImpl::Display)
+            )
+            .with_replacement(
+                "BaseTMediaInterfaceId", "transceiver_decode::BaseTMediaInterfaceId",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "CmisDatapath", "transceiver_decode::CmisDatapath",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "CmisDatapathState", "transceiver_decode::CmisDatapathState",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "CmisLaneStatus", "transceiver_decode::CmisLaneStatus",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "ConnectorType", "transceiver_decode::ConnectorType",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "ExtendedSpecificationComplianceCode", "transceiver_decode::ExtendedSpecificationComplianceCode",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "HostElectricalInterfaceId", "transceiver_decode::HostElectricalInterfaceId",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "Identifier", "transceiver_decode::Identifier",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "MediaType", "transceiver_decode::MediaType",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "MmfMediaInterfaceId", "transceiver_decode::MmfMediaInterfaceId",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "PassiveCopperMediaInterfaceId", "transceiver_decode::PassiveCopperMediaInterfaceId",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "Sff8636Datapath", "transceiver_decode::Sff8636Datapath",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "SffComplianceCode", "transceiver_decode::SffComplianceCode",
+                std::iter::once(TypeSpaceImpl::Display))
+            .with_replacement(
+                "SmfMediaInterfaceId", "transceiver_decode::SmfMediaInterfaceId",
+                std::iter::once(TypeSpaceImpl::Display))
     )
     .generate_tokens(&spec)
     .with_context(|| {

package-manifest.toml

@@ -720,8 +720,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "11bcc3e0f5d28dc7aed150f4df1174844e4dfbef"
-source.sha256 = "98c0778ee7645bab82fc71188378ff1ad80bc24619c03a645dafca158dd63bfd"
+source.commit = "caf4bee7f1647b4f971199a5268885337ff1691a"
+source.sha256 = "0b6f1960e3475036c39b0df14015d968f96dfd198295f7e58ffdc8e2e8618afb"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -747,8 +747,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "11bcc3e0f5d28dc7aed150f4df1174844e4dfbef"
-source.sha256 = "e1f356866490e8cada9e53c25c4ef9965af0a29632868948edcacb13e248648d"
+source.commit = "caf4bee7f1647b4f971199a5268885337ff1691a"
+source.sha256 = "a966c3c609b35e136b4807530218fb8e7a0a72673e604c47adc9bb4582d5cadf"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -767,8 +767,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "11bcc3e0f5d28dc7aed150f4df1174844e4dfbef"
-source.sha256 = "6a4b51d71d132f8877c15c5a3882bad715a85d11d4a45c1aec9b5f4cb2ea8a6e"
+source.commit = "caf4bee7f1647b4f971199a5268885337ff1691a"
+source.sha256 = "06d63410222134ece052d15732c709e3a43853563b88398176ef04e66b004b12"
 output.type = "zone"
 output.intermediate_only = true
 

tools/dendrite_openapi_version

@@ -1,2 +1,2 @@
-COMMIT="11bcc3e0f5d28dc7aed150f4df1174844e4dfbef"
-SHA2="c381b2ac42fbd68b9230e111cb96beecf90abde10cdc15f02c88d61781c8adb8"
+COMMIT="caf4bee7f1647b4f971199a5268885337ff1691a"
+SHA2="b5addf1b3a00055312e995909f5a1918bbb26ef6b206b6006b6c1bea2146471d"

tools/dendrite_stub_checksums

@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="98c0778ee7645bab82fc71188378ff1ad80bc24619c03a645dafca158dd63bfd"
-CIDL_SHA256_LINUX_DPD="af090bd0e1c9638570d9208273991bf0ee9ea0488e2b589160294990aadbe1fb"
-CIDL_SHA256_LINUX_SWADM="e33015e4965bc22f79453a45078a66f969f0993f4d4691a529dfdf442a52e6e2"
+CIDL_SHA256_ILLUMOS="0b6f1960e3475036c39b0df14015d968f96dfd198295f7e58ffdc8e2e8618afb"
+CIDL_SHA256_LINUX_DPD="15f4c6844fff6c4051fb6c8455b0f5e28006c39b329babdb0a1e239dec822f05"
+CIDL_SHA256_LINUX_SWADM="971c2c36cd04f87e323310834d948d6415f92195c076db497c5f46ee1c6f26f2"