npm - @lightdash/warehouses - Versions diffs - 0.2548.0 → 0.2549.0 - Mend

@lightdash/warehouses 0.2548.0 → 0.2549.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/warehouseClients/AthenaWarehouseClient.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AthenaWarehouseClient.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/AthenaWarehouseClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EAOf,MAAM,wBAAwB,CAAC;~~AAChC~~,OAAO,EAGH,uBAAuB,EAGvB,MAAM,EAEN,mBAAmB,EACnB,gBAAgB,EAGhB,gBAAgB,EAChB,cAAc,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAM5C,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAEhE,oBAAY,WAAW;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,IAAI,SAAS;IACb,OAAO,wBAAwB;IAC/B,SAAS,cAAc;IACvB,YAAY,6BAA6B;IACzC,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,SAAS,cAAc;IACvB,IAAI,SAAS;CAChB;AAgCD,qBAAa,gBAAiB,SAAQ,uBAAuB;IACzD,QAAQ,CAAC,IAAI,yBAAyB;IAEtC,cAAc,IAAI,mBAAmB;IAIrC,wBAAwB,IAAI,MAAM;IAIlC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAajD,eAAe,IAAI,MAAM;IAIzB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAmBnC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,MAAM;IAM7D,uBAAuB,CACnB,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,GACxB,MAAM;IAKT,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAIzC;AAKD,qBAAa,qBAAsB,SAAQ,mBAAmB,CAAC,uBAAuB,CAAC;IACnF,MAAM,EAAE,YAAY,CAAC;gBAET,WAAW,EAAE,uBAAuB;~~YA2ClC~~,sBAAsB;IAiDpC,OAAO,CAAC,UAAU;IA8BZ,WAAW,CACb,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAChE,OAAO,EAAE;QACL,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,GACF,OAAO,CAAC,IAAI,CAAC;IAyGV,UAAU,CACZ,QAAQ,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,GAChE,OAAO,CAAC,gBAAgB,CAAC;IAwDtB,YAAY,IAAI,OAAO,CACzB;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CACxD;IAyCK,SAAS,CACX,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,gBAAgB,CAAC;IA2C5B,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAGlC"}
1	+ {"version":3,"file":"AthenaWarehouseClient.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/AthenaWarehouseClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EAOf,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAGH,uBAAuB,EAGvB,MAAM,EAEN,mBAAmB,EACnB,gBAAgB,EAGhB,gBAAgB,EAChB,cAAc,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAM5C,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAEhE,oBAAY,WAAW;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,IAAI,SAAS;IACb,SAAS,cAAc;IACvB,IAAI,SAAS;IACb,IAAI,SAAS;IACb,IAAI,SAAS;IACb,OAAO,wBAAwB;IAC/B,SAAS,cAAc;IACvB,YAAY,6BAA6B;IACzC,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,SAAS,cAAc;IACvB,IAAI,SAAS;CAChB;AAgCD,qBAAa,gBAAiB,SAAQ,uBAAuB;IACzD,QAAQ,CAAC,IAAI,yBAAyB;IAEtC,cAAc,IAAI,mBAAmB;IAIrC,wBAAwB,IAAI,MAAM;IAIlC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAajD,eAAe,IAAI,MAAM;IAIzB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAmBnC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,MAAM;IAM7D,uBAAuB,CACnB,iBAAiB,EAAE,MAAM,EACzB,eAAe,EAAE,MAAM,GACxB,MAAM;IAKT,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;CAIzC;AAKD,qBAAa,qBAAsB,SAAQ,mBAAmB,CAAC,uBAAuB,CAAC;IACnF,MAAM,EAAE,YAAY,CAAC;gBAET,WAAW,EAAE,uBAAuB;YAwDlC,sBAAsB;IAiDpC,OAAO,CAAC,UAAU;IA8BZ,WAAW,CACb,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAChE,OAAO,EAAE;QACL,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,GACF,OAAO,CAAC,IAAI,CAAC;IAyGV,UAAU,CACZ,QAAQ,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,GAChE,OAAO,CAAC,gBAAgB,CAAC;IAwDtB,YAAY,IAAI,OAAO,CACzB;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CACxD;IAyCK,SAAS,CACX,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,gBAAgB,CAAC;IA2C5B,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAGlC"}

package/dist/warehouseClients/AthenaWarehouseClient.js CHANGED Viewed

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AthenaWarehouseClient = exports.AthenaSqlBuilder = exports.AthenaTypes = void 0;
 const client_athena_1 = require("@aws-sdk/client-athena");
+const credential_providers_1 = require("@aws-sdk/credential-providers");
 const common_1 = require("@lightdash/common");
 const processPromisesInBatches_1 = require("../utils/processPromisesInBatches");
 const sql_1 = require("../utils/sql");
@@ -138,6 +139,17 @@ class AthenaWarehouseClient extends WarehouseBaseClient_1.default {
                     secretAccessKey: credentials.secretAccessKey,
                 };
             }
+            // Wrap with assume role if configured
+            if (credentials.assumeRoleArn) {
+                clientConfig.credentials = (0, credential_providers_1.fromTemporaryCredentials)({
+                    masterCredentials: clientConfig.credentials,
+                    params: {
+                        RoleArn: credentials.assumeRoleArn,
+                        RoleSessionName: 'lightdash-athena-session',
+                        ExternalId: credentials.assumeRoleExternalId || undefined,
+                    },
+                });
+            }
             this.client = new client_athena_1.AthenaClient(clientConfig);
         }
         catch (e) {

package/dist/warehouseClients/AthenaWarehouseClient.test.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export {};
2	+ //# sourceMappingURL=AthenaWarehouseClient.test.d.ts.map

package/dist/warehouseClients/AthenaWarehouseClient.test.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"AthenaWarehouseClient.test.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/AthenaWarehouseClient.test.ts"],"names":[],"mappings":""}

