Revert "WIP: add serverless e2e tests"

This reverts commit 4a5db6c.

Author: ilia-db

packages/databricks-vscode/scripts/list_integration_tests.ts

@@ -21,7 +21,6 @@ const integrationTests = glob
         return {
             path: toUnixPath(path.relative(process.cwd(), testPath)),
             baseName: path.basename(testPath, ".e2e.ts"),
-            serverless: testPath.includes("serverless") ? true : false,
         };
     });
 

packages/databricks-vscode/src/test/e2e/run_files.serverless.e2e.ts

@@ -60,12 +60,10 @@ export function getBasicBundleConfig(
     topLevelComputeId = true
 ): BundleSchema {
     assert(process.env.DATABRICKS_HOST, "DATABRICKS_HOST doesn't exist");
-    if (!topLevelComputeId) {
-        assert(
-            process.env.TEST_DEFAULT_CLUSTER_ID,
-            "TEST_DEFAULT_CLUSTER_ID doesn't exist"
-        );
-    }
+    assert(
+        process.env.TEST_DEFAULT_CLUSTER_ID,
+        "TEST_DEFAULT_CLUSTER_ID doesn't exist"
+    );
     /* eslint-disable @typescript-eslint/naming-convention */
     const defaultBundleConfig = {
         bundle: {

packages/databricks-vscode/src/test/e2e/utils/dabsFixtures.ts

@@ -315,10 +315,7 @@ export const config: Options.Testrunner = {
             await config.ensureResolved();
 
             assert(config.host, "Config host must be set");
-            assert(
-                config.token || (config.clientId && config.clientSecret),
-                "Config must have a token or a clientId with clientSecret"
-            );
+            assert(config.token, "Config token must be set");
 
             assert(
                 process.env["TEST_DEFAULT_CLUSTER_ID"],
@@ -329,13 +326,8 @@ export const config: Options.Testrunner = {
             console.log(`Creating vscode workspace folder: ${WORKSPACE_PATH}`);
             await fs.mkdir(WORKSPACE_PATH, {recursive: true});
 
-            if (config.token) {
-                const client = getWorkspaceClient(config);
-                await startCluster(
-                    client,
-                    process.env["TEST_DEFAULT_CLUSTER_ID"]
-                );
-            }
+            const client = getWorkspaceClient(config);
+            await startCluster(client, process.env["TEST_DEFAULT_CLUSTER_ID"]);
 
             process.env.DATABRICKS_HOST = config.host!;
             process.env.DATABRICKS_VSCODE_INTEGRATION_TEST = "true";
@@ -607,17 +599,12 @@ export const config: Options.Testrunner = {
 
 async function writeDatabricksConfig(config: Config, rootPath: string) {
     const configFile = path.join(rootPath, ".databrickscfg");
-    let content = "[DEFAULT]\n";
-    if (config.token) {
-        content += `host = ${config.host!}\n`;
-        content += `token = ${config.token!}\n`;
-    } else {
-        content += `host = ${config.host!}\n`;
-        content += `client_id = ${config.clientId!}\n`;
-        content += `client_secret = ${config.clientSecret!}\n`;
-        content += `serverless_compute_id = auto\n`;
-    }
-    await fs.writeFile(configFile, content);
+    await fs.writeFile(
+        configFile,
+        `[DEFAULT]
+host = ${config.host!}
+token = ${config.token!}`
+    );
     return configFile;
 }