Add UpdateError::RollbackProtection

lzrd · lzrd · commit 1b698112f00a · 2024-09-30T09:49:44.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ resolver = "2"
 
 [workspace.dependencies]
 tlvc = { git = "https://github.com/oxidecomputer/tlvc.git", branch = "main" }
-hubtools = { git = "https://github.com/oxidecomputer/hubtools.git", branch = "main"}
+hubtools = { git = "https://github.com/oxidecomputer/hubtools.git" }
 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")
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1170,6 +1170,7 @@ pub enum UpdateError {`
`1170`	`1170`	`ImageMismatch,`
`1171`	`1171`	`SignatureNotValidated,`
`1172`	`1172`	`VersionNotSupported,`
	`1173`	`+ RollbackProtection,`
`1173`	`1174`	`}`
`1174`	`1175`
`1175`	`1176`	`impl fmt::Display for UpdateError {`
`@@ -1229,6 +1230,9 @@ impl fmt::Display for UpdateError {`
`1229`	`1230`	`Self::InvalidComponent => {`
`1230`	`1231`	`write!(f, "invalid component for operation")`
`1231`	`1232`	`}`
	`1233`	`+ Self::RollbackProtection => {`
	`1234`	`+ write!(f, "invalid epoch compared to active image")`
	`1235`	`+ }`
`1232`	`1236`	`}`
`1233`	`1237`	`}`
`1234`	`1238`	`}`