[nexus-external-api] reorganize per RFD 619 (#9568)

This is an extremely large PR, but a generally quite mechanical one. I
had Claude Code both write most of the PR and review it for conformance
with the RFD -- all tests appear to pass, and I also manually
spot-checked the versions crate to ensure it generally made sense.

Author: sunshowers

Cargo.lock

@@ -111,6 +111,7 @@ members = [
     "nexus/test-utils-macros",
     "nexus/test-utils",
     "nexus/types",
+    "nexus/types/versions",
     "ntp-admin",
     "ntp-admin/api",
     "ntp-admin/types",
@@ -287,6 +288,7 @@ default-members = [
     "nexus/test-utils-macros",
     "nexus/test-utils",
     "nexus/types",
+    "nexus/types/versions",
     "ntp-admin",
     "ntp-admin/api",
     "ntp-admin/types",
@@ -613,6 +615,7 @@ nexus-test-interface = { path = "nexus/test-interface" }
 nexus-test-utils-macros = { path = "nexus/test-utils-macros" }
 nexus-test-utils = { path = "nexus/test-utils" }
 nexus-types = { path = "nexus/types" }
+nexus-types-versions = { path = "nexus/types/versions" }
 nix = { version = "0.30", features = ["fs", "net"] }
 nom = "7.1.3"
 nonempty = "0.12.0"

Cargo.toml

@@ -266,8 +266,8 @@ impl TryFrom<types::ProducerEndpoint>
     }
 }
 
-impl From<nexus_types::external_api::shared::Baseboard> for types::Baseboard {
-    fn from(value: nexus_types::external_api::shared::Baseboard) -> Self {
+impl From<nexus_types::external_api::hardware::Baseboard> for types::Baseboard {
+    fn from(value: nexus_types::external_api::hardware::Baseboard) -> Self {
         types::Baseboard {
             part: value.part,
             revision: value.revision,

clients/nexus-client/src/lib.rs

@@ -137,11 +137,11 @@ use nexus_types::deployment::BlueprintZoneDisposition;
 use nexus_types::deployment::BlueprintZoneType;
 use nexus_types::deployment::DiskFilter;
 use nexus_types::deployment::SledFilter;
-use nexus_types::external_api::params;
-use nexus_types::external_api::views::PhysicalDiskPolicy;
-use nexus_types::external_api::views::PhysicalDiskState;
-use nexus_types::external_api::views::SledPolicy;
-use nexus_types::external_api::views::SledState;
+use nexus_types::external_api::disk::BlockSize;
+use nexus_types::external_api::physical_disk::{
+    PhysicalDiskPolicy, PhysicalDiskState,
+};
+use nexus_types::external_api::sled::{SledPolicy, SledState};
 use nexus_types::identity::Resource;
 use nexus_types::internal_api::params::DnsRecord;
 use nexus_types::internal_api::params::Srv;
@@ -4086,7 +4086,7 @@ async fn cmd_db_dry_run_region_allocation(
     };
 
     let size: external::ByteCount = args.size.try_into()?;
-    let block_size: params::BlockSize = args.block_size.try_into()?;
+    let block_size: BlockSize = args.block_size.try_into()?;
 
     let (blocks_per_extent, extent_count) = DataStore::get_crucible_allocation(
         &block_size.try_into().unwrap(),

dev-tools/omdb/src/bin/omdb/db.rs

@@ -3009,7 +3009,7 @@ fn print_task_alert_dispatcher(details: &serde_json::Value) {
     }
 }
 fn print_task_webhook_deliverator(details: &serde_json::Value) {
-    use nexus_types::external_api::views::WebhookDeliveryAttemptResult;
+    use nexus_types::external_api::alert::WebhookDeliveryAttemptResult;
     use nexus_types::internal_api::background::WebhookDeliveratorStatus;
     use nexus_types::internal_api::background::WebhookDeliveryFailure;
     use nexus_types::internal_api::background::WebhookRxDeliveryStatus;

dev-tools/omdb/src/bin/omdb/nexus.rs

@@ -49,8 +49,7 @@ use nexus_types::deployment::{
 };
 use nexus_types::deployment::{OmicronZoneNic, TargetReleaseDescription};
 use nexus_types::deployment::{PendingMgsUpdateSpDetails, PlanningInput};
-use nexus_types::external_api::views::SledPolicy;
-use nexus_types::external_api::views::SledProvisionPolicy;
+use nexus_types::external_api::sled::{SledPolicy, SledProvisionPolicy};
 use nexus_types::inventory::CollectionDisplayCliFilter;
 use omicron_common::address::REPO_DEPOT_PORT;
 use omicron_common::api::external::Generation;

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

@@ -24,7 +24,7 @@ use nexus_types::deployment::Blueprint;
 use nexus_types::deployment::BlueprintSource;
 use nexus_types::deployment::ClickhousePolicy;
 use nexus_types::deployment::PlanningInput;
-use nexus_types::external_api::views::SledPolicy;
+use nexus_types::external_api::sled::SledPolicy;
 use nexus_types::inventory::Collection;
 use omicron_uuid_kinds::SledUuid;
 use slog::Logger;

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

@@ -13,7 +13,7 @@ use nexus_lockstep_client::types::{
 use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder;
 use nexus_reconfigurator_planning::planner::PlannerRng;
 use nexus_types::deployment::{Blueprint, BlueprintSource};
-use nexus_types::external_api::views::SledState;
+use nexus_types::external_api::sled::SledState;
 use nexus_types::inventory::Collection;
 use omicron_test_utils::dev::poll::{CondCheckError, wait_for_condition};
 use omicron_uuid_kinds::GenericUuid;

live-tests/tests/common/reconfigurator.rs

@@ -141,6 +141,7 @@ nexus-reconfigurator-planning.workspace = true
 nexus-reconfigurator-preparation.workspace = true
 nexus-reconfigurator-rendezvous.workspace = true
 nexus-types.workspace = true
+nexus-types-versions.workspace = true
 omicron-common.workspace = true
 omicron-passwords.workspace = true
 oxide-tokio-rt.workspace = true

nexus/Cargo.toml

@@ -40,8 +40,8 @@ pub use nexus_db_fixed_data::user_builtin::USER_SERVICE_BALANCER;
 use crate::authz;
 use chrono::{DateTime, Utc};
 use nexus_db_fixed_data::silo::DEFAULT_SILO;
-use nexus_types::external_api::shared::FleetRole;
-use nexus_types::external_api::shared::SiloRole;
+use nexus_types::external_api::policy::FleetRole;
+use nexus_types::external_api::policy::SiloRole;
 use nexus_types::identity::Asset;
 use omicron_common::api::external::LookupType;
 use omicron_uuid_kinds::BuiltInUserUuid;