[GH-15] Use terraformed cluster for tests (#37)

* rename environment variables to match those generated by terraform

Author: kartikgupta-db

.github/workflows/push.yml

@@ -65,7 +65,7 @@ jobs:
               env:
                   DATABRICKS_HOST: ${{ secrets.DATABRICKS_HOST }}
                   DATABRICKS_TOKEN: ${{ secrets.DATABRICKS_TOKEN }}
-                  DATABRICKS_CLUSTER_ID: ${{ secrets.DATABRICKS_CLUSTER_ID }}
+                  TEST_DEFAULT_CLUSTER_ID: ${{ secrets.TEST_DEFAULT_CLUSTER_ID }}
 
     test-extension:
         name: Test VSCode Extension
@@ -82,7 +82,7 @@ jobs:
             VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
             DATABRICKS_HOST: ${{ secrets.DATABRICKS_HOST }}
             DATABRICKS_TOKEN: ${{ secrets.DATABRICKS_TOKEN }}
-            DATABRICKS_CLUSTER_ID: ${{ secrets.DATABRICKS_CLUSTER_ID }}
+            TEST_DEFAULT_CLUSTER_ID: ${{ secrets.TEST_DEFAULT_CLUSTER_ID }}
 
         steps:
             - uses: actions/checkout@v3

packages/databricks-sdk-js/README.md

@@ -21,8 +21,8 @@ npm run test
 
 Most of the tests are integrations tests and must be run against a life cluster. To run the integration tests you need to configure the following environment variables:
 
-| Name                  | Value                                                                                                     |
-| --------------------- | --------------------------------------------------------------------------------------------------------- |
-| DATABRICKS_HOST       | Hostname of the Databricks workspace (starts with https://)                                               |
-| DATABRICKS_TOKEN      | Personal access token                                                                                     |
-| DATABRICKS_CLUSTER_ID | (optional) ID of a cluster to run the tests agains. If missing the tests will create a cluster on demand. |
+| Name                    | Value                                                                                                     |
+| ----------------------- | --------------------------------------------------------------------------------------------------------- |
+| DATABRICKS_HOST         | Hostname of the Databricks workspace (starts with https://)                                               |
+| DATABRICKS_TOKEN        | Personal access token                                                                                     |
+| TEST_DEFAULT_CLUSTER_ID | (optional) ID of a cluster to run the tests agains. If missing the tests will create a cluster on demand. |

packages/databricks-sdk-js/src/apis/executionContext.integ.ts

@@ -55,7 +55,7 @@ describe(__filename, function () {
         assert.equal(status.results.data, "juhu");
 
         await executionContextApi.destroy({
-            clusterId: "1118-013127-82wynr8t",
+            clusterId: integSetup.clusterId,
             contextId: context.id,
         });
     });

packages/databricks-sdk-js/src/auth/fromEnv.ts

@@ -1,14 +1,24 @@
 import {CredentialProvider, CredentialsProviderError} from "./types";
 
+function getValidHost(host: string) {
+    return !/https:\/\/.+/.test(host) && !/http:\/\/.+/.test(host)
+        ? `https://${host}`
+        : host;
+}
+
+function strip(strToStrip: string, str: string) {
+    return str.split(strToStrip).join("");
+}
+
 export const fromEnv = (): CredentialProvider => {
     return async () => {
         const host = process.env["DATABRICKS_HOST"];
         const token = process.env["DATABRICKS_TOKEN"];
 
         if (host && token) {
             return {
-                token: token,
-                host: new URL(host),
+                token: strip("'", token),
+                host: new URL(getValidHost(strip("'", host))),
             };
         }
 

packages/databricks-sdk-js/src/test/IntegrationTestSetup.ts

@@ -3,7 +3,6 @@
 import {v4 as uuidv4} from "uuid";
 import {ApiClient} from "../api-client";
 import {ClusterService} from "../apis/cluster";
-import {fromEnv} from "../auth/fromEnv";
 
 export class IntegrationTestSetup {
     readonly testRunId: string;
@@ -15,17 +14,17 @@ export class IntegrationTestSetup {
     private static _instance: IntegrationTestSetup;
     static async getInstance(): Promise<IntegrationTestSetup> {
         if (!this._instance) {
-            let clusterId;
             let client = new ApiClient();
             let clustersApi = new ClusterService(client);
 
-            if (!process.env["DATABRICKS_CLUSTER_ID"]) {
+            if (!process.env["TEST_DEFAULT_CLUSTER_ID"]) {
                 throw new Error(
-                    "Environment variable 'DATABRICKS_CLUSTER_ID' must be set"
+                    "Environment variable 'TEST_DEFAULT_CLUSTER_ID' must be set"
                 );
             }
 
-            clusterId = process.env["DATABRICKS_CLUSTER_ID"];
+            const clusterId =
+                process.env["TEST_DEFAULT_CLUSTER_ID"]!.split("'").join("");
             clustersApi.start({cluster_id: clusterId});
 
             // wait for cluster to be running

packages/databricks-vscode/src/test/e2e/run_on_cluster.e2e.ts

@@ -30,7 +30,7 @@ describe("Run python on cluster", function () {
         await fs.writeFile(
             path.join(projectDir, ".databricks", "project.json"),
             JSON.stringify({
-                clusterId: process.env["DATABRICKS_CLUSTER_ID"],
+                clusterId: process.env["TEST_DEFAULT_CLUSTER_ID"],
                 profile: "DEFAULT",
             })
         );

packages/databricks-vscode/src/test/e2e/scripts/e2e.ts

@@ -17,8 +17,8 @@ async function main(args: string[]) {
         "Environment variable DATABRICKS_TOKEN must be set"
     );
     assert(
-        process.env["DATABRICKS_CLUSTER_ID"],
-        "Environment variable DATABRICKS_CLUSTER_ID must be set"
+        process.env["TEST_DEFAULT_CLUSTER_ID"],
+        "Environment variable TEST_DEFAULT_CLUSTER_ID must be set"
     );
 
     const {path: configFile, cleanup} = await tmp.file();
@@ -32,7 +32,7 @@ token = ${process.env["DATABRICKS_TOKEN"]}`
 
         const child = spawn("extest", ["run-tests", ...args], {
             env: {
-                DATABRICKS_CLUSTER_ID: process.env["DATABRICKS_CLUSTER_ID"],
+                TEST_DEFAULT_CLUSTER_ID: process.env["TEST_DEFAULT_CLUSTER_ID"],
                 DATABRICKS_CONFIG_FILE: configFile,
                 PATH: process.env["PATH"],
             },