@lightdash/warehouses 2.525.0 → 2.526.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.
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ConnectionOptions } from '@databricks/sql/dist/contracts/IDBSQLClient';
|
|
2
2
|
import { TTypeId as DatabricksDataTypes } from '@databricks/sql/thrift/TCLIService_types';
|
|
3
3
|
import { AnyType, CreateDatabricksCredentials, Metric, SupportedDbtAdapter, TimeIntervalUnit, UnnestSql, UnnestSqlArgs, WarehouseResults, WarehouseTypes, type ResultNumericKind, type TimestampDomain } from '@lightdash/common';
|
|
4
|
+
import { type RequestInit } from 'node-fetch';
|
|
4
5
|
import { WarehouseCatalog } from '../types';
|
|
5
6
|
import WarehouseBaseClient from './WarehouseBaseClient';
|
|
6
7
|
import WarehouseBaseSqlBuilder from './WarehouseBaseSqlBuilder';
|
|
@@ -82,14 +83,14 @@ export declare class DatabricksWarehouseClient extends WarehouseBaseClient<Creat
|
|
|
82
83
|
/**
|
|
83
84
|
* Exchange Databricks OAuth M2M credentials for access and refresh tokens
|
|
84
85
|
*/
|
|
85
|
-
export declare const exchangeDatabricksOAuthCredentials: (host: string, clientId: string, clientSecret: string) => Promise<{
|
|
86
|
+
export declare const exchangeDatabricksOAuthCredentials: (host: string, clientId: string, clientSecret: string, transport?: Pick<RequestInit, 'agent'>) => Promise<{
|
|
86
87
|
accessToken: string;
|
|
87
88
|
refreshToken?: string;
|
|
88
89
|
}>;
|
|
89
90
|
/**
|
|
90
91
|
* Refresh Databricks OAuth U2M access token using refresh token
|
|
91
92
|
*/
|
|
92
|
-
export declare const refreshDatabricksOAuthToken: (host: string, clientId: string, refreshToken: string, clientSecret?: string) => Promise<{
|
|
93
|
+
export declare const refreshDatabricksOAuthToken: (host: string, clientId: string, refreshToken: string, clientSecret?: string, transport?: Pick<RequestInit, 'agent'>) => Promise<{
|
|
93
94
|
accessToken: string;
|
|
94
95
|
refreshToken: string;
|
|
95
96
|
expiresIn: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabricksWarehouseClient.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/DatabricksWarehouseClient.ts"],"names":[],"mappings":"AACA,OAAqB,EACjB,iBAAiB,EACpB,MAAM,6CAA6C,CAAC;AAIrD,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EACH,OAAO,EACP,2BAA2B,EAM3B,MAAM,EAMN,mBAAmB,EACnB,gBAAgB,EAEhB,SAAS,EACT,aAAa,EAGb,gBAAgB,EAChB,cAAc,EACd,KAAK,iBAAiB,EACtB,KAAK,eAAe,EAEvB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"DatabricksWarehouseClient.d.ts","sourceRoot":"","sources":["../../src/warehouseClients/DatabricksWarehouseClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -679,10 +679,11 @@ exports.DatabricksWarehouseClient = DatabricksWarehouseClient;
|
|
|
679
679
|
/**
|
|
680
680
|
* Exchange Databricks OAuth M2M credentials for access and refresh tokens
|
|
681
681
|
*/
|
|
682
|
-
const exchangeDatabricksOAuthCredentials = async (host, clientId, clientSecret) => {
|
|
682
|
+
const exchangeDatabricksOAuthCredentials = async (host, clientId, clientSecret, transport) => {
|
|
683
683
|
const tokenUrl = `https://${host}/oidc/v1/token`;
|
|
684
684
|
const response = await (0, node_fetch_1.default)(tokenUrl, {
|
|
685
685
|
method: 'POST',
|
|
686
|
+
agent: transport?.agent,
|
|
686
687
|
headers: {
|
|
687
688
|
'Content-Type': 'application/x-www-form-urlencoded',
|
|
688
689
|
},
|
|
@@ -707,7 +708,7 @@ exports.exchangeDatabricksOAuthCredentials = exchangeDatabricksOAuthCredentials;
|
|
|
707
708
|
/**
|
|
708
709
|
* Refresh Databricks OAuth U2M access token using refresh token
|
|
709
710
|
*/
|
|
710
|
-
const refreshDatabricksOAuthToken = async (host, clientId, refreshToken, clientSecret) => {
|
|
711
|
+
const refreshDatabricksOAuthToken = async (host, clientId, refreshToken, clientSecret, transport) => {
|
|
711
712
|
const tokenUrl = `https://${host}/oidc/v1/token`;
|
|
712
713
|
const params = new URLSearchParams({
|
|
713
714
|
grant_type: 'refresh_token',
|
|
@@ -719,6 +720,7 @@ const refreshDatabricksOAuthToken = async (host, clientId, refreshToken, clientS
|
|
|
719
720
|
}
|
|
720
721
|
const response = await (0, node_fetch_1.default)(tokenUrl, {
|
|
721
722
|
method: 'POST',
|
|
723
|
+
agent: transport?.agent,
|
|
722
724
|
headers: {
|
|
723
725
|
'Content-Type': 'application/x-www-form-urlencoded',
|
|
724
726
|
},
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lightdash/warehouses",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.526.0",
|
|
4
4
|
"description": "Warehouse connectors for Lightdash",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"@databricks/sql": "1.13.0",
|
|
22
22
|
"@duckdb/node-api": "1.5.2-r.2",
|
|
23
23
|
"@google-cloud/bigquery": "8.3.1",
|
|
24
|
-
"@lightdash/common": "2.
|
|
24
|
+
"@lightdash/common": "2.526.0",
|
|
25
25
|
"node-fetch": "2.7.0",
|
|
26
26
|
"pg": "8.13.1",
|
|
27
27
|
"pg-cursor": "2.10.0",
|