Skip to content

Commit 443a5b0

Browse files
authored
Update Databricks SDK to fix support for custom certificates (#1136)
## Changes Bring back support for system root certificates. This should fix #1092 Todo: - [x] create a proper SDK release and include that into this PR
1 parent 73a147f commit 443a5b0

File tree

6 files changed

+72
-60
lines changed

6 files changed

+72
-60
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"scripts": {
1616
"install:sdk": "yarn fetch:sdk && chmod a+x scripts/install_sdk.sh && scripts/install_sdk.sh",
17-
"fetch:sdk": "rm -rf vendor && mkdir vendor && gh release download -R databricks/databricks-sdk-js v0.6.1 -p '*.tgz' && mv *.tgz vendor/databricks-sdk.tgz",
17+
"fetch:sdk": "rm -rf vendor && mkdir vendor && gh release download -R databricks/databricks-sdk-js v0.6.2 -p '*.tgz' && mv *.tgz vendor/databricks-sdk.tgz",
1818
"test": "yarn workspaces foreach run test",
1919
"test:integ": "yarn workspaces foreach run test:integ",
2020
"build": "yarn workspaces foreach run build",

packages/databricks-vscode/src/cluster/ClusterManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {CancellationTokenSource, Disposable} from "vscode";
44

55
export class ClusterManager implements Disposable {
66
private cancellationTokenSource?: CancellationTokenSource;
7-
private refreshTimer?: NodeJS.Timer;
7+
private refreshTimer?: ReturnType<typeof setInterval>;
88

99
constructor(
1010
readonly cluster: Cluster,

packages/databricks-vscode/src/extension.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,21 @@ export async function activate(
138138
CustomWhenContext.updateShowWorkspaceView();
139139
}
140140

141+
function updateStrictSsl() {
142+
const httpConfig = workspace.getConfiguration("http");
143+
const proxyStrictSSL = httpConfig.get<boolean>("proxyStrictSSL");
144+
process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = proxyStrictSSL
145+
? "1"
146+
: "0";
147+
}
148+
141149
updateFeatureContexts();
150+
updateStrictSsl();
142151
context.subscriptions.push(
143-
workspace.onDidChangeConfiguration(updateFeatureContexts)
152+
workspace.onDidChangeConfiguration(() => {
153+
updateFeatureContexts();
154+
updateStrictSsl();
155+
})
144156
);
145157

146158
// Configuration group

packages/databricks-vscode/src/language/MsPythonExtensionWrapper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import * as os from "node:os";
1515
import * as path from "node:path";
1616
import {mkdtemp, readFile} from "fs/promises";
1717
import {Mutex} from "../locking";
18-
import * as child_process from "node:child_process";
18+
import * as cp from "node:child_process";
1919
import {promisify} from "node:util";
20-
export const execFile = promisify(child_process.execFile);
20+
export const execFile = promisify(cp.execFile);
2121

2222
export class MsPythonExtensionWrapper implements Disposable {
2323
public readonly api: MsPythonExtensionApi;

vendor/databricks-sdk.tgz

70.8 KB
Binary file not shown.

yarn.lock

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -367,34 +367,32 @@ __metadata:
367367
linkType: hard
368368

369369
"@databricks/databricks-sdk@file:../../vendor/databricks-sdk.tgz::locator=%40databricks%2Fdatabricks-vscode-types%40workspace%3Apackages%2Fdatabricks-vscode-types":
370-
version: 0.6.1
370+
version: 0.6.2
371371
resolution: "@databricks/databricks-sdk@file:../../vendor/databricks-sdk.tgz::locator=%40databricks%2Fdatabricks-vscode-types%40workspace%3Apackages%2Fdatabricks-vscode-types"
372372
dependencies:
373373
"@types/ini": ^4.1.0
374-
"@types/node": ^20.11.5
375-
"@types/semver": ^7.5.6
376-
google-auth-library: ^9.6.1
377-
ini: ^4.1.1
374+
"@types/node": ^18.19.23
375+
"@types/semver": ^7.5.8
376+
google-auth-library: ^9.6.3
377+
ini: ^4.1.2
378378
reflect-metadata: ^0.2.1
379-
semver: ^7.5.4
380-
undici: ^6.4.0
381-
checksum: 9ec51072a40562dcd72a0c1d9a060a506d61817fb3eb09075c2a6e4c6d72a42e7eee958714172383b8dc7d877be3bc7d6f47ac736ee9044e82c977cb90f15a47
379+
semver: ^7.6.0
380+
checksum: 84c9f44a5e807b176e0375658e44abe8ac0772d193e3aadbddb06da0d0fbf61696a6102f4e6fa06bf917d16247166b497f5ac7d6c32a4c0ea3fd23b269a2c6d3
382381
languageName: node
383382
linkType: hard
384383

385384
"@databricks/databricks-sdk@file:../../vendor/databricks-sdk.tgz::locator=databricks%40workspace%3Apackages%2Fdatabricks-vscode":
386-
version: 0.6.1
385+
version: 0.6.2
387386
resolution: "@databricks/databricks-sdk@file:../../vendor/databricks-sdk.tgz::locator=databricks%40workspace%3Apackages%2Fdatabricks-vscode"
388387
dependencies:
389388
"@types/ini": ^4.1.0
390-
"@types/node": ^20.11.5
391-
"@types/semver": ^7.5.6
392-
google-auth-library: ^9.6.1
393-
ini: ^4.1.1
389+
"@types/node": ^18.19.23
390+
"@types/semver": ^7.5.8
391+
google-auth-library: ^9.6.3
392+
ini: ^4.1.2
394393
reflect-metadata: ^0.2.1
395-
semver: ^7.5.4
396-
undici: ^6.4.0
397-
checksum: 9ec51072a40562dcd72a0c1d9a060a506d61817fb3eb09075c2a6e4c6d72a42e7eee958714172383b8dc7d877be3bc7d6f47ac736ee9044e82c977cb90f15a47
394+
semver: ^7.6.0
395+
checksum: 84c9f44a5e807b176e0375658e44abe8ac0772d193e3aadbddb06da0d0fbf61696a6102f4e6fa06bf917d16247166b497f5ac7d6c32a4c0ea3fd23b269a2c6d3
398396
languageName: node
399397
linkType: hard
400398

@@ -1559,22 +1557,22 @@ __metadata:
15591557
languageName: node
15601558
linkType: hard
15611559

1560+
"@types/node@npm:^18.19.23":
1561+
version: 18.19.23
1562+
resolution: "@types/node@npm:18.19.23"
1563+
dependencies:
1564+
undici-types: ~5.26.4
1565+
checksum: eb7041e45660c12091a0e41cc0be9bf5d80f7c874181cf4b830856b062176fc3c25c02420dd7b90e5a21c2683d04bfbee7949c9d59e509761d0e1d4dc6ac5242
1566+
languageName: node
1567+
linkType: hard
1568+
15621569
"@types/node@npm:^20.1.0, @types/node@npm:^20.1.1":
15631570
version: 20.2.3
15641571
resolution: "@types/node@npm:20.2.3"
15651572
checksum: 576065e8fc1fa45798c8f59a6bf809169582d04abc2e25fab1a048ffc734975b9992ae31be0d960cf705a21fb37112f7fcde11aa322beddf7491e73d5a5a988c
15661573
languageName: node
15671574
linkType: hard
15681575

1569-
"@types/node@npm:^20.11.5":
1570-
version: 20.11.15
1571-
resolution: "@types/node@npm:20.11.15"
1572-
dependencies:
1573-
undici-types: ~5.26.4
1574-
checksum: 80fe17561636e6e72a0264c26232ea4c46b5ee700888a703f06ae6c9115a2dadb16ccd09b79aa2c66a07cb547a201b2609ab939b9bde42bdad56eeefd161bc12
1575-
languageName: node
1576-
linkType: hard
1577-
15781576
"@types/node@npm:^20.4.2":
15791577
version: 20.4.2
15801578
resolution: "@types/node@npm:20.4.2"
@@ -1612,10 +1610,10 @@ __metadata:
16121610
languageName: node
16131611
linkType: hard
16141612

1615-
"@types/semver@npm:^7.5.6":
1616-
version: 7.5.6
1617-
resolution: "@types/semver@npm:7.5.6"
1618-
checksum: 563a0120ec0efcc326567db2ed920d5d98346f3638b6324ea6b50222b96f02a8add3c51a916b6897b51523aad8ac227d21d3dcf8913559f1bfc6c15b14d23037
1613+
"@types/semver@npm:^7.5.8":
1614+
version: 7.5.8
1615+
resolution: "@types/semver@npm:7.5.8"
1616+
checksum: ea6f5276f5b84c55921785a3a27a3cd37afee0111dfe2bcb3e03c31819c197c782598f17f0b150a69d453c9584cd14c4c4d7b9a55d2c5e6cacd4d66fdb3b3663
16191617
languageName: node
16201618
linkType: hard
16211619

@@ -5453,14 +5451,14 @@ __metadata:
54535451
linkType: hard
54545452

54555453
"gaxios@npm:^6.0.0, gaxios@npm:^6.1.1":
5456-
version: 6.2.0
5457-
resolution: "gaxios@npm:6.2.0"
5454+
version: 6.3.0
5455+
resolution: "gaxios@npm:6.3.0"
54585456
dependencies:
54595457
extend: ^3.0.2
54605458
https-proxy-agent: ^7.0.1
54615459
is-stream: ^2.0.0
54625460
node-fetch: ^2.6.9
5463-
checksum: a1000b841cb3d3d88e434318c7070a4860544dd0d7f4b45ff3a79ee42257cb9e19b4bb18a90420a11b91b3c0c97b57a4f8e338cec2f362003220ce190371f497
5461+
checksum: 4d4a8db32d833f8012435e2016cb0c919cac288e821bf81f877504e4284ef12b444cd903448e738c4031cd5219adf1e8d68e7df2b3dba774db9fde27f71109d4
54645462
languageName: node
54655463
linkType: hard
54665464

@@ -5787,17 +5785,17 @@ __metadata:
57875785
languageName: node
57885786
linkType: hard
57895787

5790-
"google-auth-library@npm:^9.6.1":
5791-
version: 9.6.1
5792-
resolution: "google-auth-library@npm:9.6.1"
5788+
"google-auth-library@npm:^9.6.3":
5789+
version: 9.6.3
5790+
resolution: "google-auth-library@npm:9.6.3"
57935791
dependencies:
57945792
base64-js: ^1.3.0
57955793
ecdsa-sig-formatter: ^1.0.11
57965794
gaxios: ^6.1.1
57975795
gcp-metadata: ^6.1.0
57985796
gtoken: ^7.0.0
57995797
jws: ^4.0.0
5800-
checksum: fc93a433c64e713a0093af20bca1a1f36e510b4918dd72f5bc94b96d240bc1fccb42dbdce6f0b85fa3ded2c92c1b08bb198457d5febe599f71cb2f479ac5e2f5
5798+
checksum: 46174191de15ec56110ac0394ae9d1c56fb6aa293809d45170b2ff570130d7e3f3e82fa78d413908862a2d0da3fa946b72f1074000f4d52579eb17367e49e44d
58015799
languageName: node
58025800
linkType: hard
58035801

@@ -5876,12 +5874,12 @@ __metadata:
58765874
linkType: hard
58775875

58785876
"gtoken@npm:^7.0.0":
5879-
version: 7.0.1
5880-
resolution: "gtoken@npm:7.0.1"
5877+
version: 7.1.0
5878+
resolution: "gtoken@npm:7.1.0"
58815879
dependencies:
58825880
gaxios: ^6.0.0
58835881
jws: ^4.0.0
5884-
checksum: de1f65ebe77deb90931c29c76408e6bd097ac6f8d0b520164ac13449b39012ea8d710596d5a63ae508b2c9e49ef9f92cd7817d6fc97140668ba2e1ff30e2d418
5882+
checksum: 1f338dced78f9d895ea03cd507454eb5a7b77e841ecd1d45e44483b08c1e64d16a9b0342358d37586d87462ffc2d5f5bff5dfe77ed8d4f0aafc3b5b0347d5d16
58855883
languageName: node
58865884
linkType: hard
58875885

@@ -6137,12 +6135,12 @@ __metadata:
61376135
linkType: hard
61386136

61396137
"https-proxy-agent@npm:^7.0.1":
6140-
version: 7.0.2
6141-
resolution: "https-proxy-agent@npm:7.0.2"
6138+
version: 7.0.4
6139+
resolution: "https-proxy-agent@npm:7.0.4"
61426140
dependencies:
61436141
agent-base: ^7.0.2
61446142
debug: 4
6145-
checksum: 088969a0dd476ea7a0ed0a2cf1283013682b08f874c3bc6696c83fa061d2c157d29ef0ad3eb70a2046010bb7665573b2388d10fdcb3e410a66995e5248444292
6143+
checksum: daaab857a967a2519ddc724f91edbbd388d766ff141b9025b629f92b9408fc83cee8a27e11a907aede392938e9c398e240d643e178408a59e4073539cde8cfe9
61466144
languageName: node
61476145
linkType: hard
61486146

@@ -6289,10 +6287,10 @@ __metadata:
62896287
languageName: node
62906288
linkType: hard
62916289

6292-
"ini@npm:^4.1.1":
6293-
version: 4.1.1
6294-
resolution: "ini@npm:4.1.1"
6295-
checksum: 0e5909554074fbc31824fa5415b0f604de4a665514c96a897a77bf77353a7ad4743927321270e9d0610a9d510ccd1f3cd77422f7cc80d8f4542dbce75476fb6d
6290+
"ini@npm:^4.1.2":
6291+
version: 4.1.2
6292+
resolution: "ini@npm:4.1.2"
6293+
checksum: 07e2e216dc3d4452f784ef35fe3e304a755bbafbbce725c7894d44b4c0a88c471f5fab58244a261eb351c931df34ac1a9a0914a64055ff8d4b458cfd97c78983
62966294
languageName: node
62976295
linkType: hard
62986296

@@ -9719,6 +9717,17 @@ __metadata:
97199717
languageName: node
97209718
linkType: hard
97219719

9720+
"semver@npm:^7.6.0":
9721+
version: 7.6.0
9722+
resolution: "semver@npm:7.6.0"
9723+
dependencies:
9724+
lru-cache: ^6.0.0
9725+
bin:
9726+
semver: bin/semver.js
9727+
checksum: 7427f05b70786c696640edc29fdd4bc33b2acf3bbe1740b955029044f80575fc664e1a512e4113c3af21e767154a94b4aa214bf6cd6e42a1f6dba5914e0b208c
9728+
languageName: node
9729+
linkType: hard
9730+
97229731
"serialize-error@npm:^8.0.0":
97239732
version: 8.1.0
97249733
resolution: "serialize-error@npm:8.1.0"
@@ -10841,15 +10850,6 @@ __metadata:
1084110850
languageName: node
1084210851
linkType: hard
1084310852

10844-
"undici@npm:^6.4.0":
10845-
version: 6.6.0
10846-
resolution: "undici@npm:6.6.0"
10847-
dependencies:
10848-
"@fastify/busboy": ^2.0.0
10849-
checksum: d0ad781631cd8a92a8afdc1832c971ec3d0c71b68279a4549073c1996086bce29d5bcf1c86ff8342c511345cbb0d7744c3c54e80fec5433e62c0eb6be7655a1b
10850-
languageName: node
10851-
linkType: hard
10852-
1085310853
"unique-filename@npm:^2.0.0":
1085410854
version: 2.0.1
1085510855
resolution: "unique-filename@npm:2.0.1"

0 commit comments

Comments
 (0)