Addressing comments commit wasn't pushed in (#9441)

dust-tt · Dec 17, 2024 · f3fecb3 · f3fecb3
1 parent aaaaf5f
commit f3fecb3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 29 deletions.
diff --git a/connectors/src/connectors/snowflake/index.ts b/connectors/src/connectors/snowflake/index.ts
@@ -74,11 +74,8 @@ export class SnowflakeConnectorManager extends BaseConnectorManager<null> {
     const credentials = credentialsRes.value.credentials;
 
     if (!isSnowflakeCredentials(credentials)) {
-      return new Err(
-        new ConnectorManagerError(
-          "INVALID_CONFIGURATION",
-          "Invalid credentials type - expected snowflake credentials"
-        )
+      throw new Error(
+        "Invalid credentials type - expected snowflake credentials"
       );
     }
 
@@ -281,11 +278,8 @@ export class SnowflakeConnectorManager extends BaseConnectorManager<null> {
     }
 
     if (!isSnowflakeCredentials(credentials)) {
-      return new Err(
-        new ConnectorManagerError(
-          "INVALID_CONFIGURATION",
-          "Invalid credentials type - expected snowflake credentials"
-        )
+      throw new Error(
+        "Invalid credentials type - expected snowflake credentials"
       );
     }
 

diff --git a/connectors/src/connectors/snowflake/lib/utils.ts b/connectors/src/connectors/snowflake/lib/utils.ts
@@ -59,13 +59,9 @@ export const getCredentials = async ({
   // Narrow the type of credentials to just the username/password variant
   const credentials = credentialsRes.value.credential.content;
   if (!isSnowflakeCredentials(credentials)) {
-    logger.error(
-      { credentialsId },
+    throw new Error(
       "Invalid credentials type - expected snowflake credentials"
     );
-    return new Err(
-      Error("Invalid credentials type - expected snowflake credentials")
-    );
   }
   return new Ok({
     credentials,
@@ -105,13 +101,9 @@ export const getConnectorAndCredentials = async ({
   // Narrow the type of credentials to just the username/password variant
   const credentials = credentialsRes.value.credential.content;
   if (!isSnowflakeCredentials(credentials)) {
-    logger.error(
-      { connectorId },
+    throw new Error(
       "Invalid credentials type - expected snowflake credentials"
     );
-    return new Err(
-      Error("Invalid credentials type - expected snowflake credentials")
-    );
   }
   return new Ok({
     connector,

diff --git a/core/src/databases/remote_databases/get_remote_database.rs b/core/src/databases/remote_databases/get_remote_database.rs
@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 
 use crate::{
     databases::remote_databases::remote_database::RemoteDatabase,
@@ -17,8 +17,9 @@ pub async fn get_remote_database(
             let db = SnowflakeRemoteDatabase::new(content)?;
             Ok(Box::new(db) as Box<dyn RemoteDatabase + Sync + Send>)
         }
-        _ => {
-            anyhow::bail!("{:?} is not a supported remote database provider", provider)
-        }
+        _ => Err(anyhow!(
+            "{:?} is not a supported remote database provider",
+            provider
+        ))?,
     }
 }
diff --git a/core/src/databases/remote_databases/remote_database.rs b/core/src/databases/remote_databases/remote_database.rs
@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 
 use crate::{
@@ -35,9 +35,6 @@ pub async fn get_remote_database(
             let db = SnowflakeRemoteDatabase::new(content)?;
             Ok(Box::new(db) as Box<dyn RemoteDatabase + Sync + Send>)
         }
-        _ => Err(anyhow::anyhow!(
-            "Provider {} is not a remote database",
-            provider
-        )),
+        _ => Err(anyhow!("Provider {} is not a remote database", provider)),
     }
 }