Remove sync destination logic (#1096)

ilia-db · web-flow · commit bb63006fb5f3 · 2024-02-28T11:51:27.000+01:00
CLI is now in charge of synchronisation
diff --git a/packages/databricks-vscode/src/configuration/ConnectionManager.ts b/packages/databricks-vscode/src/configuration/ConnectionManager.ts
@@ -284,9 +284,6 @@ export class ConnectionManager implements Disposable {
             authProvider
         );
         this._workspaceClient = authProvider.getWorkspaceClient();
-        await this._databricksWorkspace.optionalEnableFilesInReposPopup(
-            this._workspaceClient
-        );
         await this.configModel.set(
             "authProfile",
             authProvider.toJSON().profile as string | undefined
diff --git a/packages/databricks-vscode/src/configuration/DatabricksWorkspace.ts b/packages/databricks-vscode/src/configuration/DatabricksWorkspace.ts
@@ -1,9 +1,8 @@
 import {WorkspaceClient, iam, logging} from "@databricks/databricks-sdk";
 import {Cluster, WorkspaceConf, WorkspaceConfProps} from "../sdk-extensions";
 import {context, Context} from "@databricks/databricks-sdk";
-import {Uri, window, env} from "vscode";
+import {Uri} from "vscode";
 import {Loggers} from "../logger";
-import {workspaceConfigs} from "../vscode-objs/WorkspaceConfigs";
 import {AuthProvider} from "./auth/AuthProvider";
 import {RemoteUri} from "../sync/SyncDestination";
 
@@ -15,13 +14,10 @@ export class DatabricksWorkspace {
     ) {}
 
     /**
-     * The current root for sync destination folders. Return a Workspace path or a Repo path
-     * depending on whether files in workspace is enabled for VSCode UI.
+     * The current root for sync destination folders.
      */
     get currentFsRoot(): RemoteUri {
-        return workspaceConfigs.enableFilesInWorkspace
-            ? this.workspaceFsRoot
-            : this.repoRoot;
+        return this.workspaceFsRoot;
     }
 
     get workspaceFsRoot(): RemoteUri {
@@ -117,35 +113,4 @@ export class DatabricksWorkspace {
 
         return new DatabricksWorkspace(authProvider, me, state);
     }
-
-    public async optionalEnableFilesInReposPopup(
-        workspaceClient: WorkspaceClient
-    ) {
-        if (
-            workspaceConfigs.syncDestinationType === "repo" &&
-            (!this.isReposEnabled || !this.isFilesInReposEnabled)
-        ) {
-            let message = "";
-            if (!this.isReposEnabled) {
-                message =
-                    "Repos are not enabled for this workspace. Please enable it in the Databricks UI.";
-            } else if (!this.isFilesInReposEnabled) {
-                message =
-                    "Files in Repos is not enabled for this workspace. Please enable it in the Databricks UI.";
-            }
-            logging.NamedLogger.getOrCreate("Extension").error(message);
-            const result = await window.showWarningMessage(
-                message,
-                "Open Databricks UI"
-            );
-            if (result === "Open Databricks UI") {
-                const host = await workspaceClient.apiClient.host;
-                await env.openExternal(
-                    Uri.parse(
-                        host.toString() + "#setting/accounts/workspace-settings"
-                    )
-                );
-            }
-        }
-    }
 }
diff --git a/packages/databricks-vscode/src/extension.ts b/packages/databricks-vscode/src/extension.ts
@@ -24,11 +24,7 @@ import {logging} from "@databricks/databricks-sdk";
 import {workspaceConfigs} from "./vscode-objs/WorkspaceConfigs";
 import {FileUtils, PackageJsonUtils, UtilsCommands} from "./utils";
 import {ConfigureAutocomplete} from "./language/ConfigureAutocomplete";
-import {
-    WorkspaceFsAccessVerifier,
-    WorkspaceFsCommands,
-    WorkspaceFsDataProvider,
-} from "./workspace-fs";
+import {WorkspaceFsCommands, WorkspaceFsDataProvider} from "./workspace-fs";
 import {CustomWhenContext} from "./vscode-objs/CustomWhenContext";
 import {StateStorage} from "./vscode-objs/StateStorage";
 import path from "node:path";
@@ -224,19 +220,14 @@ export async function activate(
         bundleRemoteStateModel,
         configModel,
         connectionManager,
-        connectionManager.onDidChangeState(async (state) => {
+        connectionManager.onDidChangeState(async () => {
             telemetry.setMetadata(
                 Metadata.USER,
                 await toUserMetadata(connectionManager)
             );
             telemetry.recordEvent(Events.CONNECTION_STATE_CHANGED, {
                 newState: connectionManager.state,
             });
-            if (state === "CONNECTED") {
-                telemetry.recordEvent(Events.SYNC_DESTINATION, {
-                    destination: workspaceConfigs.syncDestinationType,
-                });
-            }
         })
     );
 
@@ -299,14 +290,6 @@ export async function activate(
 
     const clusterModel = new ClusterModel(connectionManager);
 
-    const wsfsAccessVerifier = new WorkspaceFsAccessVerifier(
-        connectionManager,
-        stateStorage,
-        telemetry
-    );
-
-    context.subscriptions.push(wsfsAccessVerifier);
-
     const dbConnectInstallPrompt = new DbConnectInstallPrompt(
         stateStorage,
         pythonExtensionWrapper
@@ -594,13 +577,11 @@ export async function activate(
         connectionManager,
         configModel,
         bundleCommands,
-        context,
-        wsfsAccessVerifier
+        context
     );
     const debugWorkflowFactory = new DatabricksWorkflowDebugAdapterFactory(
         connectionManager,
         configModel,
-        wsfsAccessVerifier,
         context,
         bundleCommands
     );
diff --git a/packages/databricks-vscode/src/run/DatabricksDebugAdapter.ts b/packages/databricks-vscode/src/run/DatabricksDebugAdapter.ts
@@ -20,7 +20,6 @@ import {
     ExtensionContext,
 } from "vscode";
 import {ConnectionManager} from "../configuration/ConnectionManager";
-import {WorkspaceFsAccessVerifier} from "../workspace-fs";
 import {DatabricksRuntime} from "./DatabricksRuntime";
 import {Subject} from "./Subject";
 import {BundleCommands} from "../ui/bundle-resource-explorer/BundleCommands";
@@ -50,8 +49,7 @@ export class DatabricksDebugAdapterFactory
         private connection: ConnectionManager,
         private configModel: ConfigModel,
         private bundleCommands: BundleCommands,
-        private context: ExtensionContext,
-        private wsfsAccessVerifier: WorkspaceFsAccessVerifier
+        private context: ExtensionContext
     ) {}
 
     dispose() {}
@@ -62,8 +60,7 @@ export class DatabricksDebugAdapterFactory
                 this.connection,
                 this.configModel,
                 this.bundleCommands,
-                this.context,
-                this.wsfsAccessVerifier
+                this.context
             )
         );
     }
@@ -78,17 +75,15 @@ export class DatabricksDebugSession extends LoggingDebugSession {
         connection: ConnectionManager,
         configModel: ConfigModel,
         bundleCommands: BundleCommands,
-        context: ExtensionContext,
-        wsfsAccessVerifier: WorkspaceFsAccessVerifier
+        context: ExtensionContext
     ) {
         super();
 
         this.runtime = new DatabricksRuntime(
             connection,
             configModel,
             bundleCommands,
-            context,
-            wsfsAccessVerifier
+            context
         );
 
         this.disposables.push(
diff --git a/packages/databricks-vscode/src/run/DatabricksRuntime.ts b/packages/databricks-vscode/src/run/DatabricksRuntime.ts
@@ -28,7 +28,6 @@ import {
 import * as fs from "node:fs/promises";
 import {parseErrorResult} from "./ErrorParser";
 import path from "node:path";
-import {WorkspaceFsAccessVerifier} from "../workspace-fs";
 import {Time, TimeUnits} from "@databricks/databricks-sdk";
 import {BundleCommands} from "../ui/bundle-resource-explorer/BundleCommands";
 import {ConfigModel} from "../configuration/models/ConfigModel";
@@ -100,8 +99,7 @@ export class DatabricksRuntime implements Disposable {
         private connection: ConnectionManager,
         private readonly configModel: ConfigModel,
         private bundleCommands: BundleCommands,
-        private context: ExtensionContext,
-        private wsfsAccessVerifier: WorkspaceFsAccessVerifier
+        private context: ExtensionContext
     ) {}
 
     /**
@@ -151,8 +149,6 @@ export class DatabricksRuntime implements Disposable {
                 return this._onErrorEmitter.fire(undefined);
             }
 
-            await this.wsfsAccessVerifier.verifyCluster(cluster);
-            await this.wsfsAccessVerifier.verifyWorkspaceConfigs();
             if (!["RUNNING", "RESIZING"].includes(cluster.state)) {
                 this._onErrorEmitter.fire(undefined);
                 promptForClusterStart();
diff --git a/packages/databricks-vscode/src/run/DatabricksWorkflowDebugAdapter.ts b/packages/databricks-vscode/src/run/DatabricksWorkflowDebugAdapter.ts
@@ -28,7 +28,6 @@ import {
     promptForClusterStart,
 } from "./prompts";
 import {LocalUri} from "../sync/SyncDestination";
-import {WorkspaceFsAccessVerifier} from "../workspace-fs";
 import {FileUtils} from "../utils";
 import {BundleCommands} from "../ui/bundle-resource-explorer/BundleCommands";
 import {ConfigModel} from "../configuration/models/ConfigModel";
@@ -58,7 +57,6 @@ export class DatabricksWorkflowDebugAdapterFactory
     constructor(
         private connection: ConnectionManager,
         private configModel: ConfigModel,
-        private wsfsAccessVerifier: WorkspaceFsAccessVerifier,
         context: ExtensionContext,
         bundleCommands: BundleCommands
     ) {
@@ -78,8 +76,7 @@ export class DatabricksWorkflowDebugAdapterFactory
             new DatabricksWorkflowDebugSession(
                 this.connection,
                 this.configModel,
-                this.workflowRunner,
-                this.wsfsAccessVerifier
+                this.workflowRunner
             )
         );
     }
@@ -93,8 +90,7 @@ export class DatabricksWorkflowDebugSession extends LoggingDebugSession {
     constructor(
         private connection: ConnectionManager,
         private configModel: ConfigModel,
-        private workflowRunner: WorkflowRunner,
-        private wsfsAccessVerifier: WorkspaceFsAccessVerifier
+        private workflowRunner: WorkflowRunner
     ) {
         super();
     }
@@ -203,8 +199,6 @@ export class DatabricksWorkflowDebugSession extends LoggingDebugSession {
         }
 
         await cluster.refresh();
-        await this.wsfsAccessVerifier.verifyCluster(cluster);
-        await this.wsfsAccessVerifier.verifyWorkspaceConfigs();
         if (!["RUNNING", "RESIZING"].includes(cluster.state)) {
             promptForClusterStart();
             return this.onError();
diff --git a/packages/databricks-vscode/src/run/WorkflowRunner.ts b/packages/databricks-vscode/src/run/WorkflowRunner.ts
@@ -16,7 +16,6 @@ import {WorkflowOutputPanel} from "./WorkflowOutputPanel";
 import Convert from "ansi-to-html";
 import {ConnectionManager} from "../configuration/ConnectionManager";
 import {WorkspaceFsWorkflowWrapper} from "../workspace-fs/WorkspaceFsWorkflowWrapper";
-import {workspaceConfigs} from "../vscode-objs/WorkspaceConfigs";
 import {BundleCommands} from "../ui/bundle-resource-explorer/BundleCommands";
 
 export class WorkflowRunner implements Disposable {
@@ -136,10 +135,7 @@ export class WorkflowRunner implements Disposable {
             if (notebookType) {
                 let remoteFilePath: string =
                     syncDestinationMapper.localToRemoteNotebook(program).path;
-                if (
-                    workspaceConfigs.enableFilesInWorkspace &&
-                    syncDestinationMapper.remoteUri.type === "workspace"
-                ) {
+                if (syncDestinationMapper.remoteUri.type === "workspace") {
                     const wrappedFile = await new WorkspaceFsWorkflowWrapper(
                         this.connectionManager,
                         this.context
@@ -170,7 +166,6 @@ export class WorkflowRunner implements Disposable {
                 const originalFileUri =
                     syncDestinationMapper.localToRemote(program);
                 const wrappedFile =
-                    workspaceConfigs.enableFilesInWorkspace &&
                     syncDestinationMapper.remoteUri.type === "workspace"
                         ? await new WorkspaceFsWorkflowWrapper(
                               this.connectionManager,
diff --git a/packages/databricks-vscode/src/vscode-objs/WorkspaceConfigs.ts b/packages/databricks-vscode/src/vscode-objs/WorkspaceConfigs.ts
@@ -1,5 +1,4 @@
 import {ConfigurationTarget, workspace} from "vscode";
-import {SyncDestinationType} from "../sync/SyncDestination";
 import {Time, TimeUnits} from "@databricks/databricks-sdk";
 
 export const workspaceConfigs = {
@@ -38,27 +37,7 @@ export const workspaceConfigs = {
                 .get<boolean>("clusters.onlyShowAccessibleClusters") ?? false
         );
     },
-    get syncDestinationType() {
-        return (
-            workspace
-                .getConfiguration("databricks")
-                .get<SyncDestinationType>("sync.destinationType") ?? "workspace"
-        );
-    },
-
-    get enableFilesInWorkspace() {
-        return this.syncDestinationType === "workspace";
-    },
 
-    async setSyncDestinationType(destinationType: SyncDestinationType) {
-        await workspace
-            .getConfiguration("databricks")
-            .update(
-                "sync.destinationType",
-                destinationType,
-                ConfigurationTarget.Workspace
-            );
-    },
     get databrickscfgLocation() {
         const config = workspace
             .getConfiguration("databricks")
diff --git a/packages/databricks-vscode/src/workspace-fs/WorkspaceFsAccessVerifier.ts b/packages/databricks-vscode/src/workspace-fs/WorkspaceFsAccessVerifier.ts
diff --git a/packages/databricks-vscode/src/workspace-fs/WorkspaceFsCommands.ts b/packages/databricks-vscode/src/workspace-fs/WorkspaceFsCommands.ts
diff --git a/packages/databricks-vscode/src/workspace-fs/createDirectoryWizard.ts b/packages/databricks-vscode/src/workspace-fs/createDirectoryWizard.ts
diff --git a/packages/databricks-vscode/src/workspace-fs/index.ts b/packages/databricks-vscode/src/workspace-fs/index.ts
