Show Cloud error if present, and add verbosity

edgedb · May 1, 2023 · 76aa7ab · 76aa7ab
1 parent 827e801
commit 76aa7ab
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/cloud/client.rs b/src/cloud/client.rs
@@ -1,4 +1,5 @@
-use std::env;
+use std::{env, fmt};
+use std::fmt::Formatter;
 use std::fs;
 use std::io;
 use std::path::PathBuf;
@@ -15,7 +16,6 @@ const EDGEDB_CLOUD_API_VERSION: &str = "v1/";
 const EDGEDB_CLOUD_API_TIMEOUT: u64 = 10;
 
 #[derive(Debug, serde::Deserialize, thiserror::Error)]
-#[error("HTTP error: [{:?}] {}", code, status)]
 pub struct ErrorResponse {
     #[serde(skip, default)]
     pub code: StatusCode,
@@ -345,6 +345,16 @@ y4u6fdOVhgIhAJ4pJLfdoWQsHPUOcnVG5fBgdSnoCJhGQyuGyp+NDu1q
     }
 }
 
+impl fmt::Display for ErrorResponse {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        if let Some(error) = &self.error {
+            write!(f, "{}", error)
+        } else {
+            write!(f, "HTTP error: [{:?}] {}", self.code, self.status)
+        }
+    }
+}
+
 pub fn cloud_config_file(profile: &Option<String>) -> anyhow::Result<PathBuf> {
     Ok(cloud_config_dir()?.join(format!("{}.json", profile.as_deref().unwrap_or("default"))))
 }

diff --git a/src/commands/ui.rs b/src/commands/ui.rs
@@ -53,14 +53,14 @@ pub fn show_ui(options: &Options, args: &UI) -> anyhow::Result<()> {
                     use_https = true;
                 }
                 Ok(status) => {
-                    log::debug!(
-                        "GET {} returned status code {}, retry HTTP.",
+                    print::echo!(
+                        "{} returned status code {}, retry HTTP.",
                         https_url,
                         status
                     );
                 }
                 Err(e) => {
-                    log::debug!("GET {} failed: {:#}", https_url, e);
+                    print::echo!("Failed to probe {}: {:#}, retry HTTP.", https_url, e);
                 }
             }
         }