Update Dendrite and handle new transceiver API definitions (#7528)

Author: bnaecker

Cargo.lock

@@ -670,7 +670,7 @@ 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" ] }
+transceiver-controller = { git = "https://github.com/oxidecomputer/transceiver-control", features = [ "api-traits" ] }
 trybuild = "1.0.101"
 tufaceous = { path = "tufaceous" }
 tufaceous-lib = { path = "tufaceous-lib" }

Cargo.toml

@@ -19,7 +19,6 @@ reqwest = { workspace = true, features = ["json", "stream", "rustls-tls"] }
 schemars.workspace = true
 serde.workspace = true
 slog.workspace = true
-transceiver-decode.workspace = true
 uuid.workspace = true
 
 [build-dependencies]

clients/dpd-client/Cargo.toml

@@ -20,32 +20,10 @@ 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");
 
-// List of types we replace with the existing type of the same name from the
-// `transceiver_decode` crate.
-const REPLACEMENTS: &[&'static str] = &[
-    "ActiveCableMediaInterfaceId",
-    "ApplicationDescriptor",
-    "BaseTMediaInterfaceId",
-    "CmisDatapath",
-    "CmisDatapathState",
-    "CmisLaneStatus",
-    "ConnectorType",
-    "ExtendedSpecificationComplianceCode",
-    "HostElectricalInterfaceId",
-    "Identifier",
-    "MediaType",
-    "MmfMediaInterfaceId",
-    "PassiveCopperMediaInterfaceId",
-    "Sff8636Datapath",
-    "SffComplianceCode",
-    "SmfMediaInterfaceId",
-];
-
 fn main() -> Result<()> {
     // Find the current dendrite repo commit from our package manifest.
     let manifest = fs::read_to_string("../../package-manifest.toml")
@@ -115,13 +93,6 @@ fn main() -> Result<()> {
             }
         })
         .with_derive("PartialEq");
-    for repl in REPLACEMENTS {
-        settings.with_replacement(
-            repl,
-            format!("::transceiver_decode::{repl}"),
-            std::iter::once(TypeSpaceImpl::Display),
-        );
-    }
 
     let code = progenitor::Generator::new(&settings)
         .generate_tokens(&spec)

clients/dpd-client/build.rs

@@ -720,8 +720,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "b684e82b493a318889a2bd8c8f6e992a9c8342b3"
-source.sha256 = "5b1419e14739c2a3f9ab9a8e794bc54c482169b2bbd98e5cd329cd1513f50add"
+source.commit = "b37a8fdc335592e24d6afe71995637b2ad36eb7d"
+source.sha256 = "022cf1eddf9a8a4042db95ce03d24c3b703f6552bafde0bde3e10d2c138a1e3f"
 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 = "b684e82b493a318889a2bd8c8f6e992a9c8342b3"
-source.sha256 = "60fc0731bec87fad4eb6fbc511aebeda305ab882220f3dafd780098b6303e3a8"
+source.commit = "b37a8fdc335592e24d6afe71995637b2ad36eb7d"
+source.sha256 = "59bf5dcda77a01d4df0ec839ea48a18acf5e12fcd4bb400d1c23677811a5b352"
 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 = "b684e82b493a318889a2bd8c8f6e992a9c8342b3"
-source.sha256 = "bb8559fb3da7af1027dedc13e125deee4424052493ca76a3208ecb9d7583c2c3"
+source.commit = "b37a8fdc335592e24d6afe71995637b2ad36eb7d"
+source.sha256 = "2b502172b3877f07026a26054e3a34ac64ba053d6e5861375dcd87dac6ce6c27"
 output.type = "zone"
 output.intermediate_only = true
 

package-manifest.toml

@@ -1,2 +1,2 @@
-COMMIT="b684e82b493a318889a2bd8c8f6e992a9c8342b3"
-SHA2="b5addf1b3a00055312e995909f5a1918bbb26ef6b206b6006b6c1bea2146471d"
+COMMIT="b37a8fdc335592e24d6afe71995637b2ad36eb7d"
+SHA2="72b4489e522778ea91979bcba94d9392ab4d5318f19f49aca2388791bb709778"

tools/dendrite_openapi_version

@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="5b1419e14739c2a3f9ab9a8e794bc54c482169b2bbd98e5cd329cd1513f50add"
-CIDL_SHA256_LINUX_DPD="ed140476d262a875278fef8f93d74c0b6fb3d73a5ba02a6dfe8cb34da8347df1"
-CIDL_SHA256_LINUX_SWADM="2ed7e8fd4faa2ee5c7e24972979efcb87c2fba5ce678af22ddd3c34238226301"
+CIDL_SHA256_ILLUMOS="022cf1eddf9a8a4042db95ce03d24c3b703f6552bafde0bde3e10d2c138a1e3f"
+CIDL_SHA256_LINUX_DPD="bbc6eebae357df8075c359e04c88842c6d38eff3079984bbbf5b102504495804"
+CIDL_SHA256_LINUX_SWADM="d0a792165b6a70700071e36d3ea358f6098300aff8b7bfe2942e324d0dcc9443"