package/dist/warehouseClients/AthenaWarehouseClient.test.js ADDED Viewed

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_1 = require("@lightdash/common");
+const mockAthenaClient = jest.fn();
+jest.mock('@aws-sdk/client-athena', () => ({
+    ...jest.requireActual('@aws-sdk/client-athena'),
+    AthenaClient: mockAthenaClient,
+}));
+const mockFromTemporaryCredentials = jest.fn(() => 'sts-credentials');
+jest.mock('@aws-sdk/credential-providers', () => ({
+    fromTemporaryCredentials: mockFromTemporaryCredentials,
+}));
+// eslint-disable-next-line import/first -- Must import after mocks are set up
+const AthenaWarehouseClient_1 = require("./AthenaWarehouseClient");
+const baseCredentials = {
+    type: common_1.WarehouseTypes.ATHENA,
+    region: 'us-east-1',
+    database: 'AwsDataCatalog',
+    schema: 'my_database',
+    s3StagingDir: 's3://bucket/staging/',
+    authenticationType: common_1.AthenaAuthenticationType.ACCESS_KEY,
+    accessKeyId: 'AKID',
+    secretAccessKey: 'SECRET',
+};
+describe('AthenaWarehouseClient', () => {
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockAthenaClient.mockImplementation(() => ({}));
+    });
+    describe('authentication', () => {
+        test('should use static credentials for ACCESS_KEY auth', () => {
+            // eslint-disable-next-line no-new
+            new AthenaWarehouseClient_1.AthenaWarehouseClient(baseCredentials);
+            expect(mockAthenaClient).toHaveBeenCalledWith({
+                region: 'us-east-1',
+                credentials: {
+                    accessKeyId: 'AKID',
+                    secretAccessKey: 'SECRET',
+                },
+            });
+        });
+        test('should not set credentials for IAM_ROLE auth', () => {
+            const creds = {
+                ...baseCredentials,
+                authenticationType: common_1.AthenaAuthenticationType.IAM_ROLE,
+            };
+            // eslint-disable-next-line no-new
+            new AthenaWarehouseClient_1.AthenaWarehouseClient(creds);
+            expect(mockAthenaClient).toHaveBeenCalledWith({
+                region: 'us-east-1',
+            });
+        });
+    });
+    describe('assume role', () => {
+        test('should wrap credentials with fromTemporaryCredentials when assumeRoleArn is set', () => {
+            const creds = {
+                ...baseCredentials,
+                assumeRoleArn: 'arn:aws:iam::123456789012:role/my-role',
+                assumeRoleExternalId: 'ext-id',
+            };
+            // eslint-disable-next-line no-new
+            new AthenaWarehouseClient_1.AthenaWarehouseClient(creds);
+            expect(mockFromTemporaryCredentials).toHaveBeenCalledWith({
+                masterCredentials: {
+                    accessKeyId: 'AKID',
+                    secretAccessKey: 'SECRET',
+                },
+                params: {
+                    RoleArn: 'arn:aws:iam::123456789012:role/my-role',
+                    RoleSessionName: 'lightdash-athena-session',
+                    ExternalId: 'ext-id',
+                },
+            });
+            expect(mockAthenaClient).toHaveBeenCalledWith({
+                region: 'us-east-1',
+                credentials: 'sts-credentials',
+            });
+        });
+        test('should not wrap credentials when assumeRoleArn is not set', () => {
+            // eslint-disable-next-line no-new
+            new AthenaWarehouseClient_1.AthenaWarehouseClient(baseCredentials);
+            expect(mockFromTemporaryCredentials).not.toHaveBeenCalled();
+        });
+        test('should work with IAM_ROLE and assume role together', () => {
+            const creds = {
+                ...baseCredentials,
+                authenticationType: common_1.AthenaAuthenticationType.IAM_ROLE,
+                assumeRoleArn: 'arn:aws:iam::123456789012:role/my-role',
+            };
+            // eslint-disable-next-line no-new
+            new AthenaWarehouseClient_1.AthenaWarehouseClient(creds);
+            expect(mockFromTemporaryCredentials).toHaveBeenCalledWith({
+                masterCredentials: undefined,
+                params: {
+                    RoleArn: 'arn:aws:iam::123456789012:role/my-role',
+                    RoleSessionName: 'lightdash-athena-session',
+                    ExternalId: undefined,
+                },
+            });
+            expect(mockAthenaClient).toHaveBeenCalledWith({
+                region: 'us-east-1',
+                credentials: 'sts-credentials',
+            });
+        });
+    });
+});

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@lightdash/warehouses",
-  "version": "0.2548.0",
+  "version": "0.2549.0",
   "description": "Warehouse connectors for Lightdash",
   "license": "MIT",
   "repository": {
@@ -14,6 +14,7 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@aws-sdk/client-athena": "^3.972.0",
+    "@aws-sdk/credential-providers": "^3.972.0",
     "@clickhouse/client": "^1.12.1",
     "@databricks/sql": "1.8.4",
     "@duckdb/node-api": "^1.4.4-r.1",
@@ -25,7 +26,7 @@
     "snowflake-sdk": "~2.3.4",
     "ssh2": "^1.14.0",
     "trino-client": "0.2.9",
-    "@lightdash/common": "0.2548.0"
+    "@lightdash/common": "0.2549.0"
   },
   "devDependencies": {
     "@types/node-fetch": "^2.6.13",