Merge branch 'main' into plan-target-release

Author: plotnick

Cargo.lock

@@ -506,8 +506,8 @@ lldp_protocol = { git = "https://github.com/oxidecomputer/lldp", package = "prot
 macaddr = { version = "1.0.1", features = ["serde_std"] }
 maplit = "1.0.2"
 newtype_derive = "0.1.6"
-mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "872aae7d76493f2a4f59711b24dde55523536b40" }
-ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "872aae7d76493f2a4f59711b24dde55523536b40" }
+mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "875ae5b7f8f0e32e9be672a36b5dda109b9b2450" }
+ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "875ae5b7f8f0e32e9be672a36b5dda109b9b2450" }
 multimap = "0.10.1"
 nexus-auth = { path = "nexus/auth" }
 nexus-background-task-interface = { path = "nexus/background-task-interface" }

Cargo.toml

@@ -12,6 +12,7 @@ base64.workspace = true
 chrono.workspace = true
 daft.workspace = true
 gateway-messages.workspace = true
+gateway-types.workspace = true
 progenitor.workspace = true
 rand.workspace = true
 reqwest = { workspace = true, features = ["rustls-tls", "stream"] }

clients/gateway-client/Cargo.toml

@@ -64,7 +64,6 @@ progenitor::generate_api!(
         ImageVersion = { derives = [PartialEq, Eq, PartialOrd, Ord] },
         RotImageDetails = { derives = [PartialEq, Eq, PartialOrd, Ord] },
         RotImageError = { derives = [ PartialEq, Eq, PartialOrd, Ord] },
-        RotSlot = { derives = [PartialEq, Eq, PartialOrd, Ord] },
         RotState = { derives = [PartialEq, Eq, PartialOrd, Ord] },
         SpComponentCaboose = { derives = [PartialEq, Eq] },
         SpIdentifier = { derives = [Copy, PartialEq, Hash, Eq] },
@@ -75,6 +74,7 @@ progenitor::generate_api!(
         SpUpdateStatus = { derives = [PartialEq, Hash, Eq] },
         UpdatePreparationProgress = { derives = [PartialEq, Hash, Eq] },
     },
+    replace = { RotSlot = gateway_types::rot::RotSlot },
 );
 
 // Override the impl of Ord for SpIdentifier because the default one orders the

clients/gateway-client/src/lib.rs

@@ -981,6 +981,8 @@ pub enum ResourceType {
     AffinityGroupMember,
     AntiAffinityGroup,
     AntiAffinityGroupMember,
+    Alert,
+    AlertReceiver,
     AllowList,
     BackgroundTask,
     BgpConfig,
@@ -1044,8 +1046,6 @@ pub enum ResourceType {
     Probe,
     ProbeNetworkInterface,
     LldpLinkConfig,
-    WebhookEvent,
-    WebhookReceiver,
     WebhookSecret,
 }
 

common/src/api/external/mod.rs

@@ -28,6 +28,7 @@ futures.workspace = true
 gateway-client.workspace = true
 gateway-messages.workspace = true
 gateway-test-utils.workspace = true
+gateway-types.workspace = true
 http.workspace = true
 humantime.workspace = true
 internal-dns-resolver.workspace = true
@@ -43,6 +44,7 @@ nexus-db-schema.workspace = true
 nexus-inventory.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