CMS fit and finish (#5542)

* cms connections dont save

* added value to enum

* remove refresh and update provider name for cms

* removed ownerUri from saved connection and contributed to array

* removed owneruri

* ownerUri not needed any more

* removed AAD from cms

* initial review

* changed comments

* add back saveProfile option for connectionProfile

* review fixes and other UI improvements

* fixed auth

* added cms integration tests

* added constants

* removed utils from apiwrapper

* changed connection type name

* review comments

* clearer code and addressed reviews

extensions/cms/src/apiWrapper.ts

@@ -12,6 +12,8 @@ import * as Utils from './cmsResource/utils';
 import { ICmsResourceNodeInfo } from './cmsResource/tree/baseTreeNodes';
 
 const localize = nls.loadMessageBundle();
+const cmsProvider: string = 'MSSQL-CMS';
+const mssqlProvider: string = 'MSSQL';
 
 /**
  * Wrapper class to act as a facade over VSCode and Data APIs and allow us to test / mock callbacks into
@@ -102,11 +104,11 @@ export class ApiWrapper {
 	 * @param resource The optional URI, as a URI object or a string, to use to get resource-scoped configurations
 	 */
 	public getConfiguration(): vscode.WorkspaceConfiguration {
-		return vscode.workspace.getConfiguration('cms');
+		return vscode.workspace.getConfiguration('centralManagementServers');
 	}
 
 	public async setConfiguration(value: any): Promise<void> {
-		await vscode.workspace.getConfiguration('cms').update('cmsServers', value, true);
+		await vscode.workspace.getConfiguration('centralManagementServers').update('servers', value, true);
 	}
 
 	/**
@@ -156,7 +158,7 @@ export class ApiWrapper {
 	}
 
 	public showWarningMessage(message: string, ...items: string[]): Thenable<string | undefined> {
-		return vscode.window.showWarningMessage(message, ...items);
+		return vscode.window.showWarningMessage(message, { modal: true }, ...items);
 	}
 
 	public showInformationMessage(message: string, ...items: string[]): Thenable<string | undefined> {
@@ -178,153 +180,4 @@ export class ApiWrapper {
 	public registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, ...triggerCharacters: string[]): vscode.Disposable {
 		return vscode.languages.registerCompletionItemProvider(selector, provider, ...triggerCharacters);
 	}
-
-	// Connection APIs
-	public openConnectionDialog(providers: string[], initialConnectionProfile?: azdata.IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Thenable<azdata.connection.Connection> {
-		return azdata.connection.openConnectionDialog(providers, initialConnectionProfile, connectionCompletionOptions);
-	}
-
-	// CMS APIs
-	public async getCmsService(): Promise<mssql.CmsService> {
-		if (!this._cmsService) {
-			let extensionApi: mssql.MssqlExtensionApi = vscode.extensions.getExtension('Microsoft.mssql').exports;
-			this._cmsService = await extensionApi.getCmsServiceProvider();
-		}
-		return this._cmsService;
-	}
-
-	public async getRegisteredServers(ownerUri: string, relativePath: string): Promise<mssql.ListRegisteredServersResult> {
-		return this.getCmsService().then((service) => {
-			return service.getRegisteredServers(ownerUri, relativePath).then((result) => {
-				if (result && result.registeredServersList && result.registeredServersList) {
-					return result;
-				}
-			});
-		});
-	}
-
-	public async createCmsServer(connection: azdata.connection.Connection,
-		name: string, description: string): Promise<mssql.ListRegisteredServersResult> {
-		let provider = await this.getCmsService();
-		connection.providerName = connection.providerName === 'MSSQL-CMS' ? 'MSSQL' : connection.providerName;
-		let ownerUri = await azdata.connection.getUriForConnection(connection.connectionId);
-		if (!ownerUri) {
-			// Make a connection if it's not already connected
-			await azdata.connection.connect(Utils.toConnectionProfile(connection), false, false).then(async (result) => {
-				ownerUri = await azdata.connection.getUriForConnection(result.connectionId);
-			});
-		}
-		return provider.createCmsServer(name, description, connection, ownerUri).then((result) => {
-			if (result) {
-				return result;
-			}
-		});
-	}
-
-	public async deleteCmsServer(cmsServer: any) {
-		let config = this.getConfiguration();
-		if (config && config.cmsServers) {
-			let newServers = config.cmsServers.filter((cachedServer) => {
-				return cachedServer.name !== cmsServer;
-			});
-			await this.setConfiguration(newServers);
-			this._registeredCmsServers = this._registeredCmsServers.filter((cachedServer) => {
-				return cachedServer.name !== cmsServer;
-			});
-		}
-	}
-
-	public cacheRegisteredCmsServer(name: string, description: string, ownerUri: string, connection: azdata.connection.Connection): void {
-		if (!this._registeredCmsServers) {
-			this._registeredCmsServers = [];
-		}
-		let cmsServerNode: ICmsResourceNodeInfo = {
-			name: name,
-			description: description,
-			ownerUri: ownerUri,
-			connection: connection
-		};
-		this._registeredCmsServers.push(cmsServerNode);
-	}
-
-	public async addRegisteredServer(relativePath: string, ownerUri: string,
-		parentServerName?: string): Promise<any> {
-		let provider = await this.getCmsService();
-		// Initial profile to disallow SQL Login without
-		// changing provider.
-		let initialProfile: azdata.IConnectionProfile = {
-			connectionName: undefined,
-			serverName: undefined,
-			databaseName: undefined,
-			userName: undefined,
-			password: undefined,
-			authenticationType: undefined,
-			savePassword: undefined,
-			groupFullName: undefined,
-			groupId: undefined,
-			providerName: undefined,
-			saveProfile: undefined,
-			id: undefined,
-			options: {
-				authTypeChanged: true
-			}
-		};
-		return this.openConnectionDialog(['MSSQL-CMS'], initialProfile, undefined).then((connection) => {
-			if (connection && connection.options) {
-				if (connection.options.server === parentServerName) {
-					// error out for same server registration
-					let errorText = localize('cms.errors.sameServerUnderCms', 'You cannot add a shared registered server with the same name as the Configuration Server');
-					this.showErrorMessage(errorText);
-					return;
-				} else {
-					return provider.addRegisteredServer(ownerUri, relativePath,
-						connection.options.registeredServerName, connection.options.registeredServerDescription, connection).then((result) => {
-							if (result) {
-								return connection.options.server;
-							}
-						});
-				}
-
-			}
-		});
-	}
-
-	public async removeRegisteredServer(registeredServerName: string, relativePath: string, ownerUri: string): Promise<boolean> {
-		let provider = await this.getCmsService();
-		return provider.removeRegisteredServer(ownerUri, relativePath, registeredServerName).then((result) => {
-			return result;
-		});
-	}
-
-	public async addServerGroup(groupName: string, groupDescription: string, relativePath: string, ownerUri: string): Promise<boolean> {
-		let provider = await this.getCmsService();
-		return provider.addServerGroup(ownerUri, relativePath, groupName, groupDescription).then((result) => {
-			return result;
-		});
-	}
-
-	public async removeServerGroup(groupName: string, relativePath: string, ownerUri: string): Promise<boolean> {
-		let provider = await this.getCmsService();
-		return provider.removeServerGroup(ownerUri, relativePath, groupName).then((result) => {
-			return result;
-		});
-	}
-
-	// Getters
-
-	public get registeredCmsServers(): ICmsResourceNodeInfo[] {
-		return this._registeredCmsServers;
-	}
-
-	public get connection(): Thenable<azdata.connection.Connection> {
-		return this.openConnectionDialog(['MSSQL-CMS'], undefined, undefined).then((connection) => {
-			if (connection) {
-				// remove group ID from connection if a user chose connection
-				// from the recent connections list
-				connection.options['groupId'] = null;
-				connection.providerName = 'MSSQL';
-				return connection;
-			}
-		});
-	}
 }

extensions/cms/src/appContext.ts

@@ -7,13 +7,19 @@
 
 import * as vscode from 'vscode';
 import { ApiWrapper } from './apiWrapper';
+import { CmsUtils } from './cmsUtils';
 
 /**
  * Global context for the application
  */
 export class AppContext {
 
-	constructor(public readonly extensionContext: vscode.ExtensionContext, public readonly apiWrapper: ApiWrapper) {
+	constructor(
+		public readonly extensionContext: vscode.ExtensionContext,
+		public readonly apiWrapper: ApiWrapper,
+		public readonly cmsUtils: CmsUtils
+	) {
 		this.apiWrapper = apiWrapper || new ApiWrapper();
+		this.cmsUtils = cmsUtils || new CmsUtils();
 	}
 }

extensions/cms/src/cmsResource/cmsResourceCommands.ts

@@ -22,12 +22,12 @@ export function registerCmsServerCommand(appContext: AppContext, tree: CmsResour
 		if (node && !(node instanceof CmsResourceEmptyTreeNode)) {
 			return;
 		}
-		await appContext.apiWrapper.connection.then(async (connection) => {
+		await appContext.cmsUtils.connection.then(async (connection) => {
 			if (connection && connection.options) {
 				let registeredCmsServerName = connection.options.registeredServerName ?
 					connection.options.registeredServerName : connection.options.server;
 				// check if a CMS with the same name is registered or not
-				let cachedServers = appContext.apiWrapper.registeredCmsServers;
+				let cachedServers = appContext.cmsUtils.registeredCmsServers;
 				let serverExists: boolean = false;
 				if (cachedServers) {
 					serverExists = cachedServers.some((server) => {
@@ -42,7 +42,7 @@ export function registerCmsServerCommand(appContext: AppContext, tree: CmsResour
 					// remove server description from connection uri
 					connection.options.registeredCmsServerDescription = null;
 					let ownerUri = await azdata.connection.getUriForConnection(connection.connectionId);
-					appContext.apiWrapper.cacheRegisteredCmsServer(registeredCmsServerName, registeredCmsServerDescription, ownerUri, connection);
+					appContext.cmsUtils.cacheRegisteredCmsServer(registeredCmsServerName, registeredCmsServerDescription, ownerUri, connection);
 					tree.notifyNodeChanged(undefined);
 				} else {
 					// error out for same server name
@@ -61,7 +61,7 @@ export function deleteCmsServerCommand(appContext: AppContext, tree: CmsResource
 		if (!(node instanceof CmsResourceTreeNode)) {
 			return;
 		}
-		await appContext.apiWrapper.deleteCmsServer(node.name);
+		await appContext.cmsUtils.deleteCmsServer(node.name);
 		tree.isSystemInitialized = false;
 		tree.notifyNodeChanged(undefined);
 	});
@@ -75,9 +75,9 @@ export function addRegisteredServerCommand(appContext: AppContext, tree: CmsReso
 		}
 		let relativePath = node instanceof CmsResourceTreeNode ? '' : node.relativePath;
 		let serverName = node instanceof CmsResourceTreeNode ? node.connection.options.server : null;
-		await appContext.apiWrapper.addRegisteredServer(relativePath, node.ownerUri, serverName).then((result) => {
+		await appContext.cmsUtils.addRegisteredServer(relativePath, node.ownerUri, serverName).then((result) => {
 			if (result) {
-				tree.notifyNodeChanged(undefined);
+				tree.notifyNodeChanged(node);
 			}
 		});
 	});
@@ -89,11 +89,18 @@ export function deleteRegisteredServerCommand(appContext: AppContext, tree: CmsR
 		if (!(node instanceof RegisteredServerTreeNode)) {
 			return;
 		}
-		appContext.apiWrapper.removeRegisteredServer(node.name, node.relativePath, node.ownerUri).then((result) => {
-			if (result) {
-				tree.notifyNodeChanged(undefined);
-			}
-		});
+		appContext.apiWrapper.showWarningMessage(
+			`${localize('cms.confirmDeleteServer', 'Are you sure you want to delete')} ${node.name}?`,
+			localize('cms.yes', 'Yes'),
+			localize('cms.no', 'No')).then((result) => {
+				if (result && result === localize('cms.yes', 'Yes')) {
+					appContext.cmsUtils.removeRegisteredServer(node.name, node.relativePath, node.ownerUri).then((result) => {
+						if (result) {
+							tree.notifyNodeChanged(node.parent);
+						}
+					});
+				}
+			});
 	});
 }
 
@@ -144,9 +151,9 @@ export function addServerGroupCommand(appContext: AppContext, tree: CmsResourceT
 				groupExists = true;
 			}
 			if (!groupExists) {
-				appContext.apiWrapper.addServerGroup(serverGroupName, serverDescription, path, node.ownerUri).then((result) => {
+				appContext.cmsUtils.addServerGroup(serverGroupName, serverDescription, path, node.ownerUri).then((result) => {
 					if (result) {
-						tree.notifyNodeChanged(undefined);
+						tree.notifyNodeChanged(node);
 					}
 				});
 			} else {
@@ -165,11 +172,18 @@ export function deleteServerGroupCommand(appContext: AppContext, tree: CmsResour
 		if (!(node instanceof ServerGroupTreeNode)) {
 			return;
 		}
-		appContext.apiWrapper.removeServerGroup(node.name, node.relativePath, node.ownerUri).then((result) => {
-			if (result) {
-				tree.notifyNodeChanged(undefined);
-			}
-		});
+		appContext.apiWrapper.showWarningMessage(
+			`${localize('cms.confirmDeleteGroup', 'Are you sure you want to delete')} ${node.name}?`,
+			localize('cms.yes', 'Yes'),
+			localize('cms.no', 'No')).then((result) => {
+				if (result && result === localize('cms.yes', 'Yes')) {
+					appContext.cmsUtils.removeServerGroup(node.name, node.relativePath, node.ownerUri).then((result) => {
+						if (result) {
+							tree.notifyNodeChanged(node.parent);
+						}
+					});
+				}
+			});
 	});
 }
 
@@ -179,7 +193,7 @@ export function refreshCommand(appContext: AppContext, tree: CmsResourceTreeProv
 		if (!node) {
 			return;
 		}
-		tree.notifyNodeChanged(undefined);
+		tree.notifyNodeChanged(node);
 	});
 }
 

extensions/cms/src/cmsResource/constants.ts

@@ -8,7 +8,7 @@
 export enum CmsResourceItemType {
 	cmsMessageNodeContainer = 'cms.resource.itemType.cmsMessageNodeContainer',
 	cmsEmptyNodeContainer = 'cms.resource.itemType.cmsEmptyNodeContainer',
-	cmsNodeContainer = 'cms.resource.itemType.cmsNodeContainer',
-	registeredServer = 'cms.resource.itemType.registeredServer',
+	cmsNodeContainer = 'cms.resource.itemType.databaseServerContainer',
+	registeredServer = 'cms.resource.itemType.databaseServer',
 	serverGroup = 'cms.resource.itemType.serverGroup'
 }

extensions/cms/src/cmsResource/tree/baseTreeNodes.ts

@@ -8,19 +8,23 @@ import * as azdata from 'azdata';
 import { AppContext } from '../../appContext';
 import { TreeNode } from '../treeNode';
 import { ICmsResourceTreeChangeHandler } from './treeChangeHandler';
+import { generateGuid } from '../utils';
 
 export abstract class CmsResourceTreeNodeBase extends TreeNode {
 
+	protected _id: string = undefined;
+
 	public constructor(
 		private _name: string,
 		private _description: string,
-		private _ownerUri: string,
+		protected _ownerUri: string,
 		public readonly appContext: AppContext,
 		public readonly treeChangeHandler: ICmsResourceTreeChangeHandler,
 		parent: TreeNode
 	) {
 		super();
 		this.parent = parent;
+		this._id = generateGuid();
 	}
 
 	public get name(): string {

extensions/cms/src/cmsResource/tree/cmsResourceTreeNode.ts

@@ -20,7 +20,6 @@ const localize = nls.loadMessageBundle();
 
 export class CmsResourceTreeNode extends CmsResourceTreeNodeBase {
 
-	private _id: string = undefined;
 	private _serverGroupNodes: ServerGroupTreeNode[] = [];
 
 	public constructor(
@@ -33,13 +32,15 @@ export class CmsResourceTreeNode extends CmsResourceTreeNodeBase {
 		parent: TreeNode
 	) {
 		super(name, description, ownerUri, appContext, treeChangeHandler, parent);
-		this._id = `cms_cmsServer_${this.name}`;
 	}
 
 	public async getChildren(): Promise<TreeNode[]> {
 		try {
-			let nodes: TreeNode[] = [];
-			return this.appContext.apiWrapper.createCmsServer(this.connection, this.name, this.description).then(async (result) => {
+			let nodes: CmsResourceTreeNodeBase[] = [];
+			if (!this.ownerUri) {
+				this._ownerUri = await this.appContext.cmsUtils.getUriForConnection(this.connection);
+			}
+			return this.appContext.cmsUtils.createCmsServer(this.connection, this.name, this.description).then((result) => {
 				if (result) {
 					if (result.registeredServersList) {
 						result.registeredServersList.forEach((registeredServer) => {
@@ -70,7 +71,7 @@ export class CmsResourceTreeNode extends CmsResourceTreeNodeBase {
 						}
 					}
 					if (nodes.length > 0) {
-						return nodes;
+						return nodes.sort((node1, node2) => node1.name > node2.name ? 1 : -1);
 					} else {
 						return [CmsResourceMessageTreeNode.create(CmsResourceTreeNode.noResourcesLabel, undefined)];
 					}

extensions/cms/src/cmsResource/tree/registeredServerTreeNode.ts

@@ -11,12 +11,9 @@ import { CmsResourceItemType } from '../constants';
 import { CmsResourceTreeNodeBase } from './baseTreeNodes';
 import { AppContext } from '../../appContext';
 import { ICmsResourceTreeChangeHandler } from './treeChangeHandler';
-import { generateGuid } from '../utils';
 
 export class RegisteredServerTreeNode extends CmsResourceTreeNodeBase {
 
-	private _id: string = undefined;
-
 	constructor(
 		name: string,
 		description: string,
@@ -28,7 +25,6 @@ export class RegisteredServerTreeNode extends CmsResourceTreeNodeBase {
 		parent: TreeNode
 	) {
 		super(name, description, ownerUri, appContext, treeChangeHandler, parent);
-		this._id = `cms_registeredServer_${this.name ? this.name : this.serverName}`;
 	}
 
 	public async getChildren(): Promise<TreeNode[]> {
@@ -37,7 +33,7 @@ export class RegisteredServerTreeNode extends CmsResourceTreeNodeBase {
 
 	public getTreeItem(): azdata.TreeItem | Promise<azdata.TreeItem> {
 		let payload = {
-			id: generateGuid(),
+			id: this._id,
 			connectionName: this.name ? this.name : this.serverName,
 			serverName: this.serverName,
 			databaseName: '',

extensions/cms/src/cmsResource/tree/serverGroupTreeNode.ts

@@ -18,7 +18,6 @@ import { CmsResourceTreeNode } from './cmsResourceTreeNode';
 
 export class ServerGroupTreeNode extends CmsResourceTreeNodeBase {
 
-	private _id: string = undefined;
 	private _serverGroupNodes: ServerGroupTreeNode[] = [];
 
 	constructor(
@@ -31,12 +30,11 @@ export class ServerGroupTreeNode extends CmsResourceTreeNodeBase {
 		parent: TreeNode
 	) {
 		super(name, description, ownerUri, appContext, treeChangeHandler, parent);
-		this._id = `cms_serverGroup_${this.name}`;
 	}
 	public getChildren(): TreeNode[] | Promise<TreeNode[]> {
 		try {
 			let nodes = [];
-			return this.appContext.apiWrapper.getRegisteredServers(this.ownerUri, this.relativePath).then((result) => {
+			return this.appContext.cmsUtils.getRegisteredServers(this.ownerUri, this.relativePath).then((result) => {
 				if (result) {
 					if (result.registeredServersList) {
 						result.registeredServersList.forEach((registeredServer) => {
@@ -86,7 +84,7 @@ export class ServerGroupTreeNode extends CmsResourceTreeNodeBase {
 		item.id = this._id;
 		item.tooltip = this.description;
 		item.iconPath = {
-			dark: this.appContext.extensionContext.asAbsolutePath('resources/light/folder.svg'),
+			dark: this.appContext.extensionContext.asAbsolutePath('resources/dark/folder_inverse.svg'),
 			light: this.appContext.extensionContext.asAbsolutePath('resources/light/folder.svg')
 		};
 		return item;

extensions/cms/src/cmsResource/tree/treeProvider.ts

@@ -35,18 +35,18 @@ export class CmsResourceTreeProvider implements TreeDataProvider<TreeNode>, ICms
 				// Call to collect all locally saved CMS servers
 				// to determine whether the system has been initialized.
 				let cmsConfig = this._appContext.apiWrapper.getConfiguration();
-				let cachedServers = cmsConfig ? cmsConfig.cmsServers : [];
+				let cachedServers = cmsConfig.servers ? cmsConfig.servers : [];
 				if (cachedServers && cachedServers.length > 0) {
 					let servers = [];
-					cachedServers.forEach((server) => {
+					cachedServers.forEach(async (server) => {
 						servers.push(new CmsResourceTreeNode(
 							server.name,
 							server.description,
-							server.ownerUri,
+							undefined,
 							server.connection,
 							this._appContext, this, null));
-						this.appContext.apiWrapper.cacheRegisteredCmsServer(server.name, server.description,
-							server.ownerUri, server.connection);
+						this.appContext.cmsUtils.cacheRegisteredCmsServer(server.name, server.description,
+							undefined, server.connection);
 					});
 					return servers;
 				}
@@ -59,11 +59,16 @@ export class CmsResourceTreeProvider implements TreeDataProvider<TreeNode>, ICms
 			return [CmsResourceMessageTreeNode.create(CmsResourceTreeProvider.loadingLabel, undefined)];
 		}
 		try {
-			let registeredCmsServers = this.appContext.apiWrapper.registeredCmsServers;
+			let registeredCmsServers = this.appContext.cmsUtils.registeredCmsServers;
 			if (registeredCmsServers && registeredCmsServers.length > 0) {
 				this.isSystemInitialized = true;
 				// save the CMS Servers for future use
-				await this._appContext.apiWrapper.setConfiguration(registeredCmsServers);
+				let toSaveCmsServers = JSON.parse(JSON.stringify(registeredCmsServers));
+				toSaveCmsServers.forEach(server => {
+					server.ownerUri = undefined,
+						server.connection.options.password = '';
+				});
+				await this._appContext.apiWrapper.setConfiguration(toSaveCmsServers);
 				return registeredCmsServers.map((server) => {
 					return new CmsResourceTreeNode(
 						server.name,
@@ -71,10 +76,9 @@ export class CmsResourceTreeProvider implements TreeDataProvider<TreeNode>, ICms
 						server.ownerUri,
 						server.connection,
 						this._appContext, this, null);
-				});
+				}).sort((a, b) => a.name.localeCompare(b.name));
 			} else {
 				return [new CmsResourceEmptyTreeNode()];
-
 			}
 		} catch (error) {
 			return [new CmsResourceEmptyTreeNode()];

extensions/cms/src/cmsUtils.ts

@@ -0,0 +1,202 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+import * as nls from 'vscode-nls';
+import * as vscode from 'vscode';
+import * as azdata from 'azdata';
+import * as mssql from '../../mssql/src/api/mssqlapis';
+import * as Utils from './cmsResource/utils';
+import { ICmsResourceNodeInfo } from './cmsResource/tree/baseTreeNodes';
+
+const localize = nls.loadMessageBundle();
+const cmsProvider: string = 'MSSQL-CMS';
+const mssqlProvider: string = 'MSSQL';
+
+/**
+ * Wrapper class to act as a facade over VSCode and Data APIs and allow us to test / mock callbacks into
+ * this API from our code
+ *
+ * @export
+ * ApiWrapper
+ */
+export class CmsUtils {
+
+	private _cmsService: mssql.CmsService;
+	private _registeredCmsServers: ICmsResourceNodeInfo[];
+
+	public showErrorMessage(message: string, ...items: string[]): Thenable<string | undefined> {
+		return vscode.window.showErrorMessage(message, ...items);
+	}
+
+	/**
+	 * Get the configuration for a extensionName
+	 * @param extensionName The string name of the extension to get the configuration for
+	 * @param resource The optional URI, as a URI object or a string, to use to get resource-scoped configurations
+	 */
+	public getConfiguration(): vscode.WorkspaceConfiguration {
+		return vscode.workspace.getConfiguration('centralManagementServers');
+	}
+
+	public async setConfiguration(value: any): Promise<void> {
+		await vscode.workspace.getConfiguration('centralManagementServers').update('servers', value, true);
+	}
+
+	// Connection APIs
+	public openConnectionDialog(providers: string[], initialConnectionProfile?: azdata.IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Thenable<azdata.connection.Connection> {
+		return azdata.connection.openConnectionDialog(providers, initialConnectionProfile, connectionCompletionOptions);
+	}
+
+	public async getUriForConnection(connection: azdata.connection.Connection): Promise<string> {
+		let ownerUri = await azdata.connection.getUriForConnection(connection.connectionId);
+		if (!ownerUri) {
+			// Make a connection if it's not already connected
+			await azdata.connection.connect(Utils.toConnectionProfile(connection), false, false).then(async (result) => {
+				ownerUri = await azdata.connection.getUriForConnection(result.connectionId);
+			});
+		}
+		return ownerUri;
+	}
+
+	// CMS APIs
+	public async getCmsService(): Promise<mssql.CmsService> {
+		if (!this._cmsService) {
+			let extensionApi: mssql.MssqlExtensionApi = vscode.extensions.getExtension('Microsoft.mssql').exports;
+			this._cmsService = await extensionApi.getCmsServiceProvider();
+		}
+		return this._cmsService;
+	}
+
+	public async getRegisteredServers(ownerUri: string, relativePath: string): Promise<mssql.ListRegisteredServersResult> {
+		return this.getCmsService().then((service) => {
+			return service.getRegisteredServers(ownerUri, relativePath).then((result) => {
+				if (result && result.registeredServersList && result.registeredServersList) {
+					return result;
+				}
+			});
+		});
+	}
+
+	public async createCmsServer(connection: azdata.connection.Connection,
+		name: string, description: string): Promise<mssql.ListRegisteredServersResult> {
+		let provider = await this.getCmsService();
+		connection.providerName = connection.providerName === cmsProvider ? mssqlProvider : connection.providerName;
+		let ownerUri = await azdata.connection.getUriForConnection(connection.connectionId);
+		if (!ownerUri) {
+			// Make a connection if it's not already connected
+			await azdata.connection.connect(Utils.toConnectionProfile(connection), false, false).then(async (result) => {
+				ownerUri = await azdata.connection.getUriForConnection(result.connectionId);
+			});
+		}
+		return provider.createCmsServer(name, description, connection, ownerUri).then((result) => {
+			if (result) {
+				return result;
+			}
+		});
+	}
+
+	public async deleteCmsServer(cmsServer: any): Promise<void> {
+		let config = this.getConfiguration();
+		if (config && config.servers) {
+			let newServers = config.servers.filter((cachedServer) => {
+				return cachedServer.name !== cmsServer;
+			});
+			await this.setConfiguration(newServers);
+			this._registeredCmsServers = this._registeredCmsServers.filter((cachedServer) => {
+				return cachedServer.name !== cmsServer;
+			});
+		}
+	}
+
+	public cacheRegisteredCmsServer(name: string, description: string, ownerUri: string, connection: azdata.connection.Connection): void {
+		if (!this._registeredCmsServers) {
+			this._registeredCmsServers = [];
+		}
+		let cmsServerNode: ICmsResourceNodeInfo = {
+			name: name,
+			description: description,
+			connection: connection,
+			ownerUri: ownerUri
+		};
+		this._registeredCmsServers.push(cmsServerNode);
+	}
+
+	public async addRegisteredServer(relativePath: string, ownerUri: string,
+		parentServerName?: string): Promise<boolean> {
+		let provider = await this.getCmsService();
+		// Initial profile to disallow SQL Login without
+		// changing provider.
+		let initialProfile: azdata.IConnectionProfile = {
+			connectionName: undefined,
+			serverName: undefined,
+			databaseName: undefined,
+			userName: undefined,
+			password: undefined,
+			authenticationType: undefined,
+			savePassword: undefined,
+			groupFullName: undefined,
+			groupId: undefined,
+			providerName: undefined,
+			saveProfile: undefined,
+			id: undefined,
+			options: {
+				authTypeChanged: true
+			}
+		};
+		return this.openConnectionDialog([cmsProvider], initialProfile, { saveConnection: false }).then(async (connection) => {
+			if (connection && connection.options) {
+				if (connection.options.server === parentServerName) {
+					// error out for same server registration
+					let errorText = localize('cms.errors.sameServerUnderCms', 'You cannot add a shared registered server with the same name as the Configuration Server');
+					this.showErrorMessage(errorText);
+					return false;
+				} else {
+					let registeredServerName = connection.options.registeredServerName === '' ? connection.options.server : connection.options.registeredServerName;
+					let result = await provider.addRegisteredServer(ownerUri, relativePath, registeredServerName, connection.options.registeredServerDescription, connection);
+					return result;
+				}
+
+			}
+		});
+	}
+
+	public async removeRegisteredServer(registeredServerName: string, relativePath: string, ownerUri: string): Promise<boolean> {
+		let provider = await this.getCmsService();
+		return provider.removeRegisteredServer(ownerUri, relativePath, registeredServerName).then((result) => {
+			return result;
+		});
+	}
+
+	public async addServerGroup(groupName: string, groupDescription: string, relativePath: string, ownerUri: string): Promise<boolean> {
+		let provider = await this.getCmsService();
+		return provider.addServerGroup(ownerUri, relativePath, groupName, groupDescription).then((result) => {
+			return result;
+		});
+	}
+
+	public async removeServerGroup(groupName: string, relativePath: string, ownerUri: string): Promise<boolean> {
+		let provider = await this.getCmsService();
+		return provider.removeServerGroup(ownerUri, relativePath, groupName).then((result) => {
+			return result;
+		});
+	}
+
+	// Getters
+	public get registeredCmsServers(): ICmsResourceNodeInfo[] {
+		return this._registeredCmsServers;
+	}
+
+	public get connection(): Thenable<azdata.connection.Connection> {
+		return this.openConnectionDialog([cmsProvider], undefined, { saveConnection: false }).then((connection) => {
+			if (connection) {
+				// remove group ID from connection if a user chose connection
+				// from the recent connections list
+				connection.options['groupId'] = null;
+				connection.providerName = mssqlProvider;
+				return connection;
+			}
+		});
+	}
+}

extensions/cms/src/extension.ts

@@ -10,6 +10,7 @@ import CmsResourceController from './controllers/cmsResourceController';
 import { AppContext } from './appContext';
 import ControllerBase from './controllers/controllerBase';
 import { ApiWrapper } from './apiWrapper';
+import { CmsUtils } from './cmsUtils';
 
 let controllers: ControllerBase[] = [];
 
@@ -17,7 +18,8 @@ let controllers: ControllerBase[] = [];
 // your extension is activated the very first time the command is executed
 export function activate(extensionContext: vscode.ExtensionContext) {
 	const apiWrapper = new ApiWrapper();
-	let appContext = new AppContext(extensionContext, apiWrapper);
+	const cmsUtils = new CmsUtils();
+	let appContext = new AppContext(extensionContext, apiWrapper, cmsUtils);
 	let activations: Thenable<boolean>[] = [];
 
 	const cmsResourceController = new CmsResourceController(appContext);

extensions/cms/src/test/cmsResource/tree/cmsResourceTreeNode.test.ts

@@ -15,12 +15,14 @@ import { CmsResourceItemType } from '../../../cmsResource/constants';
 import { ServerGroupTreeNode } from '../../../cmsResource/tree/serverGroupTreeNode';
 import { ICmsResourceTreeChangeHandler } from '../../../cmsResource/tree/treeChangeHandler';
 import { cmsResource } from '../../../cmsResource/cms-resource';
+import { CmsUtils } from '../../../cmsUtils';
 
 // Mock services
 let mockAppContext: AppContext;
 
 let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
 let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
+let mockCmsUtils: TypeMoq.IMock<CmsUtils>;
 let mockTreeChangeHandler: TypeMoq.IMock<ICmsResourceTreeChangeHandler>;
 
 let mockResourceTreeDataProvider1: TypeMoq.IMock<cmsResource.ICmsResourceTreeDataProvider>;
@@ -30,7 +32,7 @@ describe('ServerGroupTreeNode.info', function(): void {
 	beforeEach(() => {
 		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
 		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
-		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object);
+		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object, mockCmsUtils.object);
 		mockTreeChangeHandler = TypeMoq.Mock.ofType<ICmsResourceTreeChangeHandler>();
 		mockResourceTreeDataProvider1 = TypeMoq.Mock.ofType<cmsResource.ICmsResourceTreeDataProvider>();
 		mockResourceTreeDataProvider1.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<cmsResource.ICmsResourceNode>().object]));

extensions/cms/src/test/cmsResource/tree/registeredServerTreeNode.test.ts

@@ -10,17 +10,18 @@ import * as vscode from 'vscode';
 import 'mocha';
 import { AppContext } from '../../../appContext';
 import { ApiWrapper } from '../../../apiWrapper';
-
 import { CmsResourceItemType } from '../../../cmsResource/constants';
 import { RegisteredServerTreeNode } from '../../../cmsResource/tree/registeredServerTreeNode';
 import { ICmsResourceTreeChangeHandler } from '../../../cmsResource/tree/treeChangeHandler';
 import { cmsResource } from '../../../cmsResource/cms-resource';
+import { CmsUtils } from '../../../cmsUtils';
 
 // Mock services
 let mockAppContext: AppContext;
 
 let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
 let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
+let mockCmsUtils: TypeMoq.IMock<CmsUtils>;
 let mockTreeChangeHandler: TypeMoq.IMock<ICmsResourceTreeChangeHandler>;
 
 let mockResourceTreeDataProvider1: TypeMoq.IMock<cmsResource.ICmsResourceTreeDataProvider>;
@@ -30,7 +31,7 @@ describe('RegisteredServerTreeNode.info', function(): void {
 	beforeEach(() => {
 		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
 		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
-		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object);
+		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object, mockCmsUtils.object);
 		mockTreeChangeHandler = TypeMoq.Mock.ofType<ICmsResourceTreeChangeHandler>();
 		mockResourceTreeDataProvider1 = TypeMoq.Mock.ofType<cmsResource.ICmsResourceTreeDataProvider>();
 		mockResourceTreeDataProvider1.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<cmsResource.ICmsResourceNode>().object]));

extensions/cms/src/test/cmsResource/tree/serverGroupTreeNode.test.ts

@@ -10,17 +10,18 @@ import * as vscode from 'vscode';
 import 'mocha';
 import { AppContext } from '../../../appContext';
 import { ApiWrapper } from '../../../apiWrapper';
-
 import { CmsResourceItemType } from '../../../cmsResource/constants';
 import { ServerGroupTreeNode } from '../../../cmsResource/tree/serverGroupTreeNode';
 import { ICmsResourceTreeChangeHandler } from '../../../cmsResource/tree/treeChangeHandler';
 import { cmsResource } from '../../../cmsResource/cms-resource';
+import { CmsUtils } from '../../../cmsUtils';
 
 // Mock services
 let mockAppContext: AppContext;
 
 let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
 let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
+let mockCmsUtils: TypeMoq.IMock<CmsUtils>;
 let mockTreeChangeHandler: TypeMoq.IMock<ICmsResourceTreeChangeHandler>;
 
 let mockResourceTreeDataProvider1: TypeMoq.IMock<cmsResource.ICmsResourceTreeDataProvider>;
@@ -30,7 +31,7 @@ describe('ServerGroupTreeNode.info', function(): void {
 	beforeEach(() => {
 		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
 		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
-		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object);
+		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object, mockCmsUtils.object);
 		mockTreeChangeHandler = TypeMoq.Mock.ofType<ICmsResourceTreeChangeHandler>();
 		mockResourceTreeDataProvider1 = TypeMoq.Mock.ofType<cmsResource.ICmsResourceTreeDataProvider>();
 		mockResourceTreeDataProvider1.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<cmsResource.ICmsResourceNode>().object]));

extensions/cms/src/test/cmsResource/tree/treeProvider.test.ts

@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 
 'use strict';
-
+import 'mocha';
 import * as vscode from 'vscode';
 import * as should from 'should';
 import * as TypeMoq from 'typemoq';
-import 'mocha';
 import { AppContext } from '../../../appContext';
 import { ApiWrapper } from '../../../apiWrapper';
-
 import { CmsResourceTreeProvider } from '../../../cmsResource/tree/treeProvider';
 import { CmsResourceMessageTreeNode } from '../../../cmsResource/messageTreeNode';
 import { CmsResourceEmptyTreeNode } from '../../../cmsResource/tree/cmsResourceEmptyTreeNode';
 import { CmsResourceTreeNode } from '../../../cmsResource/tree/cmsResourceTreeNode';
+import { CmsUtils } from '../../../cmsUtils';
 
 // Mock services
 let mockAppContext: AppContext;
 let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
+let mockCmsUtils: TypeMoq.IMock<CmsUtils>;
 let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
 
 
@@ -27,7 +27,7 @@ describe('CmsResourceTreeProvider.getChildren', function (): void {
 	beforeEach(() => {
 		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
 		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
-		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object);
+		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object, mockCmsUtils.object);
 	});
 
 	it('Should not be initialized.', async function (): Promise<void> {
@@ -39,19 +39,19 @@ describe('CmsResourceTreeProvider.getChildren', function (): void {
 		should.equal(children[0] instanceof CmsResourceMessageTreeNode, true);
 	});
 
-	it('Should not be loading after initialized.'), async function (): Promise<void> {
+	it('Should not be loading after initialized.', async function (): Promise<void> {
 		const treeProvider = new CmsResourceTreeProvider(mockAppContext);
 		treeProvider.isSystemInitialized = true;
 		should.equal(true, treeProvider.isSystemInitialized);
-		mockApiWrapper.setup(x => x.registeredCmsServers).returns(null);
+		mockCmsUtils.setup(x => x.registeredCmsServers).returns(null);
 		const children = await treeProvider.getChildren(undefined);
 		should.equal(children[0] instanceof CmsResourceEmptyTreeNode, true);
-	};
+	});
 
-	it('Should show CMS nodes if there are cached servers'), async function (): Promise<void> {
+	it('Should show CMS nodes if there are cached servers', async function (): Promise<void> {
 		const treeProvider = new CmsResourceTreeProvider(mockAppContext);
 		treeProvider.isSystemInitialized = true;
-		mockApiWrapper.setup(x => x.registeredCmsServers).returns(() => {
+		mockCmsUtils.setup(x => x.registeredCmsServers).returns(() => {
 			return [{
 				name: 'name',
 				description: 'description',
@@ -61,5 +61,5 @@ describe('CmsResourceTreeProvider.getChildren', function (): void {
 		});
 		const children = await treeProvider.getChildren(undefined);
 		should.equal(children[0] instanceof CmsResourceTreeNode, true);
-	};
+	});
 });