bump newtype-uuid to 1.3.1, use automatic replacement

Cargo.toml

@@ -791,7 +791,8 @@ zone = { version = "0.3.1", default-features = false, features = ["async"] }
 # the kinds). However, uses of omicron-uuid-kinds _within omicron_ will have
 # std and the other features enabled because they'll refer to it via
 # omicron-uuid-kinds.workspace = true.
-newtype-uuid = { version = "1.2.4", default-features = false }
+newtype-uuid = { version = "1.3.1", default-features = false }
+newtype-uuid-macros = "0.1.0"
 omicron-uuid-kinds = { path = "uuid-kinds", features = ["serde", "schemars08", "uuid-v4"] }
 
 # NOTE: The test profile inherits from the dev profile, so settings under

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

@@ -20,13 +20,12 @@ progenitor::generate_api!(
     }),
     derives = [schemars::JsonSchema],
     crates = {
+        "omicron-uuid-kinds" = "*",
         "oxnet" = "0.1.0",
     },
     replace = {
         AllowedSourceIps = omicron_common::api::external::AllowedSourceIps,
         ImportExportPolicy = omicron_common::api::external::ImportExportPolicy,
-        TypedUuidForRackInitKind = omicron_uuid_kinds::RackInitUuid,
-        TypedUuidForRackResetKind = omicron_uuid_kinds::RackResetUuid,
     },
 );
 

clients/clickhouse-admin-keeper-client/src/lib.rs

@@ -19,9 +19,11 @@ progenitor::generate_api!(
     post_hook = (|log: &slog::Logger, result: &Result<_, _>| {
         slog::debug!(log, "client response"; "result" => ?result);
     }),
+    crates = {
+        "omicron-uuid-kinds" = "*",
+    },
     derives = [schemars::JsonSchema],
     replace = {
-        TypedUuidForOmicronZoneKind = omicron_uuid_kinds::OmicronZoneUuid,
         KeeperConfigurableSettings = clickhouse_admin_types::KeeperConfigurableSettings,
         ClickhouseKeeperClusterMembership = clickhouse_admin_types::ClickhouseKeeperClusterMembership,
         KeeperId = clickhouse_admin_types::KeeperId

clients/clickhouse-admin-server-client/src/lib.rs

@@ -19,9 +19,11 @@ progenitor::generate_api!(
     post_hook = (|log: &slog::Logger, result: &Result<_, _>| {
         slog::debug!(log, "client response"; "result" => ?result);
     }),
+    crates = {
+        "omicron-uuid-kinds" = "*",
+    },
     derives = [schemars::JsonSchema],
     replace = {
-        TypedUuidForOmicronZoneKind = omicron_uuid_kinds::OmicronZoneUuid,
         ServerConfigurableSettings = clickhouse_admin_types::ServerConfigurableSettings,
     }
 );

clients/clickhouse-admin-single-client/src/lib.rs

@@ -19,9 +19,11 @@ progenitor::generate_api!(
     post_hook = (|log: &slog::Logger, result: &Result<_, _>| {
         slog::debug!(log, "client response"; "result" => ?result);
     }),
+    crates = {
+        "omicron-uuid-kinds" = "*",
+    },
     derives = [schemars::JsonSchema],
     replace = {
-        TypedUuidForOmicronZoneKind = omicron_uuid_kinds::OmicronZoneUuid,
         ServerConfigurableSettings = clickhouse_admin_types::ServerConfigurableSettings,
     }
 );

clients/cockroach-admin-client/src/lib.rs

@@ -18,8 +18,8 @@ progenitor::generate_api!(
     post_hook = (|log: &slog::Logger, result: &Result<_, _>| {
         slog::debug!(log, "client response"; "result" => ?result);
     }),
+    crates = {
+        "omicron-uuid-kinds" = "*",
+    },
     derives = [schemars::JsonSchema],
-    replace = {
-        TypedUuidForOmicronZoneKind = omicron_uuid_kinds::OmicronZoneUuid,
-    }
 );

clients/gateway-client/src/lib.rs

@@ -78,15 +78,17 @@ progenitor::generate_api!(
         SpUpdateStatus = { derives = [PartialEq, Hash, Eq] },
         UpdatePreparationProgress = { derives = [PartialEq, Hash, Eq] },
     },
+    crates = {
+        "omicron-uuid-kinds" = "*",
+    },
+
     replace = {
         RotSlot = gateway_types::rot::RotSlot,
         Ena = ereport_types::Ena,
         Ereport = ereport_types::Ereport,
         Ereports = ereport_types::Ereports,
         SpType = gateway_types::component::SpType,
         TaskDump = gateway_types::task_dump::TaskDump,
-        TypedUuidForEreporterRestartKind = omicron_uuid_kinds::EreporterRestartUuid,
-        TypedUuidForMupdateKind = omicron_uuid_kinds::MupdateUuid,
     },
 );
 

clients/installinator-client/src/lib.rs

@@ -19,6 +19,9 @@ progenitor::generate_api!(
         slog::debug!(log, "client response"; "result" => ?result);
     }),
     derives = [schemars::JsonSchema],
