Reuse output panels (#150)

- re-use output panels
- move cluster URL generation to the SDK
- cleanup `job.html`

Author: fjakobs

packages/databricks-sdk-js/src/services/Cluster.test.ts

@@ -273,4 +273,40 @@ describe(__filename, function () {
             assert.deepEqual(cluster.dbrVersion, expectedDbr);
         }
     });
+
+    it("should return correct URLs", async () => {
+        const mockedClient = mock(ApiClient);
+        when(mockedClient.host).thenResolve(
+            new URL("https://test.cloud.databricks.com")
+        );
+        const clusterDetails = {
+            cluster_id: "1118-013127-82wynr8t",
+        };
+        const cluster = new Cluster(instance(mockedClient), clusterDetails);
+
+        assert.equal(
+            await cluster.url,
+            "https://test.cloud.databricks.com/#setting/clusters/1118-013127-82wynr8t/configuration"
+        );
+
+        assert.equal(
+            await cluster.driverLogsUrl,
+            "https://test.cloud.databricks.com/#setting/clusters/1118-013127-82wynr8t/driverLogs"
+        );
+
+        assert.equal(
+            await cluster.metricsUrl,
+            "https://test.cloud.databricks.com/#setting/clusters/1118-013127-82wynr8t/metrics"
+        );
+
+        assert.equal(
+            await cluster.getSparkUiUrl(),
+            "https://test.cloud.databricks.com/#setting/clusters/1118-013127-82wynr8t/sparkUi"
+        );
+
+        assert.equal(
+            await cluster.getSparkUiUrl("7189805239423176682"),
+            "https://test.cloud.databricks.com/#setting/sparkui/1118-013127-82wynr8t/driver-7189805239423176682"
+        );
+    });
 });

packages/databricks-sdk-js/src/services/Cluster.ts

@@ -42,11 +42,35 @@ export class Cluster {
 
     get url(): Promise<string> {
         return (async () =>
-            `${(await this.client.host).host}/#setting/clusters/${
+            `https://${(await this.client.host).host}/#setting/clusters/${
                 this.id
             }/configuration`)();
     }
 
+    get driverLogsUrl(): Promise<string> {
+        return (async () =>
+            `https://${(await this.client.host).host}/#setting/clusters/${
+                this.id
+            }/driverLogs`)();
+    }
+
+    get metricsUrl(): Promise<string> {
+        return (async () =>
+            `https://${(await this.client.host).host}/#setting/clusters/${
+                this.id
+            }/metrics`)();
+    }
+
+    async getSparkUiUrl(sparkContextId?: string): Promise<string> {
+        let host = (await this.client.host).host;
+
+        if (sparkContextId) {
+            return `https://${host}/#setting/sparkui/${this.id}/driver-${sparkContextId}`;
+        } else {
+            return `https://${host}/#setting/clusters/${this.id}/sparkUi`;
+        }
+    }
+
     get memoryMb(): number | undefined {
         return this.clusterDetails.cluster_memory_mb;
     }

packages/databricks-vscode/src/cluster/ClusterListDataProvider.test.ts

@@ -120,7 +120,7 @@ describe(__filename, () => {
             {
                 contextValue: "databricks-link",
                 description:
-                    "www.example.com/#setting/clusters/cluster-id-2/configuration",
+                    "https://www.example.com/#setting/clusters/cluster-id-2/configuration",
                 label: "URL:",
             },
             {

packages/databricks-vscode/src/extension.ts

@@ -2,7 +2,6 @@ import {
     commands,
     debug,
     ExtensionContext,
-    OutputChannel,
     tasks,
     window,
     workspace,

packages/databricks-vscode/src/run/DabaricksWorkflowDebugAdapter.ts

@@ -23,7 +23,7 @@ import {
 import {DebugProtocol} from "@vscode/debugprotocol";
 import {ConnectionManager} from "../configuration/ConnectionManager";
 import {Subject} from "./Subject";
-import {runAsWorkflow} from "./WorkflowOutputPanel";
+import {WorkflowRunner} from "./WorkflowRunner";
 import {promptForClusterStart} from "./prompts";
 import {CodeSynchronizer} from "../sync/CodeSynchronizer";
 
@@ -49,22 +49,27 @@ interface IAttachRequestArguments extends ILaunchRequestArguments {}
 export class DatabricksWorkflowDebugAdapterFactory
     implements DebugAdapterDescriptorFactory, Disposable
 {
+    private workflowRunner: WorkflowRunner;
+
     constructor(
         private connection: ConnectionManager,
-        private context: ExtensionContext,
-        private codeSynchronizer: CodeSynchronizer
-    ) {}
+        context: ExtensionContext,
+        codeSynchronizer: CodeSynchronizer
+    ) {
+        this.workflowRunner = new WorkflowRunner(context, codeSynchronizer);
+    }
 
-    dispose() {}
+    dispose() {
+        this.workflowRunner.dispose();
+    }
 
     createDebugAdapterDescriptor(
         _session: DebugSession
     ): ProviderResult<DebugAdapterDescriptor> {
         return new DebugAdapterInlineImplementation(
             new DatabricksWorkflowDebugSession(
                 this.connection,
-                this.context,
-                this.codeSynchronizer
+                this.workflowRunner
             )
         );
     }
@@ -77,8 +82,7 @@ export class DatabricksWorkflowDebugSession extends LoggingDebugSession {
 
     constructor(
         private connection: ConnectionManager,
-        private context: ExtensionContext,
-        private codeSynchronizer: CodeSynchronizer
+        private workflowRunner: WorkflowRunner
     ) {
         super();
     }
@@ -191,15 +195,13 @@ export class DatabricksWorkflowDebugSession extends LoggingDebugSession {
             return;
         }
 
-        await runAsWorkflow({
+        await this.workflowRunner.run({
             program: Uri.file(program),
             parameters,
             args,
             cluster,
             syncDestination: syncDestination,
-            context: this.context,
             token: this.token,
-            codeSynchronizer: this.codeSynchronizer,
         });
     }