Merge branch 'eliza/flake-update-2025-10-30' into eliza/fm-sitrep

Author: hawkw

Cargo.lock

@@ -8,7 +8,6 @@ license = "MPL-2.0"
 workspace = true
 
 [dependencies]
-installinator-common.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true
 progenitor.workspace = true

clients/installinator-client/Cargo.toml

@@ -24,12 +24,10 @@ progenitor::generate_api!(
     },
     replace = {
         Duration = std::time::Duration,
-        EventReportForInstallinatorSpec = installinator_common::EventReport,
+        EventReportForGenericSpec = update_engine::events::EventReport<update_engine::NestedSpec>,
         M2Slot = omicron_common::disk::M2Slot,
-        ProgressEventForGenericSpec = installinator_common::ProgressEvent<update_engine::NestedSpec>,
-        ProgressEventForInstallinatorSpec = installinator_common::ProgressEvent,
-        StepEventForGenericSpec = installinator_common::StepEvent<update_engine::NestedSpec>,
-        StepEventForInstallinatorSpec = installinator_common::StepEvent,
+        ProgressEventForGenericSpec = update_engine::events::ProgressEvent<update_engine::NestedSpec>,
+        StepEventForGenericSpec = update_engine::events::StepEvent<update_engine::NestedSpec>,
     }
 );
 

clients/installinator-client/src/lib.rs

@@ -11,12 +11,12 @@ workspace = true
 anyhow.workspace = true
 dropshot.workspace = true
 hyper.workspace = true
-installinator-common.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true
 omicron-workspace-hack.workspace = true
 schemars.workspace = true
 serde.workspace = true
 slog.workspace = true
 tufaceous-artifact.workspace = true
+update-engine.workspace = true
 uuid.workspace = true

flake.lock

@@ -15,11 +15,11 @@ use dropshot::{
     RequestContext, TypedBody,
 };
 use hyper::header;
-use installinator_common::EventReport;
 use omicron_uuid_kinds::MupdateUuid;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use tufaceous_artifact::ArtifactHashId;
+use update_engine::{NestedSpec, events::EventReport};
 
 const PROGRESS_REPORT_MAX_BYTES: usize = 4 * 1024 * 1024;
 
@@ -57,7 +57,7 @@ pub trait InstallinatorApi {
     async fn report_progress(
         rqctx: RequestContext<Self::Context>,
         path: Path<ReportQuery>,
-        report: TypedBody<EventReport>,
+        report: TypedBody<EventReport<NestedSpec>>,
     ) -> Result<HttpResponseUpdatedNoContent, HttpError>;
 }
 

installinator-api/Cargo.toml

@@ -234,7 +234,7 @@ impl ArtifactClient {
         report: EventReport,
     ) -> Result<(), ClientError> {
         self.client
-            .report_progress(&update_id, &report)
+            .report_progress(&update_id, &report.into_generic())
             .await
             .map(|resp| resp.into_inner())
     }