Take TypedUuids out of the external API

common/src/api/external/mod.rs

@@ -22,8 +22,6 @@ use dropshot::HttpError;
 pub use dropshot::PaginationOrder;
 pub use error::*;
 use futures::stream::BoxStream;
-use omicron_uuid_kinds::GenericUuid;
-use omicron_uuid_kinds::InstanceUuid;
 use oxnet::IpNet;
 use oxnet::Ipv4Net;
 use parse_display::Display;
@@ -1301,13 +1299,13 @@ pub enum AffinityGroupMember {
     ///
     /// Instances can belong to up to 16 affinity groups.
     // See: INSTANCE_MAX_AFFINITY_GROUPS
-    Instance { id: InstanceUuid, name: Name, run_state: InstanceState },
+    Instance { id: Uuid, name: Name, run_state: InstanceState },
 }
 
 impl SimpleIdentityOrName for AffinityGroupMember {
     fn id(&self) -> Uuid {
         match self {
-            AffinityGroupMember::Instance { id, .. } => *id.as_untyped_uuid(),
+            AffinityGroupMember::Instance { id, .. } => *id,
         }
     }
 
@@ -1332,15 +1330,13 @@ pub enum AntiAffinityGroupMember {
     ///
     /// Instances can belong to up to 16 anti-affinity groups.
     // See: INSTANCE_MAX_ANTI_AFFINITY_GROUPS
-    Instance { id: InstanceUuid, name: Name, run_state: InstanceState },
+    Instance { id: Uuid, name: Name, run_state: InstanceState },
 }
 
 impl SimpleIdentityOrName for AntiAffinityGroupMember {
     fn id(&self) -> Uuid {
         match self {
-            AntiAffinityGroupMember::Instance { id, .. } => {
-                *id.as_untyped_uuid()
-            }
+            AntiAffinityGroupMember::Instance { id, .. } => *id,
         }
     }
 

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

@@ -2,7 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//! omdb commands that query or update specific Nexus instances
+//! om.into_untyped_uuid()db commands that query or update specific Nexus instances
 
 mod chicken_switches;
 mod quiesce;
@@ -4072,7 +4072,7 @@ async fn cmd_nexus_support_bundles_list(
         user_comment: String,
     }
     let rows = support_bundles.into_iter().map(|sb| SupportBundleInfo {
-        id: *sb.id,
+        id: sb.id.into_untyped_uuid(),
         time_created: sb.time_created,
         reason_for_creation: sb.reason_for_creation,
         reason_for_failure: sb

nexus/db-model/src/affinity.rs

@@ -23,6 +23,7 @@ use omicron_uuid_kinds::AffinityGroupKind;
 use omicron_uuid_kinds::AffinityGroupUuid;
 use omicron_uuid_kinds::AntiAffinityGroupKind;
 use omicron_uuid_kinds::AntiAffinityGroupUuid;
+use omicron_uuid_kinds::GenericUuid;
 use omicron_uuid_kinds::InstanceKind;
 use omicron_uuid_kinds::InstanceUuid;
 use uuid::Uuid;
@@ -229,7 +230,7 @@ impl AffinityGroupInstanceMembership {
         run_state: external::InstanceState,
     ) -> external::AffinityGroupMember {
         external::AffinityGroupMember::Instance {
-            id: self.instance_id.into(),
+            id: self.instance_id.into_untyped_uuid(),
             name: member_name,
             run_state,
         }
@@ -257,7 +258,7 @@ impl AntiAffinityGroupInstanceMembership {
         run_state: external::InstanceState,
     ) -> external::AntiAffinityGroupMember {
         external::AntiAffinityGroupMember::Instance {
-            id: self.instance_id.into(),
+            id: self.instance_id.into_untyped_uuid(),
             name: member_name,
             run_state,
         }

nexus/db-model/src/support_bundle.rs

@@ -11,6 +11,7 @@ use nexus_types::external_api::shared::SupportBundleInfo as SupportBundleView;
 use nexus_types::external_api::shared::SupportBundleState as SupportBundleStateView;
 use omicron_uuid_kinds::DatasetKind;
 use omicron_uuid_kinds::DatasetUuid;
+use omicron_uuid_kinds::GenericUuid;
 use omicron_uuid_kinds::OmicronZoneKind;
 use omicron_uuid_kinds::OmicronZoneUuid;
 use omicron_uuid_kinds::SupportBundleKind;
@@ -127,7 +128,7 @@ impl SupportBundle {
 impl From<SupportBundle> for SupportBundleView {
     fn from(bundle: SupportBundle) -> Self {
         Self {
-            id: bundle.id.into(),
+            id: bundle.id.into_untyped_uuid(),
             time_created: bundle.time_created,
             reason_for_creation: bundle.reason_for_creation,
             reason_for_failure: bundle.reason_for_failure,

nexus/db-model/src/webhook_delivery.rs

@@ -125,9 +125,9 @@ impl WebhookDelivery {
         attempts.sort_by_key(|a| a.attempt);
         views::AlertDelivery {
             id: self.id.into_untyped_uuid(),
-            receiver_id: self.rx_id.into(),
+            receiver_id: self.rx_id.into_untyped_uuid(),
             alert_class: alert_class.as_str().to_owned(),
-            alert_id: self.alert_id.into(),
+            alert_id: self.alert_id.into_untyped_uuid(),
             state: self.state.into(),
             trigger: self.triggered_by.into(),
             attempts: views::AlertDeliveryAttempts::Webhook(attempts),

nexus/db-queries/src/db/datastore/affinity.rs

@@ -545,7 +545,7 @@ impl DataStore {
             .into_iter()
             .map(|(id, name, instance_state, migration_id, vmm_state)| {
                 Ok(external::AffinityGroupMember::Instance {
-                    id: InstanceUuid::from_untyped_uuid(id),
+                    id,
                     name: name.into(),
                     run_state: InstanceStateComputer::compute_state_from(
                         &instance_state,
@@ -613,7 +613,7 @@ impl DataStore {
                     ));
                 };
                 Ok(external::AntiAffinityGroupMember::Instance {
-                    id: InstanceUuid::from_untyped_uuid(id),
+                    id,
                     name: name.into(),
                     run_state: InstanceStateComputer::compute_state_from(
                         &instance_state,
@@ -1874,7 +1874,7 @@ mod tests {
             external::AntiAffinityGroupMember::Instance {
                 id,
                 ..
-            } if id == instance,
+            } if id == instance.into_untyped_uuid(),
         ));
 
         // We can delete the member and observe an empty member list
@@ -1952,7 +1952,7 @@ mod tests {
 
             // Add the instance as a member to the group
             let member = external::AffinityGroupMember::Instance {
-                id: instance,
+                id: instance.into_untyped_uuid(),
                 name: name.try_into().unwrap(),
                 run_state: external::InstanceState::Stopped,
             };
@@ -2131,7 +2131,7 @@ mod tests {
 
             // Add the instance as a member to the group
             let member = external::AntiAffinityGroupMember::Instance {
-                id: instance,
+                id: instance.into_untyped_uuid(),
                 name: name.try_into().unwrap(),
                 run_state: external::InstanceState::Stopped,
             };
@@ -2473,7 +2473,7 @@ mod tests {
             external::AntiAffinityGroupMember::Instance {
                 id,
                 ..
-            } if id == instance,
+            } if id == instance.into_untyped_uuid(),
         ));
         // We can delete the member and observe an empty member list -- even
         // though it's running!

nexus/src/app/affinity.rs

@@ -319,7 +319,7 @@ impl super::Nexus {
             )
             .await?;
         Ok(external::AffinityGroupMember::Instance {
-            id: member,
+            id: authz_instance.id(),
             name: instance.name().clone(),
             // TODO: This is kinda a lie - the current implementation of
             // "affinity_group_member_instance_add" relies on the instance
@@ -349,7 +349,7 @@ impl super::Nexus {
             )
             .await?;
         Ok(external::AntiAffinityGroupMember::Instance {
-            id: member,
+            id: authz_instance.id(),
             name: instance.name().clone(),
             // TODO: This is kinda a lie - the current implementation of
             // "anti_affinity_group_member_instance_add" relies on the instance

nexus/tests/integration_tests/support_bundles.rs

@@ -20,9 +20,11 @@ use nexus_types::external_api::shared::SupportBundleState;
 use nexus_types::internal_api::background::SupportBundleCleanupReport;
 use nexus_types::internal_api::background::SupportBundleCollectionReport;
 use nexus_types::internal_api::background::SupportBundleEreportStatus;
+use omicron_uuid_kinds::GenericUuid;
 use omicron_uuid_kinds::SupportBundleUuid;
 use serde::Deserialize;
 use std::io::Cursor;
+use uuid::Uuid;
 use zip::read::ZipArchive;
 
 type ControlPlaneTestContext =
@@ -41,7 +43,7 @@ const BUNDLES_URL: &str = "/experimental/v1/system/support-bundles";
 
 async fn expect_not_found(
     client: &ClientTestContext,
-    bundle_id: SupportBundleUuid,
+    bundle_id: Uuid,
     bundle_url: &str,
     method: Method,
 ) -> Result<()> {
@@ -87,7 +89,7 @@ async fn bundles_list(
 
 async fn bundle_get(
     client: &ClientTestContext,
-    id: SupportBundleUuid,
+    id: Uuid,
 ) -> Result<SupportBundleInfo> {
     let url = format!("{BUNDLES_URL}/{id}");
     NexusRequest::object_get(client, &url)
@@ -100,7 +102,7 @@ async fn bundle_get(
 
 async fn bundle_get_expect_fail(
     client: &ClientTestContext,
-    id: SupportBundleUuid,
+    id: Uuid,
     expected_status: StatusCode,
     expected_message: &str,
 ) -> Result<()> {
@@ -126,10 +128,7 @@ async fn bundle_get_expect_fail(
     Ok(())
 }
 
-async fn bundle_delete(
-    client: &ClientTestContext,
-    id: SupportBundleUuid,
-) -> Result<()> {
+async fn bundle_delete(client: &ClientTestContext, id: Uuid) -> Result<()> {
     let url = format!("{BUNDLES_URL}/{id}");
     NexusRequest::object_delete(client, &url)
         .authn_as(AuthnMode::PrivilegedUser)
@@ -200,7 +199,7 @@ async fn bundle_create_expect_fail(
 
 async fn bundle_download(
     client: &ClientTestContext,
-    id: SupportBundleUuid,
+    id: Uuid,
 ) -> Result<bytes::Bytes> {
     let url = format!("{BUNDLES_URL}/{id}/download");
     let body = NexusRequest::new(
@@ -219,7 +218,7 @@ async fn bundle_download(
 
 async fn bundle_download_head(
     client: &ClientTestContext,
-    id: SupportBundleUuid,
+    id: Uuid,
 ) -> Result<usize> {
     let url = format!("{BUNDLES_URL}/{id}/download");
     let len = NexusRequest::new(
@@ -244,7 +243,7 @@ async fn bundle_download_head(
 
 async fn bundle_download_range(
     client: &ClientTestContext,
-    id: SupportBundleUuid,
+    id: Uuid,
     value: &str,
     expected_content_range: &str,
 ) -> Result<bytes::Bytes> {
@@ -270,7 +269,7 @@ async fn bundle_download_range(
 
 async fn bundle_download_expect_fail(
     client: &ClientTestContext,
-    id: SupportBundleUuid,
+    id: Uuid,
     expected_status: StatusCode,
     expected_message: &str,
 ) -> Result<()> {
@@ -298,7 +297,7 @@ async fn bundle_download_expect_fail(
 
 async fn bundle_update_comment(
     client: &ClientTestContext,
-    id: SupportBundleUuid,
+    id: Uuid,
     comment: Option<String>,
 ) -> Result<SupportBundleInfo> {
     use nexus_types::external_api::params::SupportBundleUpdate;
@@ -357,7 +356,7 @@ async fn activate_bundle_collection_background_task(
 async fn test_support_bundle_not_found(cptestctx: &ControlPlaneTestContext) {
     let client = &cptestctx.external_client;
 
-    let id = SupportBundleUuid::new_v4();
+    let id = Uuid::new_v4();
 
     expect_not_found(
         &client,
@@ -489,7 +488,7 @@ async fn test_support_bundle_lifecycle(cptestctx: &ControlPlaneTestContext) {
     assert_eq!(
         output.collection_report,
         Some(SupportBundleCollectionReport {
-            bundle: bundle.id,
+            bundle: SupportBundleUuid::from_untyped_uuid(bundle.id),
             listed_in_service_sleds: true,
             listed_sps: true,
             activated_in_db_ok: true,
@@ -592,7 +591,7 @@ async fn test_support_bundle_range_requests(
     assert_eq!(
         output.collection_report,
         Some(SupportBundleCollectionReport {
-            bundle: bundle.id,
+            bundle: SupportBundleUuid::from_untyped_uuid(bundle.id),
             listed_in_service_sleds: true,
             listed_sps: true,
             activated_in_db_ok: true,

nexus/tests/integration_tests/webhooks.rs

@@ -926,8 +926,8 @@ async fn test_retry_backoff(cptestctx: &ControlPlaneTestContext) {
     );
 
     let delivery = dbg!(&deliveries.all_items[0]);
-    assert_eq!(delivery.receiver_id.into_untyped_uuid(), webhook.identity.id);
-    assert_eq!(delivery.alert_id, id);
+    assert_eq!(delivery.receiver_id, webhook.identity.id);
+    assert_eq!(delivery.alert_id, *id.as_untyped_uuid());
     assert_eq!(delivery.alert_class, "test.foo");
     assert_eq!(delivery.state, views::AlertDeliveryState::Pending);
     expect_delivery_attempts(
@@ -1000,8 +1000,8 @@ async fn test_retry_backoff(cptestctx: &ControlPlaneTestContext) {
     );
 
     let delivery = dbg!(&deliveries.all_items[0]);
-    assert_eq!(delivery.receiver_id.into_untyped_uuid(), webhook.identity.id);
-    assert_eq!(delivery.alert_id, id);
+    assert_eq!(delivery.receiver_id, webhook.identity.id);
+    assert_eq!(delivery.alert_id, *id.as_untyped_uuid());
     assert_eq!(delivery.alert_class, "test.foo");
     assert_eq!(delivery.state, views::AlertDeliveryState::Pending);
     expect_delivery_attempts(
@@ -1069,8 +1069,8 @@ async fn test_retry_backoff(cptestctx: &ControlPlaneTestContext) {
         deliveries.all_items
     );
     let delivery = dbg!(&deliveries.all_items[0]);
-    assert_eq!(delivery.receiver_id.into_untyped_uuid(), webhook.identity.id);
-    assert_eq!(delivery.alert_id, id);
+    assert_eq!(delivery.receiver_id, webhook.identity.id);
+    assert_eq!(delivery.alert_id, *id.as_untyped_uuid());
     assert_eq!(delivery.alert_class, "test.foo");
     assert_eq!(delivery.state, views::AlertDeliveryState::Delivered);
     expect_delivery_attempts(

nexus/types/src/external_api/shared.rs

@@ -12,7 +12,6 @@ use chrono::DateTime;
 use chrono::Utc;
 use omicron_common::api::external::Name;
 use omicron_common::api::internal::shared::NetworkInterface;
-use omicron_uuid_kinds::SupportBundleUuid;
 use parse_display::FromStr;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -642,7 +641,7 @@ pub enum SupportBundleState {
 
 #[derive(Debug, Clone, JsonSchema, Serialize, Deserialize)]
 pub struct SupportBundleInfo {
-    pub id: SupportBundleUuid,
+    pub id: Uuid,
     pub time_created: DateTime<Utc>,
     pub reason_for_creation: String,
     pub reason_for_failure: Option<String>,

nexus/types/src/external_api/views.rs

@@ -19,7 +19,7 @@ use omicron_common::api::external::{
     Digest, Error, FailureDomain, IdentityMetadata, InstanceState, Name,
     ObjectIdentity, SimpleIdentity, SimpleIdentityOrName,
 };
-use omicron_uuid_kinds::{AlertReceiverUuid, AlertUuid};
+// Use plain `Uuid` in external views to avoid leaking typed UUIDs in OpenAPI
 use oxnet::{Ipv4Net, Ipv6Net};
 use schemars::JsonSchema;
 use semver::Version;
@@ -1308,13 +1308,13 @@ pub struct AlertDelivery {
     pub id: Uuid,
 
     /// The UUID of the alert receiver that this event was delivered to.
-    pub receiver_id: AlertReceiverUuid,
+    pub receiver_id: Uuid,
 
     /// The event class.
     pub alert_class: String,
 
     /// The UUID of the event.
-    pub alert_id: AlertUuid,
+    pub alert_id: Uuid,
 
     /// The state of this delivery.
     pub state: AlertDeliveryState,