Merge branch 'main' into renovate/bb8-0.x

oxidecomputer · Mar 31, 2024 · 329546b · 329546b
2 parents 4a163bd + 1878cf4
commit 329546b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,8 +20,8 @@ anyhow = "1.0.79"
 async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel" }
 async-trait = "0.1.77"
 base64 = "0.21.7"
-bb8 = "0.8.3"
 chrono = "0.4.31"
+chrono = "0.4.37"
 clap = { version = "4.4.16", features = ["derive", "string", "env"] }
 config = { version = "0.13.4", features = ["toml"] }
 cookie = { version = "0.18.0" }

diff --git a/rfd-cli/src/printer/mod.rs b/rfd-cli/src/printer/mod.rs
@@ -36,9 +36,7 @@ pub trait CliOutput {
     fn output_search_results(&self, value: types::SearchResults) {}
     fn output_error<T>(&self, value: &progenitor_client::Error<T>)
     where
-        T: schemars::JsonSchema + serde::Serialize + std::fmt::Debug,
-    {
-    }
+        T: schemars::JsonSchema + serde::Serialize + std::fmt::Debug;
 }
 
 impl CliOutput for Printer {
@@ -167,4 +165,14 @@ impl CliOutput for Printer {
             Self::Tab(printer) => printer.output_search_results(value),
         }
     }
+
+    fn output_error<T>(&self, value: &progenitor_client::Error<T>)
+    where
+        T: schemars::JsonSchema + serde::Serialize + std::fmt::Debug,
+    {
+        match self {
+            Self::Json(printer) => printer.output_error(value),
+            Self::Tab(printer) => printer.output_error(value),
+        }
+    }
 }