[sled-agent-types] reorganize per RFD 619 (#9488)

Reorganize sled-agent-types based on the model described in [RFD 619].

[RFD 619]: https://rfd.shared.oxide.computer/rfd/619

Author: sunshowers

Cargo.lock

@@ -73,7 +73,6 @@ members = [
     "live-tests/macros",
     "nexus",
     "nexus-config",
-    "nexus-sled-agent-shared",
     "nexus/authz-macros",
     "nexus/auth",
     "nexus/background-task-interface",
@@ -131,6 +130,7 @@ members = [
     "sled-agent/config-reconciler",
     "sled-agent/repo-depot-api",
     "sled-agent/types",
+    "sled-agent/types/versions",
     "sled-agent/zone-images",
     "sled-agent/zone-images-examples",
     "sled-diagnostics",
@@ -235,7 +235,6 @@ default-members = [
     "live-tests/macros",
     "nexus",
     "nexus-config",
-    "nexus-sled-agent-shared",
     "nexus/authz-macros",
     "nexus/auth",
     "nexus/background-task-interface",
@@ -293,6 +292,7 @@ default-members = [
     "sled-agent/config-reconciler",
     "sled-agent/repo-depot-api",
     "sled-agent/types",
+    "sled-agent/types/versions",
     "sled-agent/zone-images",
     "sled-agent/zone-images-examples",
     "sled-diagnostics",
@@ -568,7 +568,6 @@ nexus-reconfigurator-preparation = { path = "nexus/reconfigurator/preparation" }
 nexus-reconfigurator-rendezvous = { path = "nexus/reconfigurator/rendezvous" }
 nexus-reconfigurator-simulation = { path = "nexus/reconfigurator/simulation" }
 nexus-saga-recovery = { path = "nexus/saga-recovery" }
-nexus-sled-agent-shared = { path = "nexus-sled-agent-shared" }
 nexus-test-interface = { path = "nexus/test-interface" }
 nexus-test-utils-macros = { path = "nexus/test-utils-macros" }
 nexus-test-utils = { path = "nexus/test-utils" }
@@ -712,6 +711,7 @@ sled-agent-api = { path = "sled-agent/api" }
 sled-agent-client = { path = "clients/sled-agent-client" }
 sled-agent-config-reconciler = { path = "sled-agent/config-reconciler" }
 sled-agent-types = { path = "sled-agent/types" }
+sled-agent-types-versions = { path = "sled-agent/types/versions" }
 sled-agent-zone-images = { path = "sled-agent/zone-images" }
 sled-agent-zone-images-examples = { path = "sled-agent/zone-images-examples" }
 sled-diagnostics = { path = "sled-diagnostics" }
@@ -971,8 +971,9 @@ opt-level = 3
 # It's common during development to use a local copy of various complex
 # dependencies.  If you want to use those, uncomment one of these blocks.
 #
-# [patch.crates-io]
+[patch.crates-io]
 # diesel = { path = "../../diesel/diesel" }
+# drift = { path = "../drift" }
 # dropshot = { path = "../dropshot/dropshot" }
 # dropshot_endpoint = { path = "../dropshot/dropshot_endpoint" }
 # dropshot-api-manager = { path = "../dropshot-api-manager/crates/dropshot-api-manager" }

Cargo.toml

@@ -11,7 +11,7 @@ workspace = true
 chrono.workspace = true
 futures.workspace = true
 iddqd.workspace = true
-nexus-sled-agent-shared.workspace = true
+sled-agent-types-versions.workspace = true
 nexus-types.workspace = true
 omicron-common.workspace = true
 omicron-passwords.workspace = true

clients/nexus-lockstep-client/Cargo.toml

@@ -64,7 +64,7 @@ progenitor::generate_api!(
         ReconfiguratorConfig = nexus_types::deployment::ReconfiguratorConfig,
         ReconfiguratorConfigParam = nexus_types::deployment::ReconfiguratorConfigParam,
         ReconfiguratorConfigView = nexus_types::deployment::ReconfiguratorConfigView,
-        RecoverySiloConfig = nexus_sled_agent_shared::recovery_silo::RecoverySiloConfig,
+        RecoverySiloConfig = sled_agent_types_versions::latest::rack_init::RecoverySiloConfig,
         SledAgentUpdateStatus = nexus_types::internal_api::views::SledAgentUpdateStatus,
         UpdateStatus = nexus_types::internal_api::views::UpdateStatus,
         ZoneStatus = nexus_types::internal_api::views::ZoneStatus,

clients/nexus-lockstep-client/src/lib.rs

@@ -11,7 +11,7 @@ workspace = true
 anyhow.workspace = true
 async-trait.workspace = true
 chrono.workspace = true
-nexus-sled-agent-shared.workspace = true
+sled-agent-types-versions.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true
 omicron-workspace-hack.workspace = true

clients/sled-agent-client/Cargo.toml

@@ -46,7 +46,7 @@ progenitor::generate_api!(
         "oxnet" = "0.1.0",
     },
     replace = {
-        Baseboard = nexus_sled_agent_shared::inventory::Baseboard,
+        Baseboard = sled_agent_types_versions::latest::inventory::Baseboard,
         ByteCount = omicron_common::api::external::ByteCount,
         DatasetsConfig = omicron_common::disk::DatasetsConfig,
         DatasetManagementStatus = omicron_common::disk::DatasetManagementStatus,
@@ -62,21 +62,21 @@ progenitor::generate_api!(
         Generation = omicron_common::api::external::Generation,
         Hostname = omicron_common::api::external::Hostname,
         ImportExportPolicy = omicron_common::api::external::ImportExportPolicy,
-        Inventory = nexus_sled_agent_shared::inventory::Inventory,
-        InventoryDisk = nexus_sled_agent_shared::inventory::InventoryDisk,
-        InventoryZpool = nexus_sled_agent_shared::inventory::InventoryZpool,
+        Inventory = sled_agent_types_versions::latest::inventory::Inventory,
+        InventoryDisk = sled_agent_types_versions::latest::inventory::InventoryDisk,
+        InventoryZpool = sled_agent_types_versions::latest::inventory::InventoryZpool,
         MacAddr = omicron_common::api::external::MacAddr,
-        MupdateOverrideBootInventory = nexus_sled_agent_shared::inventory::MupdateOverrideBootInventory,
+        MupdateOverrideBootInventory = sled_agent_types_versions::latest::inventory::MupdateOverrideBootInventory,
         Name = omicron_common::api::external::Name,
         NetworkInterface = omicron_common::api::internal::shared::NetworkInterface,
         OmicronPhysicalDiskConfig = omicron_common::disk::OmicronPhysicalDiskConfig,
         OmicronPhysicalDisksConfig = omicron_common::disk::OmicronPhysicalDisksConfig,
-        OmicronSledConfig = nexus_sled_agent_shared::inventory::OmicronSledConfig,
-        OmicronZoneConfig = nexus_sled_agent_shared::inventory::OmicronZoneConfig,
-        OmicronZoneDataset = nexus_sled_agent_shared::inventory::OmicronZoneDataset,
-        OmicronZoneImageSource = nexus_sled_agent_shared::inventory::OmicronZoneImageSource,
-        OmicronZoneType = nexus_sled_agent_shared::inventory::OmicronZoneType,
-        OmicronZonesConfig = nexus_sled_agent_shared::inventory::OmicronZonesConfig,
+        OmicronSledConfig = sled_agent_types_versions::latest::inventory::OmicronSledConfig,
+        OmicronZoneConfig = sled_agent_types_versions::latest::inventory::OmicronZoneConfig,
+        OmicronZoneDataset = sled_agent_types_versions::latest::inventory::OmicronZoneDataset,
+        OmicronZoneImageSource = sled_agent_types_versions::latest::inventory::OmicronZoneImageSource,
+        OmicronZoneType = sled_agent_types_versions::latest::inventory::OmicronZoneType,
+        OmicronZonesConfig = sled_agent_types_versions::latest::inventory::OmicronZonesConfig,
         PortFec = omicron_common::api::internal::shared::PortFec,
         PortSpeed = omicron_common::api::internal::shared::PortSpeed,
         RouterId = omicron_common::api::internal::shared::RouterId,
@@ -85,7 +85,7 @@ progenitor::generate_api!(
         ResolvedVpcRouteSet = omicron_common::api::internal::shared::ResolvedVpcRouteSet,
         RouterTarget = omicron_common::api::internal::shared::RouterTarget,
         RouterVersion = omicron_common::api::internal::shared::RouterVersion,
-        SledRole = nexus_sled_agent_shared::inventory::SledRole,
+        SledRole = sled_agent_types_versions::latest::inventory::SledRole,
         SourceNatConfigGeneric = omicron_common::api::internal::shared::SourceNatConfigGeneric,
         SwitchLocation = omicron_common::api::external::SwitchLocation,
         Vni = omicron_common::api::external::Vni,

clients/sled-agent-client/src/lib.rs

@@ -53,7 +53,6 @@ nexus-inventory.workspace = true
 nexus-lockstep-client.workspace = true
 nexus-reconfigurator-preparation.workspace = true
 nexus-saga-recovery.workspace = true
-nexus-sled-agent-shared.workspace = true
 nexus-types.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true
@@ -73,6 +72,7 @@ serde.workspace = true
 sigpipe.workspace = true
 serde_json.workspace = true
 sled-agent-client.workspace = true
+sled-agent-types.workspace = true
 slog.workspace = true
 slog-error-chain.workspace = true
 steno.workspace = true

dev-tools/omdb/Cargo.toml

@@ -29,8 +29,8 @@ nexus-inventory.workspace = true
 nexus-reconfigurator-blippy.workspace = true
 nexus-reconfigurator-planning.workspace = true
 nexus-reconfigurator-simulation.workspace = true
-nexus-sled-agent-shared.workspace = true
 nexus-types.workspace = true
+sled-agent-types.workspace = true
 omicron-common.workspace = true
 omicron-repl-utils.workspace = true
 omicron-uuid-kinds.workspace = true

dev-tools/reconfigurator-cli/Cargo.toml

@@ -34,7 +34,6 @@ use nexus_reconfigurator_simulation::{
 };
 use nexus_reconfigurator_simulation::{SimStateBuilder, SimTufRepoSource};
 use nexus_reconfigurator_simulation::{SimTufRepoDescription, Simulator};
-use nexus_sled_agent_shared::inventory::ZoneKind;
 use nexus_types::deployment::execution;
 use nexus_types::deployment::execution::blueprint_external_dns_config;
 use nexus_types::deployment::execution::blueprint_internal_dns_config;
@@ -68,6 +67,7 @@ use omicron_uuid_kinds::SledUuid;
 use omicron_uuid_kinds::VnicUuid;
 use omicron_uuid_kinds::{BlueprintUuid, MupdateOverrideUuid};
 use omicron_uuid_kinds::{CollectionUuid, MupdateUuid};
+use sled_agent_types::inventory::ZoneKind;
 use slog_error_chain::InlineErrorChain;
 use std::borrow::Cow;
 use std::collections::BTreeSet;

dev-tools/reconfigurator-cli/src/lib.rs

@@ -28,8 +28,8 @@ nexus-inventory.workspace = true
 nexus-lockstep-client.workspace = true
 nexus-reconfigurator-planning.workspace = true
 nexus-reconfigurator-preparation.workspace = true
-nexus-sled-agent-shared.workspace = true
 nexus-types.workspace = true
+sled-agent-types.workspace = true
 omicron-common.workspace = true
 omicron-test-utils.workspace = true
 omicron-uuid-kinds.workspace = true