Add UpdateError::RollbackProtection

Updating to epoch branch of hubtools. No code impact
oxidecomputer · Aug 16, 2024 · 2d9c8eb · 2d9c8eb
1 parent 8b80941
commit 2d9c8eb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,8 @@ resolver = "2"
 
 [workspace.dependencies]
 tlvc = { git = "https://github.com/oxidecomputer/tlvc.git", branch = "main" }
-hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main"}
+# TODO: Change to main branch before merge
+hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "epoch"}
 slog-error-chain = { git = "https://github.com/oxidecomputer/slog-error-chain.git", branch = "main", features = ["derive"] }
 
 anyhow = "1.0"

diff --git a/gateway-messages/src/sp_to_mgs.rs b/gateway-messages/src/sp_to_mgs.rs
@@ -1170,6 +1170,7 @@ pub enum UpdateError {
     ImageMismatch,
     SignatureNotValidated,
     VersionNotSupported,
+    RollbackProtection,
 }
 
 impl fmt::Display for UpdateError {
@@ -1229,6 +1230,9 @@ impl fmt::Display for UpdateError {
             Self::InvalidComponent => {
                 write!(f, "invalid component for operation")
             }
+            Self::RollbackProtection => {
+                write!(f, "invalid epoch compared to active image")
+            }
         }
     }
 }