@lightdash/warehouses 0.2092.1 → 0.2092.2

package/dist/warehouseClients/SnowflakeWarehouseClient.js

@@ -173,6 +173,7 @@ class SnowflakeWarehouseClient extends WarehouseBaseClient_1.default {
                 throw new common_1.UnexpectedServerError('Snowflake token is required for SSO authentication');
             }
             authenticationOptions = {
+                // Do not include username when doing SSO authentication
                 token: credentials.token,
                 authenticator: 'OAUTH',
             };
@@ -182,6 +183,7 @@ class SnowflakeWarehouseClient extends WarehouseBaseClient_1.default {
                 credentials.authenticationType === 'private_key')) {
             if (!credentials.privateKeyPass) {
                 authenticationOptions = {
+                    username: credentials.user,
                     privateKey: credentials.privateKey,
                     authenticator: 'SNOWFLAKE_JWT',
                 };
@@ -201,6 +203,7 @@ class SnowflakeWarehouseClient extends WarehouseBaseClient_1.default {
                     type: 'pkcs8',
                 });
                 authenticationOptions = {
+                    username: credentials.user,
                     privateKey: privateKey.toString(),
                     authenticator: 'SNOWFLAKE_JWT',
                 };
@@ -208,19 +211,14 @@ class SnowflakeWarehouseClient extends WarehouseBaseClient_1.default {
         }
         else if (credentials.password) {
             authenticationOptions = {
+                username: credentials.user,
                 password: credentials.password,
                 authenticator: 'SNOWFLAKE',
             };
         }
         this.connectionOptions = {
             account: credentials.account,
-            // When using SSO, username and role can cause conflict
-            ...(credentials.authenticationType !== 'sso'
-                ? {
-                    username: credentials.user,
-                    role: credentials.role,
-                }
-                : {}),
+            role: credentials.role,
             ...authenticationOptions,
             database: credentials.database,
             schema: credentials.schema,
@@ -231,6 +229,18 @@ class SnowflakeWarehouseClient extends WarehouseBaseClient_1.default {
             sfRetryMaxLoginRetries: 3, // Number of retries for the login request.
             retryTimeout: 15000, // according to docs: The max login timeout value. This value is either 0 or over 300.
         };
+        // Manually specify the connection options to log, to avoid logging sensitive information
+        const logConnectionOptions = {
+            account: this.connectionOptions.account,
+            authenticator: authenticationOptions.authenticator,
+            username: this.connectionOptions.username,
+            role: this.connectionOptions.role,
+            database: this.connectionOptions.database,
+            schema: this.connectionOptions.schema,
+            warehouse: this.connectionOptions.warehouse,
+            accessUrl: this.connectionOptions.accessUrl,
+        };
+        console.info(`Initialized snowflake warehouse client with authentication type "${credentials.authenticationType}" and connection options: ${JSON.stringify(logConnectionOptions)}`);
     }
     async getConnection(connectionOptionsOverrides) {
         let connection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/warehouses",
-  "version": "0.2092.1",
+  "version": "0.2092.2",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,7 +17,7 @@
     "snowflake-sdk": "~2.1.3",
     "ssh2": "^1.14.0",
     "trino-client": "0.2.6",
-    "@lightdash/common": "0.2092.1"
+    "@lightdash/common": "0.2092.2"
   },
   "devDependencies": {
     "@types/pg": "^8.11.10",