Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
"hoistingLimits": "dependencies"
},
"engines": {
"node": ">=16.0",
"node": ">=22.0",
"yarn": ">=3.2.0"
},
"scripts": {
"install:sdk": "yarn fetch:sdk && chmod a+x scripts/install_sdk.sh && scripts/install_sdk.sh",
"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",
"test": "yarn workspaces foreach run test",
"test:integ": "yarn workspaces foreach run test:integ",
"build": "yarn workspaces foreach run build",
Expand All @@ -34,7 +32,7 @@
"homepage": "https://github.com/databricks/databricks-vscode#readme",
"packageManager": "yarn@3.2.1",
"devDependencies": {
"@types/node": "^20.10.4",
"@types/node": "^22.0.0",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"conventional-changelog-cli": "^4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-vscode-types/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ApiClient, WorkspaceClient} from "@databricks/databricks-sdk";
import {ApiClient, WorkspaceClient} from "@databricks/sdk-experimental";
import {Cluster} from "databricks/src/sdk-extensions";
import {Event} from "vscode";
export type ConnectionState = "CONNECTED" | "CONNECTING" | "DISCONNECTED";
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-vscode-types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"typescript": "^5.3.3"
},
"dependencies": {
"@databricks/databricks-sdk": "file:../../vendor/databricks-sdk.tgz",
"@databricks/sdk-experimental": "^0.15.0",
"databricks": "workspace:^"
}
}
5 changes: 3 additions & 2 deletions packages/databricks-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1187,8 +1187,8 @@
"generate-telemetry": "ts-node ./scripts/generateTelemetry.ts"
},
"dependencies": {
"@databricks/databricks-sdk": "file:../../vendor/databricks-sdk.tgz",
"@databricks/databricks-vscode-types": "workspace:^",
"@databricks/sdk-experimental": "^0.15.0",
"@types/lodash": "^4.14.202",
"@types/shell-quote": "^1.7.5",
"@vscode/debugadapter": "^1.64.0",
Expand All @@ -1211,9 +1211,10 @@
"@types/chai": "^4.3.11",
"@types/eslint": "^8.44.9",
"@types/fs-extra": "^11.0.4",
"@types/ini": "^4.1.1",
"@types/mocha": "^10.0.6",
"@types/mock-require": "^2.0.3",
"@types/node": "^20.10.4",
"@types/node": "^22.0.0",
"@types/sinonjs__fake-timers": "^8.1.5",
"@types/tmp": "^0.2.6",
"@types/triple-beam": "^1.3.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-vscode/src/bundle/BundleInitWizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
TerminalLocation,
commands,
} from "vscode";
import {logging} from "@databricks/databricks-sdk";
import {logging} from "@databricks/sdk-experimental";
import {Loggers} from "../logger";
import {AuthProvider} from "../configuration/auth/AuthProvider";
import {LoginWizard} from "../configuration/LoginWizard";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import {
ListPipelineEventsRequest,
PipelineEvent,
UpdateInfo,
} from "@databricks/databricks-sdk/dist/apis/pipelines";
} from "@databricks/sdk-experimental/dist/apis/pipelines";
import {ConnectionManager} from "../configuration/ConnectionManager";
import {Barrier} from "../locking/Barrier";
import {WorkspaceClient} from "@databricks/databricks-sdk";
import {WorkspaceClient} from "@databricks/sdk-experimental";
import {LocalUri, RemoteUri} from "../sync/SyncDestination";
import {expandUriAndType, NotebookType} from "../utils/fileUtils";
import {onError} from "../utils/onErrorDecorator";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import os from "node:os";
import {ConnectionManager} from "../configuration/ConnectionManager";
import {ConfigModel} from "../configuration/models/ConfigModel";
import {BundleFileSet, getSubProjects} from "./BundleFileSet";
import {logging} from "@databricks/databricks-sdk";
import {logging} from "@databricks/sdk-experimental";
import {Loggers} from "../logger";
import {CachedValue} from "../locking/CachedValue";
import {CustomWhenContext} from "../vscode-objs/CustomWhenContext";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {BundleTarget, Resource, ResourceKey, Resources} from "../types";
import {AuthProvider} from "../../configuration/auth/AuthProvider";
import lodash from "lodash";
import {WorkspaceConfigs} from "../../vscode-objs/WorkspaceConfigs";
import {logging} from "@databricks/databricks-sdk";
import {logging} from "@databricks/sdk-experimental";
import {Loggers} from "../../logger";
import {WorkspaceFolderManager} from "../../vscode-objs/WorkspaceFolderManager";
import {CancellationToken} from "vscode";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import lodash from "lodash";
import {workspaceConfigs} from "../../vscode-objs/WorkspaceConfigs";
import {BaseModelWithStateCache} from "../../configuration/models/BaseModelWithStateCache";
import {withOnErrorHandler} from "../../utils/onErrorDecorator";
import {logging} from "@databricks/databricks-sdk";
import {logging} from "@databricks/sdk-experimental";
import {Loggers} from "../../logger";
import {WorkspaceFolderManager} from "../../vscode-objs/WorkspaceFolderManager";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {ConfigModel} from "../../configuration/models/ConfigModel";
import {Mutex} from "../../locking";
import {BundleSchema} from "../types";
import {readFile} from "fs/promises";
import {NamedLogger} from "@databricks/databricks-sdk/dist/logging";
import {NamedLogger} from "@databricks/sdk-experimental/dist/logging";
import {Loggers} from "../../logger";
import {onError} from "../../utils/onErrorDecorator";
import {BundleValidateModel} from "./BundleValidateModel";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {EventEmitter} from "vscode";
import {RunState} from "./types";
import {ResourceKey} from "../types";
import {BundleRemoteState} from "../models/BundleRemoteStateModel";
import {Time, TimeUnits} from "@databricks/databricks-sdk";
import {Time, TimeUnits} from "@databricks/sdk-experimental";
export abstract class BundleRunStatus {
abstract readonly type: ResourceKey<BundleRemoteState>;
protected readonly onDidChangeEmitter = new EventEmitter<void>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {BundleRunStatus} from "./BundleRunStatus";
import {PipelineRunStatus} from "./PipelineRunStatus";
import {Resource, ResourceKey} from "../types";
import {ConfigModel} from "../../configuration/models/ConfigModel";
import {logging} from "@databricks/databricks-sdk";
import {logging} from "@databricks/sdk-experimental";
import {Loggers} from "../../logger";
/**
* This class monitors the cli bundle run output and record ids for runs. It also polls for status of the these runs.
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-vscode/src/bundle/run/JobRunStatus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
JobsError,
JobsRetriableError,
Run,
} from "@databricks/databricks-sdk/dist/apis/jobs";
} from "@databricks/sdk-experimental/dist/apis/jobs";
import {Event, EventEmitter} from "vscode";
import {AuthProvider} from "../../configuration/auth/AuthProvider";
import {onError} from "../../utils/onErrorDecorator";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import {
Time,
TimeUnits,
WorkspaceClient,
} from "@databricks/databricks-sdk";
} from "@databricks/sdk-experimental";
import {
LinearRetryPolicy,
RetriableError,
} from "@databricks/databricks-sdk/dist/retries/retries";
} from "@databricks/sdk-experimental/dist/retries/retries";
import {Loggers} from "../../logger";

function isRunning(status?: pipelines.UpdateInfoState) {
Expand Down
4 changes: 2 additions & 2 deletions packages/databricks-vscode/src/cli/CliWrapper.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {CliWrapper, waitForProcess} from "./CliWrapper";
import path from "node:path";
import os from "node:os";
import crypto from "node:crypto";
import {Context} from "@databricks/databricks-sdk/dist/context";
import {logging} from "@databricks/databricks-sdk";
import {Context} from "@databricks/sdk-experimental/dist/context";
import {logging} from "@databricks/sdk-experimental";
import {LoggerManager} from "../logger";
import {ProfileAuthProvider} from "../configuration/auth/AuthProvider";
import {isMatch} from "lodash";
Expand Down
4 changes: 2 additions & 2 deletions packages/databricks-vscode/src/cli/CliWrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import {
} from "vscode";
import {workspaceConfigs} from "../vscode-objs/WorkspaceConfigs";
import {promisify} from "node:util";
import {logging} from "@databricks/databricks-sdk";
import {logging} from "@databricks/sdk-experimental";
import {LoggerManager, Loggers} from "../logger";
import {Context, context} from "@databricks/databricks-sdk/dist/context";
import {Context, context} from "@databricks/sdk-experimental/dist/context";
import {Cloud} from "../utils/constants";
import {EnvVarGenerators, FileUtils, UrlUtils} from "../utils";
import {AuthProvider} from "../configuration/auth/AuthProvider";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {logging} from "@databricks/databricks-sdk";
import {logging} from "@databricks/sdk-experimental";
import {EventEmitter} from "vscode";
import {Loggers} from "../logger";
import {SyncState} from "../sync";
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-vscode/src/cli/SyncParser.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "@databricks/databricks-sdk";
import "@databricks/sdk-experimental";
import assert from "assert";
import {mock, instance, capture, reset} from "ts-mockito";
import {EventEmitter} from "vscode";
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-vscode/src/cli/SyncTasks.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import "@databricks/databricks-sdk";
import "@databricks/sdk-experimental";
import * as assert from "assert";
import {instance, mock, when} from "ts-mockito";
import {Uri} from "vscode";
Expand Down
4 changes: 2 additions & 2 deletions packages/databricks-vscode/src/cli/SyncTasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import {CliWrapper, Command, SyncType} from "./CliWrapper";
import {ChildProcess, spawn, SpawnOptions} from "node:child_process";
import {SyncState} from "../sync/CodeSynchronizer";
import {DatabricksCliSyncParser} from "./DatabricksCliSyncParser";
import {logging} from "@databricks/databricks-sdk";
import {logging} from "@databricks/sdk-experimental";
import {Loggers} from "../logger";
import {Context, context} from "@databricks/databricks-sdk/dist/context";
import {Context, context} from "@databricks/sdk-experimental/dist/context";
import {PackageMetaData} from "../utils/packageJsonUtils";
import {RWLock} from "../locking";
import {EnvVarGenerators} from "../utils";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {mock, when, instance} from "ts-mockito";
import {ClusterModel} from "./ClusterModel";
import {Disposable} from "vscode";
import {ClusterListDataProvider} from "./ClusterListDataProvider";
import {ApiClient, compute} from "@databricks/databricks-sdk";
import {ApiClient, compute} from "@databricks/sdk-experimental";
import {Cluster} from "../sdk-extensions/Cluster";
import {resolveProviderResult} from "../test/utils";

Expand Down
27 changes: 18 additions & 9 deletions packages/databricks-vscode/src/cluster/ClusterLoader.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,16 @@ import {
compute,
iam,
WorkspaceClient,
} from "@databricks/databricks-sdk";
} from "@databricks/sdk-experimental";
import assert from "assert";
import {anything, instance, mock, spy, when} from "ts-mockito";
import {
anything,
instance,
mock,
objectContaining,
spy,
when,
} from "ts-mockito";
import {ConnectionManager} from "../configuration/ConnectionManager";
import {ClusterLoader} from "./ClusterLoader";

Expand Down Expand Up @@ -101,21 +108,23 @@ describe(__filename, () => {

when<compute.ListClustersResponse>(
mockedApiClient.request(
"/api/2.0/clusters/list",
"GET",
anything(),
objectContaining({
path: "/api/2.0/clusters/list",
method: "GET",
}),
anything()
) as Promise<compute.ListClustersResponse>
).thenResolve(mockListClustersResponse);
when(mockedConnectionManager.workspaceClient).thenReturn(
instance(mockedWorkspaceClient)
);
for (const [id, perms] of mockClusterPermissions.entries()) {
for (const [clusterId, perms] of mockClusterPermissions.entries()) {
when<iam.ObjectPermissions>(
mockedApiClient.request(
`/api/2.0/permissions/clusters/${id}`,
"GET",
anything(),
objectContaining({
path: `/api/2.0/permissions/clusters/${clusterId}`,
method: "GET",
}),
anything()
) as Promise<iam.ObjectPermissions>
).thenResolve(perms);
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-vscode/src/cluster/ClusterLoader.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/naming-convention */
import {Time, TimeUnits, logging} from "@databricks/databricks-sdk";
import {Time, TimeUnits, logging} from "@databricks/sdk-experimental";
import {Cluster} from "../sdk-extensions";
import {Disposable, Event, EventEmitter} from "vscode";
import {ConnectionManager} from "../configuration/ConnectionManager";
Expand Down
20 changes: 8 additions & 12 deletions packages/databricks-vscode/src/cluster/ClusterManager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ import {
Time,
TimeUnits,
retries,
} from "@databricks/databricks-sdk";
} from "@databricks/sdk-experimental";
import {Cluster} from "../sdk-extensions";
import {ClusterFixtures} from "../sdk-extensions/test";
import {
anything,
deepEqual,
instance,
mock,
objectContaining,
resetCalls,
verify,
when,
Expand All @@ -30,11 +30,9 @@ describe(__filename, async () => {
mockedClient = mock(ApiClient);
when(
mockedClient.request(
"/api/2.1/clusters/get",
"GET",
deepEqual({
// eslint-disable-next-line
cluster_id: testClusterDetails.cluster_id,
objectContaining({
path: "/api/2.1/clusters/get",
method: "GET",
}),
anything()
)
Expand All @@ -57,11 +55,9 @@ describe(__filename, async () => {
it("should start a cluster with progress", async () => {
when(
mockedClient.request(
"/api/2.1/clusters/get",
"GET",
deepEqual({
// eslint-disable-next-line
cluster_id: testClusterDetails.cluster_id,
objectContaining({
path: "/api/2.1/clusters/get",
method: "GET",
}),
anything()
)
Expand Down
4 changes: 2 additions & 2 deletions packages/databricks-vscode/src/cluster/ClusterManager.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {compute, Time, TimeUnits} from "@databricks/databricks-sdk";
import {compute, Time, TimeUnits} from "@databricks/sdk-experimental";
import {Cluster} from "../sdk-extensions";
import {CancellationTokenSource, Disposable} from "vscode";
import lodash from "lodash";
import {logging, context, Context} from "@databricks/databricks-sdk";
import {logging, context, Context} from "@databricks/sdk-experimental";
import {Loggers} from "../logger";
export class ClusterManager implements Disposable {
private cancellationTokenSource?: CancellationTokenSource;
Expand Down
22 changes: 17 additions & 5 deletions packages/databricks-vscode/src/cluster/ClusterModel.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,19 @@
/* eslint-disable @typescript-eslint/naming-convention */

import assert from "assert";
import {mock, when, anything, anyString, instance, spy} from "ts-mockito";
import {ApiClient, WorkspaceClient, compute} from "@databricks/databricks-sdk";
import {
mock,
when,
anything,
instance,
spy,
objectContaining,
} from "ts-mockito";
import {
ApiClient,
WorkspaceClient,
compute,
} from "@databricks/sdk-experimental";
import {Cluster} from "../sdk-extensions";
import {ClusterModel} from "./ClusterModel";
import {ConnectionManager} from "../configuration/ConnectionManager";
Expand Down Expand Up @@ -44,9 +55,10 @@ describe(__filename, () => {

when<compute.ListClustersResponse>(
mockedApiClient.request(
anyString(),
"GET",
anything(),
objectContaining({
path: "/api/2.0/clusters/list",
method: "GET",
}),
anything()
) as Promise<compute.ListClustersResponse>
).thenResolve(mockListClustersResponse);
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-vscode/src/cluster/ClusterModel.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/naming-convention */

import {compute} from "@databricks/databricks-sdk";
import {compute} from "@databricks/sdk-experimental";
import {Cluster} from "../sdk-extensions";
import {Disposable, Event, EventEmitter} from "vscode";
import {ConnectionManager} from "../configuration/ConnectionManager";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/naming-convention */
import {ApiClient} from "@databricks/databricks-sdk";
import {ApiClient} from "@databricks/sdk-experimental";
import {Cluster} from "../sdk-extensions";
import assert from "assert";
import {mock} from "ts-mockito";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
ApiClient,
logging,
AuthType as SdkAuthType,
} from "@databricks/databricks-sdk";
} from "@databricks/sdk-experimental";
import {Cluster} from "../sdk-extensions";
import {EventEmitter, window, Disposable} from "vscode";
import {CliWrapper, ProcessError} from "../cli/CliWrapper";
Expand Down
Loading