Refactor error handling across CLI commands

Standardized the usage of the `anyhow` crate for error handling and improved error reporting. Additionally, the main function now exits with a failure status upon encountering an error.
cartridge-gg · Sep 18, 2024 · 278bee6 · 278bee6
1 parent c5af3f6
commit 278bee6
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 27 deletions.
diff --git a/cli/src/command/auth/info.rs b/cli/src/command/auth/info.rs
@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Args;
 use slot::graphql::auth::{me::*, Me};
 use slot::graphql::{GraphQLQuery, Response};
@@ -18,7 +18,7 @@ impl InfoArgs {
 
         if let Some(errors) = res.errors {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
             return Ok(());
         }

diff --git a/cli/src/command/auth/login.rs b/cli/src/command/auth/login.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use axum::{
     extract::{Query, State},
     response::{IntoResponse, Redirect, Response},
@@ -120,7 +120,7 @@ async fn handler(
             // display the errors if any, but still process bcs we have the token
             if let Some(errors) = res.errors {
                 for err in errors {
-                    eprintln!("Error: {}", err.message);
+                    return Err(CallbackError::Other(anyhow!(err.message)));
                 }
             }
 

diff --git a/cli/src/command/deployments/accounts.rs b/cli/src/command/deployments/accounts.rs
@@ -1,6 +1,6 @@
 #![allow(clippy::enum_variant_names)]
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Args;
 use katana_primitives::contract::ContractAddress;
 use katana_primitives::genesis::allocation::GenesisAccountAlloc;
@@ -41,7 +41,7 @@ impl AccountsArgs {
         let res: Response<ResponseData> = client.query(&request_body).await?;
         if let Some(errors) = res.errors.clone() {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
         }
 
@@ -57,17 +57,17 @@ impl AccountsArgs {
                                     FieldElement::from_bytes_be(
                                         &Felt::from_hex(&account.address).unwrap().to_bytes_be(),
                                     )
-                                    .unwrap(),
+                                        .unwrap(),
                                 );
 
                                 let public_key = FieldElement::from_bytes_be(
                                     &Felt::from_hex(&account.public_key).unwrap().to_bytes_be(),
                                 )
-                                .unwrap();
+                                    .unwrap();
                                 let private_key = FieldElement::from_bytes_be(
                                     &Felt::from_hex(&account.private_key).unwrap().to_bytes_be(),
                                 )
-                                .unwrap();
+                                    .unwrap();
 
                                 let genesis_account = GenesisAccount {
                                     public_key,
@@ -109,7 +109,7 @@ impl AccountsArgs {
 
 fn print_genesis_accounts<'a, Accounts>(accounts: Accounts, seed: Option<&str>)
 where
-    Accounts: Iterator<Item = (&'a ContractAddress, &'a GenesisAccountAlloc)>,
+    Accounts: Iterator<Item=(&'a ContractAddress, &'a GenesisAccountAlloc)>,
 {
     println!(
         r"

diff --git a/cli/src/command/deployments/create.rs b/cli/src/command/deployments/create.rs
@@ -1,6 +1,6 @@
 #![allow(clippy::enum_variant_names)]
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Args;
 use slot::api::Client;
 use slot::credential::Credentials;
@@ -143,7 +143,7 @@ impl CreateArgs {
         let res: Response<ResponseData> = client.query(&request_body).await?;
         if let Some(errors) = res.errors.clone() {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
 
             return Ok(());

diff --git a/cli/src/command/deployments/delete.rs b/cli/src/command/deployments/delete.rs
@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Args;
 use dialoguer::theme::ColorfulTheme;
 use dialoguer::Confirm;
@@ -64,7 +64,7 @@ impl DeleteArgs {
         let res: Response<ResponseData> = client.query(&request_body).await?;
         if let Some(errors) = res.errors.clone() {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
         }
 

diff --git a/cli/src/command/deployments/describe.rs b/cli/src/command/deployments/describe.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::enum_variant_names)]
 
 use super::services::Service;
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Args;
 use slot::graphql::deployments::describe_deployment::DescribeDeploymentDeploymentConfig::{
     KatanaConfig, MadaraConfig, SayaConfig, ToriiConfig,
@@ -40,7 +40,7 @@ impl DescribeArgs {
         let res: Response<ResponseData> = client.query(&request_body).await?;
         if let Some(errors) = res.errors.clone() {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
         }
 

diff --git a/cli/src/command/deployments/fork.rs b/cli/src/command/deployments/fork.rs
@@ -1,6 +1,6 @@
 #![allow(clippy::enum_variant_names)]
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Args;
 use slot::graphql::deployments::fork_deployment::ForkDeploymentForkDeployment::KatanaConfig;
 use slot::graphql::deployments::{fork_deployment::*, ForkDeployment};
@@ -50,7 +50,7 @@ impl ForkArgs {
         let res: Response<ResponseData> = client.query(&request_body).await?;
         if let Some(errors) = res.errors.clone() {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
         }
 

diff --git a/cli/src/command/deployments/list.rs b/cli/src/command/deployments/list.rs
@@ -1,6 +1,6 @@
 #![allow(clippy::enum_variant_names)]
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Args;
 
 use slot::graphql::deployments::list_deployments::{ResponseData, Variables};
@@ -22,7 +22,7 @@ impl ListArgs {
         let res: Response<ResponseData> = client.query(&request_body).await?;
         if let Some(errors) = res.errors.clone() {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
         }
 

diff --git a/cli/src/command/deployments/update.rs b/cli/src/command/deployments/update.rs
@@ -2,7 +2,7 @@
 
 use super::services::UpdateServiceCommands;
 use crate::command::deployments::Tier;
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Args;
 use slot::api::Client;
 use slot::credential::Credentials;
@@ -78,7 +78,7 @@ impl UpdateArgs {
         let res: Response<update_deployment::ResponseData> = client.query(&request_body).await?;
         if let Some(errors) = res.errors.clone() {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
 
             return Ok(());

diff --git a/cli/src/command/teams/members.rs b/cli/src/command/teams/members.rs
@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::Args;
 use slot::api::Client;
 use slot::credential::Credentials;
@@ -23,7 +23,7 @@ impl TeamListArgs {
         let res: Response<team_members_list::ResponseData> = client.query(&request_body).await?;
         if let Some(errors) = res.errors.clone() {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
 
             return Ok(());
@@ -66,7 +66,7 @@ impl TeamAddArgs {
         let res: Response<team_member_add::ResponseData> = client.query(&request_body).await?;
         if let Some(errors) = res.errors {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
 
             return Ok(());
@@ -96,7 +96,7 @@ impl TeamRemoveArgs {
         let res: Response<team_member_remove::ResponseData> = client.query(&request_body).await?;
         if let Some(errors) = res.errors {
             for err in errors {
-                println!("Error: {}", err.message);
+                return Err(anyhow!(err));
             }
 
             return Ok(());

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -22,7 +22,8 @@ async fn main() {
     match &cli.command.run().await {
         Ok(_) => {}
         Err(e) => {
-            error!("{e}")
+            error!("{e}");
+            std::process::exit(1);
         }
     }
 }