From d6473aab87b80be32aaae9c9810358e737d31355 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 16 May 2023 09:50:23 +0200 Subject: [PATCH 1/4] Append auth on verification --- packages/server/src/api/controllers/datasource.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index a87c8c68f6..a6609abff2 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -25,6 +25,7 @@ import { DatasourcePlus, } from "@budibase/types" import sdk from "../../sdk" +import _ from "lodash" function getErrorTables(errors: any, errorType: string) { return Object.entries(errors) From b3b962534f692a4bab7cf8d460323f70a79eed95 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 16 May 2023 11:40:29 +0200 Subject: [PATCH 2/4] Test snowflake connection --- packages/server/src/integrations/snowflake.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/server/src/integrations/snowflake.ts b/packages/server/src/integrations/snowflake.ts index 46a40b8b03..7b35968aaf 100644 --- a/packages/server/src/integrations/snowflake.ts +++ b/packages/server/src/integrations/snowflake.ts @@ -71,6 +71,15 @@ class SnowflakeIntegration { this.client = new Snowflake(config) } + async testConnection() { + try { + await this.client.connect() + return true + } catch (e: any) { + return { error: e.message as string } + } + } + async internalQuery(query: SqlQuery) { await this.client.connect() try { From 062127b1f10b4bf74ae6158d0922035ef441a180 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 16 May 2023 11:48:40 +0200 Subject: [PATCH 3/4] Fix types --- packages/server/src/integrations/snowflake.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/server/src/integrations/snowflake.ts b/packages/server/src/integrations/snowflake.ts index 7b35968aaf..dc5fb66c55 100644 --- a/packages/server/src/integrations/snowflake.ts +++ b/packages/server/src/integrations/snowflake.ts @@ -1,4 +1,5 @@ import { + ConnectionInfo, DatasourceFeature, Integration, QueryType, @@ -71,12 +72,15 @@ class SnowflakeIntegration { this.client = new Snowflake(config) } - async testConnection() { + async testConnection(): Promise { try { await this.client.connect() - return true + return { connected: true } } catch (e: any) { - return { error: e.message as string } + return { + connected: false, + error: e.message as string, + } } } From 2176ac8da746b3b9512f73e0423831d8f6389118 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 16 May 2023 11:49:51 +0200 Subject: [PATCH 4/4] Clean code --- packages/server/src/api/controllers/datasource.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index a6609abff2..a87c8c68f6 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -25,7 +25,6 @@ import { DatasourcePlus, } from "@budibase/types" import sdk from "../../sdk" -import _ from "lodash" function getErrorTables(errors: any, errorType: string) { return Object.entries(errors)