Bump CLI to 230, use verbose deploy (#1390)

## Changes Bump CLI to 230, use verbose deploy, regenerate the schema Note: new schema generator doesn't produce stable result, hence the huge amount of changed lines ## Tests Existing tests + manually for the CLI auth
databricks · Oct 14, 2024 · ca13f5e · ca13f5e
1 parent 96aaa71
commit ca13f5e
Show file tree

Hide file tree

Showing 7 changed files with 4,573 additions and 3,255 deletions.
diff --git a/packages/databricks-vscode/package.json b/packages/databricks-vscode/package.json
@@ -897,7 +897,7 @@
         "useYarn": false
     },
     "cli": {
-        "version": "0.228.1"
+        "version": "0.230.0"
     },
     "scripts": {
         "vscode:prepublish": "rm -rf out && yarn run package:compile && yarn run package:wrappers:write && yarn run package:jupyter-init-script:write && yarn run package:copy-webview-toolkit && yarn run generate-telemetry",

diff --git a/packages/databricks-vscode/src/bundle/BundleSchema.ts b/packages/databricks-vscode/src/bundle/BundleSchema.ts
diff --git a/packages/databricks-vscode/src/bundle/models/BundleValidateModel.ts b/packages/databricks-vscode/src/bundle/models/BundleValidateModel.ts
@@ -83,7 +83,9 @@ export class BundleValidateModel extends BaseModelWithStateCache<BundleValidateS
         ) as BundleTarget;
 
         return {
-            clusterId: validateOutput?.bundle?.compute_id,
+            clusterId:
+                validateOutput?.bundle?.compute_id ??
+                validateOutput?.bundle?.cluster_id,
             remoteRootPath: validateOutput?.workspace?.file_path,
             ...validateOutput,
         };

diff --git a/packages/databricks-vscode/src/cli/CliWrapper.ts b/packages/databricks-vscode/src/cli/CliWrapper.ts
@@ -602,6 +602,7 @@ export class CliWrapper {
                 "deploy",
                 "--target",
                 target,
+                "--verbose",
                 ...(force ? ["--force-lock"] : []),
             ],
             workspaceFolder,

diff --git a/packages/databricks-vscode/src/test/e2e/run_files.e2e.ts b/packages/databricks-vscode/src/test/e2e/run_files.e2e.ts
@@ -43,6 +43,9 @@ describe("Run files", async function () {
 
     beforeEach(async () => {
         await openFile("hello.py");
+        // We enable the run command when the active editor is changed.
+        // We wait here to avoid race conditions between the extension logic enabling this command and tests executing it.
+        await sleep(1000);
     });
 
     it("should run a python file on a cluster", async () => {
@@ -54,7 +57,6 @@ describe("Run files", async function () {
             .openDebugConsoleView();
 
         while (true) {
-            await dismissNotifications();
             await sleep(2000);
             const text = await (await debugOutput.elem).getHTML();
             if (text && text.includes("hello world")) {
@@ -66,7 +68,6 @@ describe("Run files", async function () {
     it("should run a python file as a workflow", async () => {
         const workbench = await driver.getWorkbench();
         await workbench.executeQuickPick("Databricks: Run File as Workflow");
-        await dismissNotifications();
         await waitForWorkflowWebview("hello world");
     });
 });
diff --git a/packages/databricks-vscode/src/test/e2e/run_notebooks.e2e.ts b/packages/databricks-vscode/src/test/e2e/run_notebooks.e2e.ts
@@ -1,6 +1,7 @@
 import path from "node:path";
 import * as fs from "fs/promises";
 import assert from "node:assert";
+import {sleep} from "wdio-vscode-service";
 import {
     dismissNotifications,
     openFile,
@@ -73,17 +74,21 @@ describe("Run notebooks", async function () {
 
     it("should run a notebook.py file as a workflow", async () => {
         await openFile("notebook.py");
+        // We enable the run command when the active editor is changed.
+        // We wait here to avoid race conditions between the extension logic enabling this command and tests executing it.
+        await sleep(1000);
         const workbench = await driver.getWorkbench();
         await workbench.executeQuickPick("Databricks: Run File as Workflow");
-        await dismissNotifications();
         await waitForWorkflowWebview("a/b c");
     });
 
     it("should run a notebook.ipynb file as a workflow", async () => {
         await openFile("notebook.ipynb");
+        // We enable the run command when the active editor is changed.
+        // We wait here to avoid race conditions between the extension logic enabling this command and tests executing it.
+        await sleep(1000);
         const workbench = await driver.getWorkbench();
         await workbench.executeQuickPick("Databricks: Run File as Workflow");
-        await dismissNotifications();
         await waitForWorkflowWebview("hello world");
     });
 });
diff --git a/packages/databricks-vscode/src/test/e2e/utils/commonUtils.ts b/packages/databricks-vscode/src/test/e2e/utils/commonUtils.ts
@@ -233,7 +233,23 @@ export function getUniqueResourceName(name?: string) {
 
 export async function waitForWorkflowWebview(expectedOutput: string) {
     const workbench = await browser.getWorkbench();
-    const webView = await workbench.getWebviewByTitle(/Databricks Job Run/);
+    const title = /Databricks Job Run/;
+    await browser.waitUntil(
+        async () => {
+            try {
+                const webView = await workbench.getWebviewByTitle(title);
+                return webView !== undefined;
+            } catch (e) {
+                return false;
+            }
+        },
+        {
+            timeout: 5_000,
+            interval: 1_000,
+            timeoutMsg: "Webview did not open",
+        }
+    );
+    const webView = await workbench.getWebviewByTitle(title);
     await webView.open();
 
     await browser.waitUntil(