Bump to latest gateway-messages

Cargo.toml

@@ -167,8 +167,8 @@ flate2 = "1.0.26"
 fs-err = "2.9.0"
 futures = "0.3.28"
 gateway-client = { path = "gateway-client" }
-gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["std"], rev = "1b3d1a4a074fb8ec2df67a906d41bfa636c261a8" }
-gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "1b3d1a4a074fb8ec2df67a906d41bfa636c261a8" }
+gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["std"], rev = "da51768e10dbe260cc6302bcfd2ac379e275a313" }
+gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "da51768e10dbe260cc6302bcfd2ac379e275a313" }
 gateway-test-utils = { path = "gateway-test-utils" }
 headers = "0.3.8"
 heck = "0.4"

gateway-cli/src/main.rs

@@ -665,6 +665,14 @@ async fn update(
                 }
                 bail!("update failed (code {code})");
             }
+            SpUpdateStatus::RotError { id, message } => {
+                if id != update_id {
+                    bail!(
+                        "different update failed ({id:?}, rot error {message})"
+                    );
+                }
+                bail!("update failed (rot error {message})");
+            }
         }
         tokio::time::sleep(Duration::from_secs(1)).await;
     }

gateway/src/http_entrypoints.rs

@@ -220,6 +220,8 @@ enum SpUpdateStatus {
     Aborted { id: Uuid },
     /// The update process failed.
     Failed { id: Uuid, code: u32 },
+    /// The update process failed with an RoT-specific error.
+    RotError { id: Uuid, message: String },
 }
 
 /// Progress of an SP preparing to update.

gateway/src/http_entrypoints/conversions.rs

@@ -65,6 +65,9 @@ impl From<UpdateStatus> for SpUpdateStatus {
             UpdateStatus::Failed { id, code } => {
                 Self::Failed { id: id.into(), code }
             }
+            UpdateStatus::RotError { id, error } => {
+                Self::RotError { id: id.into(), message: format!("{error:?}") }
+            }
         }
     }
 }
@@ -206,20 +209,11 @@ impl From<Result<gateway_messages::RotStateV2, gateway_messages::RotError>>
     }
 }
 
-impl From<gateway_messages::RotSlot> for RotSlot {
-    fn from(slot: gateway_messages::RotSlot) -> Self {
-        match slot {
-            gateway_messages::RotSlot::A => Self::A,
-            gateway_messages::RotSlot::B => Self::B,
-        }
-    }
-}
-
-impl From<gateway_messages::SlotId> for RotSlot {
-    fn from(slot: gateway_messages::SlotId) -> Self {
+impl From<gateway_messages::RotSlotId> for RotSlot {
+    fn from(slot: gateway_messages::RotSlotId) -> Self {
         match slot {
-            gateway_messages::SlotId::A => Self::A,
-            gateway_messages::SlotId::B => Self::B,
+            gateway_messages::RotSlotId::A => Self::A,
+            gateway_messages::RotSlotId::B => Self::B,
         }
     }
 }

openapi/gateway.json

@@ -2808,6 +2808,30 @@
               "id",
               "state"
             ]
+          },
+          {
+            "description": "The update process failed with an RoT-specific error.",
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "string",
+                "format": "uuid"
+              },
+              "message": {
+                "type": "string"
+              },
+              "state": {
+                "type": "string",
+                "enum": [
+                  "rot_error"
+                ]
+              }
+            },
+            "required": [
+              "id",
+              "message",
+              "state"
+            ]
           }
         ]
       },

sp-sim/src/gimlet.rs

@@ -18,7 +18,7 @@ use gateway_messages::sp_impl::SpHandler;
 use gateway_messages::sp_impl::{BoundsChecked, DeviceDescription};
 use gateway_messages::ComponentAction;
 use gateway_messages::Header;
-use gateway_messages::SlotId;
+use gateway_messages::RotSlotId;
 use gateway_messages::SpComponent;
 use gateway_messages::SpError;
 use gateway_messages::SpPort;
@@ -547,8 +547,8 @@ impl Handler {
             base_mac_address: [0; 6],
             power_state: self.power_state,
             rot: Ok(gateway_messages::RotStateV2 {
-                active: SlotId::A,
-                persistent_boot_preference: SlotId::A,
+                active: RotSlotId::A,
+                persistent_boot_preference: RotSlotId::A,
                 pending_persistent_boot_preference: None,
                 transient_boot_preference: None,
                 slot_a_sha3_256_digest: None,

sp-sim/src/sidecar.rs

@@ -28,7 +28,7 @@ use gateway_messages::IgnitionCommand;
 use gateway_messages::IgnitionState;
 use gateway_messages::MgsError;
 use gateway_messages::PowerState;
-use gateway_messages::SlotId;
+use gateway_messages::RotSlotId;
 use gateway_messages::SpComponent;
 use gateway_messages::SpError;
 use gateway_messages::SpPort;
@@ -344,8 +344,8 @@ impl Handler {
             base_mac_address: [0; 6],
             power_state: self.power_state,
             rot: Ok(gateway_messages::RotStateV2 {
-                active: SlotId::A,
-                persistent_boot_preference: SlotId::A,
+                active: RotSlotId::A,
+                persistent_boot_preference: RotSlotId::A,
                 pending_persistent_boot_preference: None,
                 transient_boot_preference: None,
                 slot_a_sha3_256_digest: None,

wicketd/src/update_tracker.rs

@@ -1394,6 +1394,10 @@ impl UpdateContext {
                     ensure!(id == update_id, "SP processing different update");
                     bail!("update failed (error code {code})");
                 }
+                SpUpdateStatus::RotError { message, id } => {
+                    ensure!(id == update_id, "SP processing different update");
+                    bail!("update failed (rot error message {message})");
+                }
             }
 
             tokio::time::sleep(STATUS_POLL_FREQ).await;