Update progenitor to bc0bb4b

oxidecomputer · Feb 15, 2024 · 00df4fa · 00df4fa
1 parent b2cd53d
commit 00df4fa
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/dns-service-client/src/lib.rs b/clients/dns-service-client/src/lib.rs
@@ -32,7 +32,8 @@ pub fn is_retryable(error: &DnsConfigError<crate::types::Error>) -> bool {
         | DnsConfigError::InvalidResponsePayload(_, _)
         | DnsConfigError::UnexpectedResponse(_)
         | DnsConfigError::InvalidUpgrade(_)
-        | DnsConfigError::ResponseBodyError(_) => return false,
+        | DnsConfigError::ResponseBodyError(_)
+        | DnsConfigError::PreHookError(_) => return false,
         DnsConfigError::ErrorResponse(response_value) => response_value,
     };
 

diff --git a/common/src/api/external/error.rs b/common/src/api/external/error.rs
@@ -496,7 +496,8 @@ impl<T: ClientError> From<progenitor::progenitor_client::Error<T>> for Error {
             )
             | progenitor::progenitor_client::Error::UnexpectedResponse(_)
             | progenitor::progenitor_client::Error::InvalidUpgrade(_)
-            | progenitor::progenitor_client::Error::ResponseBodyError(_) => {
+            | progenitor::progenitor_client::Error::ResponseBodyError(_)
+            | progenitor::progenitor_client::Error::PreHookError(_) => {
                 Error::internal_error(&e.to_string())
             }
             // This error represents an expected error from the remote service.

diff --git a/sled-agent/src/instance.rs b/sled-agent/src/instance.rs
@@ -277,7 +277,8 @@ impl InstanceInner {
                             | nexus_client::Error::InvalidResponsePayload(..)
                             | nexus_client::Error::UnexpectedResponse(_)
                             | nexus_client::Error::InvalidUpgrade(_)
-                            | nexus_client::Error::ResponseBodyError(_) => {
+                            | nexus_client::Error::ResponseBodyError(_)
+                            | nexus_client::Error::PreHookError(_) => {
                                 BackoffError::permanent(Error::Notification(
                                     err,
                                 ))

diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
@@ -59,7 +59,7 @@ hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13.2" }
 hex = { version = "0.4.3", features = ["serde"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 hyper = { version = "0.14.27", features = ["full"] }
-indexmap = { version = "2.2.2", features = ["serde"] }
+indexmap = { version = "2.2.3", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 ipnetwork = { version = "0.20.0", features = ["schemars"] }
 itertools = { version = "0.10.5" }
@@ -167,7 +167,7 @@ hashbrown-594e8ee84c453af0 = { package = "hashbrown", version = "0.13.2" }
 hex = { version = "0.4.3", features = ["serde"] }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 hyper = { version = "0.14.27", features = ["full"] }
-indexmap = { version = "2.2.2", features = ["serde"] }
+indexmap = { version = "2.2.3", features = ["serde"] }
 inout = { version = "0.1.3", default-features = false, features = ["std"] }
 ipnetwork = { version = "0.20.0", features = ["schemars"] }
 itertools = { version = "0.10.5" }