Merge remote-tracking branch 'origin/main' into zl/ip-pool-multicast-support

Author: zeeshanlakhani

Cargo.lock

@@ -436,8 +436,8 @@ dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
 dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "b3cdd095437f388069aa57be5efac4b4fadc7b4f" }
 dropshot = { version = "0.16.3", features = [ "usdt-probes" ] }
-dropshot-api-manager = "0.2.1"
-dropshot-api-manager-types = "0.2.1"
+dropshot-api-manager = "0.2.2"
+dropshot-api-manager-types = "0.2.2"
 dyn-clone = "1.0.20"
 either = "1.15.0"
 ereport-types = { path = "ereport/types" }
@@ -791,9 +791,12 @@ 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"] }
 
+scim2-rs = { git = "https://github.com/oxidecomputer/scim2-rs" }
+
 # NOTE: The test profile inherits from the dev profile, so settings under
 # profile.dev get inherited. AVOID setting anything under profile.test: that
 # will cause dev and test builds to diverge, which will cause more Cargo build

Cargo.toml

@@ -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/bootstrap-agent-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-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,
         ServerConfigurableSettings = clickhouse_admin_types::ServerConfigurableSettings,
     }
 );

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

@@ -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/cockroach-admin-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/gateway-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/installinator-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 = {