Use bricks cli for profile configuration (#78)

Author: kartikgupta-db

packages/databricks-vscode/src/cli/CliCommands.ts

@@ -7,9 +7,9 @@ export class CliCommands {
 
     constructor(private cli: CliWrapper) {}
 
-    testBricksCommand(context: ExtensionContext) {
+    testBricksCommand() {
         return () => {
-            const {command, args} = this.cli.getTestBricksCommand(context);
+            const {command, args} = this.cli.getTestBricksCommand();
             const cmd = spawn(command, args);
 
             cmd.stdout.on("data", (data) => {

packages/databricks-vscode/src/cli/CliWrapper.test.ts

@@ -1,12 +1,18 @@
 import * as assert from "assert";
 import {Uri} from "vscode";
 import {SyncDestination} from "../configuration/SyncDestination";
+import {ExtensionContext} from "vscode";
 
 import {CliWrapper} from "./CliWrapper";
+import {mock, spy} from "ts-mockito";
 
 describe(__filename, () => {
     it("should create sync command", () => {
-        const cli = new CliWrapper();
+        const cli = new CliWrapper({
+            asAbsolutePath(path: string) {
+                return path;
+            },
+        } as any);
         const mapper = new SyncDestination(
             Uri.from({
                 scheme: "dbws",
@@ -29,7 +35,11 @@ describe(__filename, () => {
     });
 
     it("should create full sync command", () => {
-        const cli = new CliWrapper();
+        const cli = new CliWrapper({
+            asAbsolutePath(path: string) {
+                return path;
+            },
+        } as any);
         const mapper = new SyncDestination(
             Uri.from({
                 scheme: "dbws",
@@ -52,7 +62,11 @@ describe(__filename, () => {
     });
 
     it("should create an 'add profile' command", () => {
-        const cli = new CliWrapper();
+        const cli = new CliWrapper({
+            asAbsolutePath(path: string) {
+                return path;
+            },
+        } as any);
 
         const {command, args} = cli.getAddProfileCommand(
             "DEFAULT",
@@ -61,7 +75,7 @@ describe(__filename, () => {
 
         assert.equal(
             [command, ...args].join(" "),
-            "databricks configure --profile DEFAULT --host https://databricks.com/ --token"
+            "./bin/bricks configure --no-interactive --profile DEFAULT --host https://databricks.com/ --token"
         );
     });
 });

packages/databricks-vscode/src/cli/CliWrapper.ts

@@ -14,11 +14,11 @@ export interface Command {
  * of the bricks CLI
  */
 export class CliWrapper {
-    constructor() {}
+    constructor(private context: ExtensionContext) {}
 
-    getTestBricksCommand(context: ExtensionContext): Command {
+    getTestBricksCommand(): Command {
         return {
-            command: context.asAbsolutePath("./bin/bricks"),
+            command: this.context.asAbsolutePath("./bin/bricks"),
             args: [],
         };
     }
@@ -53,9 +53,10 @@ export class CliWrapper {
 
     getAddProfileCommand(profile: string, host: URL): Command {
         return {
-            command: "databricks",
+            command: this.context.asAbsolutePath("./bin/bricks"),
             args: [
                 "configure",
+                "--no-interactive",
                 "--profile",
                 profile,
                 "--host",
@@ -76,7 +77,7 @@ export class CliWrapper {
                 stdio: ["pipe", 0, 0],
             });
 
-            child.stdin!.write(token);
+            child.stdin!.write(`${token}\n`);
             child.stdin!.end();
 
             child.on("error", reject);

packages/databricks-vscode/src/extension.ts

@@ -15,8 +15,7 @@ import {CodeSynchronizer} from "./sync/CodeSynchronizer";
 import {BricksTaskProvider} from "./cli/BricksTasks";
 
 export function activate(context: ExtensionContext) {
-    let cli = new CliWrapper();
-
+    let cli = new CliWrapper(context);
     // Configuration group
     let connectionManager = new ConnectionManager(cli);
     connectionManager.login(false);
@@ -173,7 +172,7 @@ export function activate(context: ExtensionContext) {
         ),
         commands.registerCommand(
             "databricks.cli.testBricksCli",
-            cliCommands.testBricksCommand(context),
+            cliCommands.testBricksCommand(),
             cliCommands
         )
     );