+    crates = {
+        "omicron-uuid-kinds" = "*",
+    },
     replace = {
         Duration = std::time::Duration,
         EventReportForInstallinatorSpec = installinator_common::EventReport,
@@ -27,7 +30,6 @@ progenitor::generate_api!(
         ProgressEventForInstallinatorSpec = installinator_common::ProgressEvent,
         StepEventForGenericSpec = installinator_common::StepEvent<update_engine::NestedSpec>,
         StepEventForInstallinatorSpec = installinator_common::StepEvent,
-        TypedUuidForMupdateKind = omicron_uuid_kinds::MupdateUuid,
     }
 );
 

clients/nexus-client/src/lib.rs

@@ -24,6 +24,7 @@ progenitor::generate_api!(
     }),
     crates = {
         "iddqd" = "*",
+        "omicron-uuid-kinds" = "*",
         "oxnet" = "0.1.0",
     },
     replace = {
@@ -51,17 +52,6 @@ progenitor::generate_api!(
         PlannerConfig = nexus_types::deployment::PlannerConfig,
         RecoverySiloConfig = nexus_sled_agent_shared::recovery_silo::RecoverySiloConfig,
         Srv = nexus_types::internal_api::params::Srv,
-        TypedUuidForBlueprintKind = omicron_uuid_kinds::BlueprintUuid,
-        TypedUuidForDatasetKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::DatasetKind>,
-        TypedUuidForDownstairsKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::DownstairsKind>,
-        TypedUuidForPhysicalDiskKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::PhysicalDiskKind>,
-        TypedUuidForPropolisKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::PropolisKind>,
-        TypedUuidForSledKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::SledKind>,
-        TypedUuidForUpstairsKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::UpstairsKind>,
-        TypedUuidForUpstairsRepairKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::UpstairsRepairKind>,
-        TypedUuidForUpstairsSessionKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::UpstairsSessionKind>,
-        TypedUuidForVolumeKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::VolumeKind>,
-        TypedUuidForZpoolKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::ZpoolKind>,
         ZpoolName = omicron_common::zpool_name::ZpoolName,
     },
     patch = {

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

@@ -27,6 +27,7 @@ progenitor::generate_api!(
     }),
     crates = {
         "iddqd" = "*",
+        "omicron-uuid-kinds" = "*",
         "oxnet" = "0.1.0",
     },
     replace = {
@@ -54,12 +55,6 @@ progenitor::generate_api!(
         ReconfiguratorConfig = nexus_types::deployment::ReconfiguratorConfig,
         ReconfiguratorConfigParam = nexus_types::deployment::ReconfiguratorConfigParam,
         ReconfiguratorConfigView = nexus_types::deployment::ReconfiguratorConfigView,
-        TypedUuidForBlueprintKind = omicron_uuid_kinds::BlueprintUuid,
-        TypedUuidForDatasetKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::DatasetKind>,
-        TypedUuidForDemoSagaKind = omicron_uuid_kinds::DemoSagaUuid,
-        TypedUuidForPhysicalDiskKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::PhysicalDiskKind>,
-        TypedUuidForSledKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::SledKind>,
-        TypedUuidForZpoolKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::ZpoolKind>,
         UpdateStatus = nexus_types::internal_api::views::UpdateStatus,
         ZoneStatus = nexus_types::internal_api::views::ZoneStatus,
         ZoneStatusVersion = nexus_types::internal_api::views::ZoneStatusVersion,

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

@@ -42,6 +42,7 @@ progenitor::generate_api!(
         VirtualNetworkInterfaceHost = { derives = [Eq, Hash] },
     },
     crates = {
+        "omicron-uuid-kinds" = "*",
         "oxnet" = "0.1.0",
     },
     replace = {
@@ -84,13 +85,6 @@ progenitor::generate_api!(
         SledRole = nexus_sled_agent_shared::inventory::SledRole,
         SourceNatConfig = omicron_common::api::internal::shared::SourceNatConfig,
         SwitchLocation = omicron_common::api::external::SwitchLocation,
-        TypedUuidForDatasetKind = omicron_uuid_kinds::DatasetUuid,
-        TypedUuidForInstanceKind = omicron_uuid_kinds::InstanceUuid,
-        TypedUuidForOmicronZoneKind = omicron_uuid_kinds::OmicronZoneUuid,
-        TypedUuidForPropolisKind = omicron_uuid_kinds::PropolisUuid,
-        TypedUuidForSledKind = omicron_uuid_kinds::SledUuid,
-        TypedUuidForSupportBundleKind = omicron_uuid_kinds::SupportBundleUuid,
-        TypedUuidForZpoolKind = omicron_uuid_kinds::ZpoolUuid,
         Vni = omicron_common::api::external::Vni,
         VpcFirewallIcmpFilter = omicron_common::api::external::VpcFirewallIcmpFilter,
         ZpoolKind = omicron_common::zpool_name::ZpoolKind,

clients/wicketd-client/src/lib.rs

@@ -31,6 +31,9 @@ progenitor::generate_api!(
         RotImageDetails = { derives = [PartialEq, Eq, PartialOrd, Ord]},
         UplinkConfig = { derives = [PartialEq, Eq, PartialOrd, Ord] },
     },
+    crates = {
+        "omicron-uuid-kinds" = "*",
+    },
     replace = {
         AbortUpdateOptions = wicket_common::rack_update::AbortUpdateOptions,
         AllowedSourceIps = omicron_common::api::internal::shared::AllowedSourceIps,
@@ -84,8 +87,6 @@ progenitor::generate_api!(
         StepEventForInstallinatorSpec = installinator_common::StepEvent,
         StepEventForWicketdEngineSpec = wicket_common::update_events::StepEvent,
         SwitchLocation = omicron_common::api::internal::shared::SwitchLocation,
-        TypedUuidForRackInitKind = omicron_uuid_kinds::RackInitUuid,
-        TypedUuidForRackResetKind = omicron_uuid_kinds::RackResetUuid,
         UpdateSimulatedResult = wicket_common::rack_update::UpdateSimulatedResult,
         UpdateTestError = wicket_common::rack_update::UpdateTestError,
         UplinkPreflightStepId = wicket_common::preflight_check::UplinkPreflightStepId,

cockroach-admin/api/src/lib.rs

@@ -24,6 +24,7 @@ api_versions!([
     // |  example for the next person.
     // v
     // (next_int, IDENT),
+    (2, NEWTYPE_UUID_BUMP),
     (1, INITIAL),
 ]);
 

cockroach-admin/src/lib.rs

@@ -72,7 +72,7 @@ pub async fn start_server(
     .version_policy(dropshot::VersionPolicy::Dynamic(Box::new(
         dropshot::ClientSpecifiesVersionInHeader::new(
             omicron_common::api::VERSION_HEADER,
-            cockroach_admin_api::VERSION_INITIAL,
+            cockroach_admin_api::VERSION_NEWTYPE_UUID_BUMP,
         ),
     )))
     .start()