From 76ebe8e84d83db813d0ef375341f22c40ddf0ab0 Mon Sep 17 00:00:00 2001
From: Gene Lee <gelee@microsoft.com>
Date: Fri, 12 Jul 2019 17:06:06 -0600
Subject: [PATCH] Changed controller connection storage from config to memento
 in big data cluster extension (#6372)

---
 .../tree/controllerTreeDataProvider.ts        | 21 ++++++++++++-------
 extensions/big-data-cluster/src/extension.ts  |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/extensions/big-data-cluster/src/bigDataCluster/tree/controllerTreeDataProvider.ts b/extensions/big-data-cluster/src/bigDataCluster/tree/controllerTreeDataProvider.ts
index 759efc4adc..b6b3a3ae20 100644
--- a/extensions/big-data-cluster/src/bigDataCluster/tree/controllerTreeDataProvider.ts
+++ b/extensions/big-data-cluster/src/bigDataCluster/tree/controllerTreeDataProvider.ts
@@ -14,9 +14,15 @@ import { ControllerRootNode, ControllerNode } from './controllerTreeNode';
 import { IEndPoint } from '../controller/clusterControllerApi';
 import { showErrorMessage } from '../utils';
 
-const ConfigNamespace = 'clusterControllers';
 const CredentialNamespace = 'clusterControllerCredentials';
 
+interface IControllerInfoSlim {
+	url: string;
+	username: string;
+	password?: string;
+	rememberPassword: boolean;
+}
+
 export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeNode>, IControllerTreeChangeHandler {
 
 	private _onDidChangeTreeData: vscode.EventEmitter<TreeNode> = new vscode.EventEmitter<TreeNode>();
@@ -24,7 +30,7 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
 	private root: ControllerRootNode;
 	private credentialProvider: azdata.CredentialProvider;
 
-	constructor() {
+	constructor(private memento: vscode.Memento) {
 		this.root = new ControllerRootNode(this);
 		this.loadSavedControllers();
 	}
@@ -69,9 +75,8 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
 	}
 
 	public async loadSavedControllers(): Promise<void> {
-		let config = vscode.workspace.getConfiguration(ConfigNamespace);
-		if (config && config.controllers) {
-			let controllers = config.controllers;
+		let controllers: IControllerInfoSlim[] = this.memento.get('controllers');
+		if (controllers) {
 			this.root.clearChildren();
 			for (let c of controllers) {
 				let password = undefined;
@@ -90,7 +95,7 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
 	public async saveControllers(): Promise<void> {
 		let controllers = this.root.children.map(e => {
 			let controller = e as ControllerNode;
-			return {
+			return <IControllerInfoSlim>{
 				url: controller.url,
 				username: controller.username,
 				password: controller.password,
@@ -99,7 +104,7 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
 		});
 
 		let controllersWithoutPassword = controllers.map(e => {
-			return {
+			return <IControllerInfoSlim>{
 				url: e.url,
 				username: e.username,
 				rememberPassword: e.rememberPassword
@@ -107,7 +112,7 @@ export class ControllerTreeDataProvider implements vscode.TreeDataProvider<TreeN
 		});
 
 		try {
-			await vscode.workspace.getConfiguration(ConfigNamespace).update('controllers', controllersWithoutPassword, true);
+			await this.memento.update('controllers', controllersWithoutPassword);
 		} catch (error) {
 			showErrorMessage(error);
 		}
diff --git a/extensions/big-data-cluster/src/extension.ts b/extensions/big-data-cluster/src/extension.ts
index a5b937db2d..10018abeed 100644
--- a/extensions/big-data-cluster/src/extension.ts
+++ b/extensions/big-data-cluster/src/extension.ts
@@ -17,7 +17,7 @@ const localize = nls.loadMessageBundle();
 
 export function activate(extensionContext: vscode.ExtensionContext) {
 	IconPath.setExtensionContext(extensionContext);
-	let treeDataProvider = new ControllerTreeDataProvider();
+	let treeDataProvider = new ControllerTreeDataProvider(extensionContext.globalState);
 
 	registerTreeDataProvider(treeDataProvider);
 	registerCommands(treeDataProvider);