remove dependency from gateway-types/wicket-common to libipcc (#8839)

Fixes #8837.

Author: sunshowers

.cargo/xtask.toml

@@ -11,7 +11,6 @@
 [libraries."libdoor.so.1"]
 [libraries."libefi.so.1"]
 [libraries."libgcc_s.so.1"]
-[libraries."libipcc.so.1"]
 [libraries."libkstat.so.1"]
 [libraries."liblzma.so.5"]
 [libraries."libm.so.2"]
@@ -28,6 +27,17 @@
 [libraries."libxml2.so.2"]
 [libraries."libxmlsec1.so.1"]
 
+# libipcc should only be depended on by binaries that communicate with ipcc.
+[libraries."libipcc.so.1"]
+binary_allow_list = [
+  "installinator",
+  "mgs",
+  "mgs-dev",
+  "omicron-dev",
+  "sled-agent",
+  "sled-agent-sim",
+]
+
 # libnvme is a global zone only library and therefore we must be sure that only
 # programs running in the gz require it. Additionally only sled-agent should be
 # managing a sled's hardware.

Cargo.lock

@@ -14,7 +14,6 @@ gateway-messages.workspace = true
 # would only be used for From impls anyway. We put those impls in
 # omicron-gateway instead, and don't use `From`.
 hex.workspace = true
-ipcc.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true
 omicron-workspace-hack.workspace = true

gateway-types/Cargo.toml

@@ -85,12 +85,15 @@ impl From<gateway_messages::UpdatePreparationProgress>
     }
 }
 
-// This type is a duplicate of the type in `ipcc`, and we provide a
-// `From<_>` impl to convert to it. We keep these types distinct to allow us to
-// choose different representations for MGS's HTTP API (this type) and the wire
-// format passed through the SP to installinator
-// (`ipcc::InstallinatorImageId`), although _currently_ they happen to
-// be defined identically.
+// This type is a duplicate of the type in `ipcc`. We keep these types distinct
+// to allow us to choose different representations for MGS's HTTP API (this
+// type) and the wire format passed through the SP to installinator
+// (`ipcc::InstallinatorImageId`), although _currently_ they happen to be
+// defined identically.
+//
+// We don't define a conversion from `Self` to `ipcc::InstallinatorImageId` here
+// to avoid a dependency on `libipcc`. Instead, callers can easily perform
+// conversions themselves.
 #[derive(
     Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, JsonSchema,
 )]
@@ -101,16 +104,6 @@ pub struct InstallinatorImageId {
     pub control_plane: ArtifactHash,
 }
 
-impl From<InstallinatorImageId> for ipcc::InstallinatorImageId {
-    fn from(id: InstallinatorImageId) -> Self {
-        Self {
-            update_id: id.update_id,
-            host_phase_2: id.host_phase_2,
-            control_plane: id.control_plane,
-        }
-    }
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "progress", rename_all = "snake_case")]
 pub enum HostPhase2Progress {

gateway-types/src/update.rs

@@ -942,7 +942,7 @@ impl GatewayApi for GatewayImpl {
         let handler = async {
             let sp = apictx.mgmt_switch.sp(sp_id)?;
 
-            let image_id = ipcc::InstallinatorImageId::from(body.into_inner());
+            let image_id = to_ipcc_installinator_image_id(body.into_inner());
 
             sp.set_ipcc_key_lookup_value(
                 Key::InstallinatorImageId as u8,
@@ -1173,6 +1173,16 @@ fn component_from_str(s: &str) -> Result<SpComponent, HttpError> {
     })
 }
 
+fn to_ipcc_installinator_image_id(
+    image_id: InstallinatorImageId,
+) -> ipcc::InstallinatorImageId {
+    ipcc::InstallinatorImageId {
+        update_id: image_id.update_id,
+        host_phase_2: image_id.host_phase_2,
+        control_plane: image_id.control_plane,
+    }
+}
+
 // The _from_comms functions are here rather than `From` impls in gateway-types
 // so that gateway-types avoids a dependency on gateway-sp-comms.