Skip to content

Commit 4267864

Browse files
authored
Add waiters for get methods as a extension (#1648)
## Changes <!-- Summary of your changes that are easy to understand --> Waiters have been removed from the JS SDK as they are not LRO. This PR adds removed waiters for get methods as an extension of JS SDK. ## Tests <!-- How is this tested? --> Existing CI.
1 parent b16fe66 commit 4267864

File tree

5 files changed

+20
-23
lines changed

5 files changed

+20
-23
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.8.0 -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.10.0 -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/bundle/run/JobRunStatus.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {Event, EventEmitter} from "vscode";
88
import {AuthProvider} from "../../configuration/auth/AuthProvider";
99
import {onError} from "../../utils/onErrorDecorator";
1010
import {BundleRunStatus} from "./BundleRunStatus";
11-
import {Time, TimeUnits} from "@databricks/databricks-sdk";
11+
import {WorkflowRun} from "../../sdk-extensions";
1212

1313
export class JobRunStatus extends BundleRunStatus {
1414
readonly type = "jobs";
@@ -47,13 +47,10 @@ export class JobRunStatus extends BundleRunStatus {
4747
try {
4848
this.runState = "running";
4949
await (
50-
await client.jobs.getRun({run_id: parseInt(this.runId)})
51-
).wait({
52-
timeout: new Time(48, TimeUnits.hours),
53-
onProgress: async (progress) => {
54-
this.data = progress;
55-
this.onDidChangeEmitter.fire();
56-
},
50+
await WorkflowRun.fromId(client.apiClient, parseInt(this.runId))
51+
).wait((_, run) => {
52+
this.data = run.details;
53+
this.onDidChangeEmitter.fire();
5754
});
5855
} catch (e) {
5956
this.runState = "error";

packages/databricks-vscode/src/sdk-extensions/WorkflowRun.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {SubmitRun, SubmitTask} from "@databricks/databricks-sdk/dist/apis/jobs";
55
export class WorkflowRun {
66
constructor(
77
readonly client: ApiClient,
8-
private details: jobs.Run
8+
public details: jobs.Run
99
) {}
1010

1111
static async fromId(

vendor/databricks-sdk.tgz

51.4 KB
Binary file not shown.

yarn.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ __metadata:
340340
linkType: hard
341341

342342
"@databricks/databricks-sdk@file:../../vendor/databricks-sdk.tgz::locator=%40databricks%2Fdatabricks-vscode-types%40workspace%3Apackages%2Fdatabricks-vscode-types":
343-
version: 0.8.0
343+
version: 0.10.0
344344
resolution: "@databricks/databricks-sdk@file:../../vendor/databricks-sdk.tgz::locator=%40databricks%2Fdatabricks-vscode-types%40workspace%3Apackages%2Fdatabricks-vscode-types"
345345
dependencies:
346346
"@types/ini": ^4.1.0
@@ -350,12 +350,12 @@ __metadata:
350350
ini: ^4.1.2
351351
reflect-metadata: ^0.2.1
352352
semver: ^7.6.0
353-
checksum: be59ab37615aa63780fdb841cdd6199f930710d409e29233abc2c66d8e5a7ac9928497bdf2f38075970e89e6ade0d9ae37ea39efcf721bd85f0c484c535f46d0
353+
checksum: a6bc58a26c5f07a6d55550b4513e8adcfe36aae432aab687ffc5b96a68d3d5a754b6eabe918c3cd74739bc690ba8e0f965da8deaa9a89025d8f5b4b8daec87c5
354354
languageName: node
355355
linkType: hard
356356

357357
"@databricks/databricks-sdk@file:../../vendor/databricks-sdk.tgz::locator=databricks%40workspace%3Apackages%2Fdatabricks-vscode":
358-
version: 0.8.0
358+
version: 0.10.0
359359
resolution: "@databricks/databricks-sdk@file:../../vendor/databricks-sdk.tgz::locator=databricks%40workspace%3Apackages%2Fdatabricks-vscode"
360360
dependencies:
361361
"@types/ini": ^4.1.0
@@ -365,7 +365,7 @@ __metadata:
365365
ini: ^4.1.2
366366
reflect-metadata: ^0.2.1
367367
semver: ^7.6.0
368-
checksum: be59ab37615aa63780fdb841cdd6199f930710d409e29233abc2c66d8e5a7ac9928497bdf2f38075970e89e6ade0d9ae37ea39efcf721bd85f0c484c535f46d0
368+
checksum: a6bc58a26c5f07a6d55550b4513e8adcfe36aae432aab687ffc5b96a68d3d5a754b6eabe918c3cd74739bc690ba8e0f965da8deaa9a89025d8f5b4b8daec87c5
369369
languageName: node
370370
linkType: hard
371371

@@ -1525,11 +1525,11 @@ __metadata:
15251525
linkType: hard
15261526

15271527
"@types/node@npm:^18.19.23":
1528-
version: 18.19.80
1529-
resolution: "@types/node@npm:18.19.80"
1528+
version: 18.19.86
1529+
resolution: "@types/node@npm:18.19.86"
15301530
dependencies:
15311531
undici-types: ~5.26.4
1532-
checksum: 08f5be60721d6b37c96dbef9124caf1a27ae1059d7cb1029d9da7d93be25b985106b6bd27af5f65550e20b481aa1985e3d47a63ae6b178b93ac9be5272a12907
1532+
checksum: 3f2352b5f8da276874cd22555931088298808d384b09d0911bfda5403a93e196c9db48254013bb349be6c069975ea1601981a1d20641867139c47f70348fb81d
15331533
languageName: node
15341534
linkType: hard
15351535

@@ -1582,9 +1582,9 @@ __metadata:
15821582
linkType: hard
15831583

15841584
"@types/semver@npm:^7.5.8":
1585-
version: 7.5.8
1586-
resolution: "@types/semver@npm:7.5.8"
1587-
checksum: ea6f5276f5b84c55921785a3a27a3cd37afee0111dfe2bcb3e03c31819c197c782598f17f0b150a69d453c9584cd14c4c4d7b9a55d2c5e6cacd4d66fdb3b3663
1585+
version: 7.7.0
1586+
resolution: "@types/semver@npm:7.7.0"
1587+
checksum: d488eaeddb23879a0a8a759bed667e1a76cb0dd4d23e3255538e24c189db387357953ca9e7a3bda2bb7f95e84cac8fe0db4fbe6b3456e893043337732d1d23cc
15881588
languageName: node
15891589
linkType: hard
15901590

@@ -2740,9 +2740,9 @@ __metadata:
27402740
linkType: hard
27412741

27422742
"bignumber.js@npm:^9.0.0":
2743-
version: 9.1.2
2744-
resolution: "bignumber.js@npm:9.1.2"
2745-
checksum: 582c03af77ec9cb0ebd682a373ee6c66475db94a4325f92299621d544aa4bd45cb45fd60001610e94aef8ae98a0905fa538241d9638d4422d57abbeeac6fadaf
2743+
version: 9.2.0
2744+
resolution: "bignumber.js@npm:9.2.0"
2745+
checksum: 0fdf63ae38d8472e15e86338ba1848c092a889ade3baccbef52304933a9dd682bcc9e1ef20ffd937ed52eb86e1f0e332dd08c7c01ba6d62f4293220007c24455
27462746
languageName: node
27472747
linkType: hard
27482748

0 commit comments

Comments
 (0)