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
1 change: 1 addition & 0 deletions packages/databricks-sdk-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"tmp-promise": "^3.0.3",
"ts-loader": "^9.3.1",
"ts-mocha": "^10.0.0",
"ts-node": "^10.9.1",
"typescript": "^4.7.4",
"uuid": "^8.3.2"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/naming-convention */

import {ExecutionContextService, CommandsService} from "..";
import * as assert from "assert";
import assert from "assert";

import {IntegrationTestSetup, sleep} from "../test/IntegrationTestSetup";

Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-sdk-js/src/apis/jobs.integ.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/naming-convention */

import {JobsService, DbfsService} from "..";
import assert = require("assert");
import assert from "assert";

import {IntegrationTestSetup, sleep} from "../test/IntegrationTestSetup";

Expand Down
4 changes: 2 additions & 2 deletions packages/databricks-sdk-js/src/auth/configFile.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* eslint-disable @typescript-eslint/naming-convention */

import assert = require("node:assert");
import assert from "node:assert";
import {loadConfigFile, resolveConfigFilePath} from "./configFile";
import {writeFile} from "node:fs/promises";
import {withFile} from "tmp-promise";
import {homedir} from "node:os";
import path = require("node:path");
import path from "node:path";

describe(__filename, () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-sdk-js/src/auth/configFile.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import path = require("node:path");
import path from "node:path";
import {readFile, stat} from "node:fs/promises";
import {parse} from "ini";
import {homedir} from "node:os";
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-sdk-js/src/auth/fromConfigFile.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import assert = require("node:assert");
import assert from "node:assert";
import {writeFile} from "node:fs/promises";
import {withFile} from "tmp-promise";
import {DEFAULT_PROFILE, fromConfigFile} from "./fromConfigFile";
Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-sdk-js/src/auth/fromEnv.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import assert = require("node:assert");
import assert from "node:assert";
import {CredentialsProviderError} from "./types";
import {fromEnv} from "./fromEnv";

Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-sdk-js/src/services/Cluster.integ.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/naming-convention */

import {Cluster} from "..";
import assert = require("assert");
import assert from "assert";

import {IntegrationTestSetup} from "../test/IntegrationTestSetup";

Expand Down
2 changes: 1 addition & 1 deletion packages/databricks-sdk-js/src/services/Command.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import EventEmitter = require("node:events");
import EventEmitter from "node:events";
import {CommandsService, CommandsStatusResponse} from "../apis/commands";
import {Language} from "../apis/executionContext";
import {ExecutionContext} from "./ExecutionContext";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/naming-convention */

import {ExecutionContext} from "..";
import * as assert from "assert";
import assert from "assert";

import {IntegrationTestSetup} from "../test/IntegrationTestSetup";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {DbfsService, Cluster, jobs, WorkflowRun, WorkspaceService} from "..";
import * as assert from "assert";
import assert from "assert";

import {IntegrationTestSetup} from "../test/IntegrationTestSetup";

Expand Down
3 changes: 3 additions & 0 deletions packages/databricks-sdk-js/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"declaration": true,
"module": "CommonJS",
"target": "ES6",
"moduleResolution": "Node",
"esModuleInterop": true,
"isolatedModules": true,
"lib": ["ES2020"],
"sourceMap": true,
"rootDir": "src",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/naming-convention */

import * as assert from "assert";
import assert from "assert";
import {mock, when, instance} from "ts-mockito";
import {ClusterModel} from "./ClusterModel";
import {Disposable, TreeItem} from "vscode";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/naming-convention */

import * as assert from "assert";
import assert from "assert";
import {mock, when, anything, anyString, instance, verify} from "ts-mockito";
import {ApiClient, cluster} from "@databricks/databricks-sdk";
import {ClusterModel} from "./ClusterModel";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/naming-convention */

import * as assert from "assert";
import assert from "assert";
import {mock, when, instance} from "ts-mockito";
import {Disposable} from "vscode";
import {ConfigurationDataProvider} from "./ConfigurationDataProvider";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
fromConfigFile,
ScimService,
} from "@databricks/databricks-sdk";
import {commands, EventEmitter, Uri, window, workspace} from "vscode";
import {commands, EventEmitter, window, workspace} from "vscode";
import {CliWrapper} from "../cli/CliWrapper";
import {ProjectConfigFile} from "./ProjectConfigFile";
import {selectProfile} from "./selectProfileWizard";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import path = require("node:path");
import fs = require("node:fs/promises");
import path from "node:path";
import fs from "node:fs/promises";

export interface ProjectConfig {
profile?: string;
Expand Down
4 changes: 2 additions & 2 deletions packages/databricks-vscode/src/test/e2e/configure.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import assert = require("node:assert");
import path = require("node:path");
import assert from "node:assert";
import path from "node:path";
import * as fs from "fs/promises";
import * as tmp from "tmp-promise";
import {
Expand Down
14 changes: 4 additions & 10 deletions packages/databricks-vscode/src/test/e2e/run_on_cluster.e2e.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import assert = require("node:assert");
import path = require("node:path");
import assert from "node:assert";
import path from "node:path";
import * as fs from "fs/promises";
import * as tmp from "tmp-promise";
import {
VSBrowser,
WebDriver,
ActivityBar,
InputBox,
Workbench,
} from "vscode-extension-tester";
import {openCommandPrompt, openFolder} from "./utils";
import {VSBrowser, WebDriver} from "vscode-extension-tester";
import {openFolder} from "./utils";

describe("Run python on cluster", function () {
// these will be populated by the before() function
Expand Down
6 changes: 3 additions & 3 deletions packages/databricks-vscode/src/test/e2e/scripts/e2e.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable @typescript-eslint/naming-convention */
import {spawn} from "child_process";
import * as assert from "assert";
import * as fs from "fs/promises";
import * as tmp from "tmp-promise";
import assert from "assert";
import fs from "fs/promises";
import tmp from "tmp-promise";

/**
* Create a temporary Databricks config file with values taken from environment variables
Expand Down
4 changes: 2 additions & 2 deletions packages/databricks-vscode/src/test/runTest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as path from "path";
import os = require("os");
import path from "path";
import os from "os";

import {runTests} from "@vscode/test-electron";

Expand Down
6 changes: 3 additions & 3 deletions packages/databricks-vscode/src/test/suite.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as path from "path";
import * as Mocha from "mocha";
import * as glob from "glob";
import path from "path";
import Mocha from "mocha";
import glob from "glob";

export function run(): Promise<void> {
// Create the mocha test
Expand Down
7 changes: 5 additions & 2 deletions packages/databricks-vscode/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "ES2020",
"module": "CommonJS",
"target": "ES6",
"moduleResolution": "Node",
"esModuleInterop": true,
"isolatedModules": true,
"lib": ["ES2020"],
"sourceMap": true,
"rootDir": "src",
Expand Down
1 change: 1 addition & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ __metadata:
tmp-promise: ^3.0.3
ts-loader: ^9.3.1
ts-mocha: ^10.0.0
ts-node: ^10.9.1
typescript: ^4.7.4
uuid: ^8.3.2
languageName: unknown
Expand Down