Update product references from 'sqlops' to 'azdata' (#4259)

* Update extensions to use azdata

* Switch core code to use azdata

extensions/azurecore/src/account-provider/azureAccountProvider.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as adal from 'adal-node';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import * as request from 'request';
 import * as nls from 'vscode-nls';
 import * as vscode from 'vscode';
@@ -22,7 +22,7 @@ import TokenCache from './tokenCache';
 
 const localize = nls.loadMessageBundle();
 
-export class AzureAccountProvider implements sqlops.AccountProvider {
+export class AzureAccountProvider implements azdata.AccountProvider {
 	// CONSTANTS ///////////////////////////////////////////////////////////
 	private static WorkSchoolAccountType: string = 'work_school';
 	private static MicrosoftAccountType: string = 'microsoft';
@@ -57,7 +57,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 	 * @param {"data".AccountKey} accountKey Key identifying the account to delete tokens for
 	 * @returns {Thenable<void>} Promise to clear requested tokens from the token cache
 	 */
-	public clear(accountKey: sqlops.AccountKey): Thenable<void> {
+	public clear(accountKey: azdata.AccountKey): Thenable<void> {
 		return this.doIfInitialized(() => this.clearAccountTokens(accountKey));
 	}
 
@@ -69,14 +69,14 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 		return this._tokenCache.clear();
 	}
 
-	public getSecurityToken(account: AzureAccount, resource: sqlops.AzureResource): Thenable<AzureAccountSecurityTokenCollection> {
+	public getSecurityToken(account: AzureAccount, resource: azdata.AzureResource): Thenable<AzureAccountSecurityTokenCollection> {
 		return this.doIfInitialized(() => this.getAccessTokens(account, resource));
 	}
 
-	public initialize(restoredAccounts: sqlops.Account[]): Thenable<sqlops.Account[]> {
+	public initialize(restoredAccounts: azdata.Account[]): Thenable<azdata.Account[]> {
 		let self = this;
 
-		let rehydrationTasks: Thenable<sqlops.Account>[] = [];
+		let rehydrationTasks: Thenable<azdata.Account>[] = [];
 		for (let account of restoredAccounts) {
 			// Purge any invalid accounts
 			if (!account) {
@@ -90,7 +90,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 
 			// Attempt to get fresh tokens. If this fails then the account is stale.
 			// NOTE: Based on ADAL implementation, getting tokens should use the refresh token if necessary
-			let task = this.getAccessTokens(account, sqlops.AzureResource.ResourceManagement)
+			let task = this.getAccessTokens(account, azdata.AzureResource.ResourceManagement)
 				.then(
 				() => {
 					return account;
@@ -145,7 +145,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 		return Promise.resolve();
 	}
 
-	private clearAccountTokens(accountKey: sqlops.AccountKey): Thenable<void> {
+	private clearAccountTokens(accountKey: azdata.AccountKey): Thenable<void> {
 		// Put together a query to look up any tokens associated with the account key
 		let query = <adal.TokenResponse>{ userId: accountKey.accountId };
 
@@ -161,12 +161,12 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 			: Promise.reject(localize('accountProviderNotInitialized', 'Account provider not initialized, cannot perform action'));
 	}
 
-	private getAccessTokens(account: AzureAccount, resource: sqlops.AzureResource): Thenable<AzureAccountSecurityTokenCollection> {
+	private getAccessTokens(account: AzureAccount, resource: azdata.AzureResource): Thenable<AzureAccountSecurityTokenCollection> {
 		let self = this;
 
-		const resourceIdMap = new Map<sqlops.AzureResource, string>([
-			[sqlops.AzureResource.ResourceManagement, self._metadata.settings.armResource.id],
-			[sqlops.AzureResource.Sql, self._metadata.settings.sqlResource.id]
+		const resourceIdMap = new Map<azdata.AzureResource, string>([
+			[azdata.AzureResource.ResourceManagement, self._metadata.settings.armResource.id],
+			[azdata.AzureResource.Sql, self._metadata.settings.sqlResource.id]
 		]);
 
 		let accessTokenPromises: Thenable<void>[] = [];
@@ -185,7 +185,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 						if (error) {
 							// TODO: We'll assume for now that the account is stale, though that might not be accurate
 							account.isStale = true;
-							sqlops.accounts.accountUpdated(account);
+							azdata.accounts.accountUpdated(account);
 
 							reject(error);
 							return;
@@ -245,7 +245,7 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 		let title = isAddAccount ?
 			localize('addAccount', 'Add {0} account', self._metadata.displayName) :
 			localize('refreshAccount', 'Refresh {0} account', self._metadata.displayName);
-		return sqlops.accounts.beginAutoOAuthDeviceCode(self._metadata.id, title, oAuth.userCodeInfo.message, oAuth.userCodeInfo.userCode, oAuth.userCodeInfo.verificationUrl)
+		return azdata.accounts.beginAutoOAuthDeviceCode(self._metadata.id, title, oAuth.userCodeInfo.message, oAuth.userCodeInfo.userCode, oAuth.userCodeInfo.verificationUrl)
 			.then(() => {
 				return new Promise<adal.TokenResponse>((resolve, reject) => {
 					let context = oAuth.context;
@@ -254,14 +254,14 @@ export class AzureAccountProvider implements sqlops.AccountProvider {
 							if (err) {
 								if (self._autoOAuthCancelled) {
 									// Auto OAuth was cancelled by the user, indicate this with the error we return
-									reject(<sqlops.UserCancelledSignInError>{ userCancelledSignIn: true });
+									reject(<azdata.UserCancelledSignInError>{ userCancelledSignIn: true });
 								} else {
 									// Auto OAuth failed for some other reason
-									sqlops.accounts.endAutoOAuthDeviceCode();
+									azdata.accounts.endAutoOAuthDeviceCode();
 									reject(err);
 								}
 							} else {
-								sqlops.accounts.endAutoOAuthDeviceCode();
+								azdata.accounts.endAutoOAuthDeviceCode();
 								resolve(<adal.TokenResponse>response);
 							}
 

extensions/azurecore/src/account-provider/azureAccountProviderService.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as constants from '../constants';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import * as events from 'events';
 import * as nls from 'vscode-nls';
 import * as path from 'path';
@@ -27,7 +27,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
 	// MEMBER VARIABLES ////////////////////////////////////////////////////////
 	private _accountDisposals: { [accountProviderId: string]: vscode.Disposable };
 	private _accountProviders: { [accountProviderId: string]: AzureAccountProvider };
-	private _credentialProvider: sqlops.CredentialProvider;
+	private _credentialProvider: azdata.CredentialProvider;
 	private _configChangePromiseChain: Thenable<void>;
 	private _currentConfig: vscode.WorkspaceConfiguration;
 	private _event: events.EventEmitter;
@@ -55,7 +55,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
 		// 2a) Store the credential provider for use later
 		// 2b) Register the configuration change handler
 		// 2c) Perform an initial config change handling
-		return sqlops.credentials.getProvider(AzureAccountProviderService.CredentialNamespace)
+		return azdata.credentials.getProvider(AzureAccountProviderService.CredentialNamespace)
 			.then(credProvider => {
 				self._credentialProvider = credProvider;
 
@@ -138,7 +138,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
 				let tokenCache = new CredentialServiceTokenCache(self._credentialProvider, tokenCacheKey, tokenCachePath);
 				let accountProvider = new AzureAccountProvider(<AzureAccountProviderMetadata>provider.metadata, tokenCache);
 				self._accountProviders[provider.metadata.id] = accountProvider;
-				self._accountDisposals[provider.metadata.id] = sqlops.accounts.registerAccountProvider(provider.metadata, accountProvider);
+				self._accountDisposals[provider.metadata.id] = azdata.accounts.registerAccountProvider(provider.metadata, accountProvider);
 				resolve();
 			} catch (e) {
 				console.error(`Failed to register account provider: ${e}`);

extensions/azurecore/src/account-provider/interfaces.ts

@@ -1,6 +1,6 @@
 'use strict';
 
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 
 /**
  * Represents a tenant (an Azure Active Directory instance) to which a user has access
@@ -123,7 +123,7 @@ export interface ProviderSettings {
 /**
  * Extension of account provider metadata to override settings type for Azure account providers
  */
-export interface AzureAccountProviderMetadata extends sqlops.AccountProviderMetadata {
+export interface AzureAccountProviderMetadata extends azdata.AccountProviderMetadata {
 	/**
 	 * Azure specific account provider settings.
 	 */
@@ -148,7 +148,7 @@ export interface AzureAccountProperties {
 /**
  * Override of the Account type to enforce properties that are AzureAccountProperties
  */
-export interface AzureAccount extends sqlops.Account {
+export interface AzureAccount extends azdata.Account {
 	/**
 	 * AzureAccountProperties specifically used for Azure accounts
 	 */

extensions/azurecore/src/account-provider/tokenCache.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as adal from 'adal-node';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 
@@ -19,7 +19,7 @@ export default class TokenCache implements adal.TokenCache {
 	private _activeOperation: Thenable<any>;
 
 	constructor(
-		private _credentialProvider: sqlops.CredentialProvider,
+		private _credentialProvider: azdata.CredentialProvider,
 		private _credentialServiceKey: string,
 		private _cacheSerializationPath: string
 	) {

extensions/azurecore/src/apiWrapper.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import * as vscode from 'vscode';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 
 import * as constants from './constants';
 
@@ -19,64 +19,64 @@ import * as constants from './constants';
  */
 export class ApiWrapper {
 	// Data APIs
-	public registerConnectionProvider(provider: sqlops.ConnectionProvider): vscode.Disposable {
-		return sqlops.dataprotocol.registerConnectionProvider(provider);
+	public registerConnectionProvider(provider: azdata.ConnectionProvider): vscode.Disposable {
+		return azdata.dataprotocol.registerConnectionProvider(provider);
 	}
 
-	public registerObjectExplorerProvider(provider: sqlops.ObjectExplorerProvider): vscode.Disposable {
-		return sqlops.dataprotocol.registerObjectExplorerProvider(provider);
+	public registerObjectExplorerProvider(provider: azdata.ObjectExplorerProvider): vscode.Disposable {
+		return azdata.dataprotocol.registerObjectExplorerProvider(provider);
 	}
 
-	public registerTaskServicesProvider(provider: sqlops.TaskServicesProvider): vscode.Disposable {
-		return sqlops.dataprotocol.registerTaskServicesProvider(provider);
+	public registerTaskServicesProvider(provider: azdata.TaskServicesProvider): vscode.Disposable {
+		return azdata.dataprotocol.registerTaskServicesProvider(provider);
 	}
 
-	public registerFileBrowserProvider(provider: sqlops.FileBrowserProvider): vscode.Disposable {
-		return sqlops.dataprotocol.registerFileBrowserProvider(provider);
+	public registerFileBrowserProvider(provider: azdata.FileBrowserProvider): vscode.Disposable {
+		return azdata.dataprotocol.registerFileBrowserProvider(provider);
 	}
 
-	public registerCapabilitiesServiceProvider(provider: sqlops.CapabilitiesProvider): vscode.Disposable {
-		return sqlops.dataprotocol.registerCapabilitiesServiceProvider(provider);
+	public registerCapabilitiesServiceProvider(provider: azdata.CapabilitiesProvider): vscode.Disposable {
+		return azdata.dataprotocol.registerCapabilitiesServiceProvider(provider);
 	}
 
-	public registerModelViewProvider(widgetId: string, handler: (modelView: sqlops.ModelView) => void): void {
-		return sqlops.ui.registerModelViewProvider(widgetId, handler);
+	public registerModelViewProvider(widgetId: string, handler: (modelView: azdata.ModelView) => void): void {
+		return azdata.ui.registerModelViewProvider(widgetId, handler);
 	}
 
-	public registerWebviewProvider(widgetId: string, handler: (webview: sqlops.DashboardWebview) => void): void {
-		return sqlops.dashboard.registerWebviewProvider(widgetId, handler);
+	public registerWebviewProvider(widgetId: string, handler: (webview: azdata.DashboardWebview) => void): void {
+		return azdata.dashboard.registerWebviewProvider(widgetId, handler);
 	}
 
-	public createDialog(title: string): sqlops.window.Dialog {
-		return sqlops.window.createModelViewDialog(title);
+	public createDialog(title: string): azdata.window.Dialog {
+		return azdata.window.createModelViewDialog(title);
 	}
 
-	public openDialog(dialog: sqlops.window.Dialog): void {
-		return sqlops.window.openDialog(dialog);
+	public openDialog(dialog: azdata.window.Dialog): void {
+		return azdata.window.openDialog(dialog);
 	}
 
-	public closeDialog(dialog: sqlops.window.Dialog): void {
-		return sqlops.window.closeDialog(dialog);
+	public closeDialog(dialog: azdata.window.Dialog): void {
+		return azdata.window.closeDialog(dialog);
 	}
 
-	public registerTaskHandler(taskId: string, handler: (profile: sqlops.IConnectionProfile) => void): void {
-		sqlops.tasks.registerTask(taskId, handler);
+	public registerTaskHandler(taskId: string, handler: (profile: azdata.IConnectionProfile) => void): void {
+		azdata.tasks.registerTask(taskId, handler);
 	}
 
-	public startBackgroundOperation(operationInfo: sqlops.BackgroundOperationInfo): void {
-		sqlops.tasks.startBackgroundOperation(operationInfo);
+	public startBackgroundOperation(operationInfo: azdata.BackgroundOperationInfo): void {
+		azdata.tasks.startBackgroundOperation(operationInfo);
 	}
 
-	public getActiveConnections(): Thenable<sqlops.connection.Connection[]> {
-		return sqlops.connection.getActiveConnections();
+	public getActiveConnections(): Thenable<azdata.connection.Connection[]> {
+		return azdata.connection.getActiveConnections();
 	}
 
-	public getCurrentConnection(): Thenable<sqlops.connection.Connection> {
-		return sqlops.connection.getCurrentConnection();
+	public getCurrentConnection(): Thenable<azdata.connection.ConnectionProfile> {
+		return azdata.connection.getCurrentConnection();
 	}
 
-	public createModelViewEditor(title: string, options?: sqlops.ModelViewEditorOptions): sqlops.workspace.ModelViewEditor {
-		return sqlops.workspace.createModelViewEditor(title, options);
+	public createModelViewEditor(title: string, options?: azdata.ModelViewEditorOptions): azdata.workspace.ModelViewEditor {
+		return azdata.workspace.createModelViewEditor(title, options);
 	}
 
 	// VSCode APIs
@@ -195,31 +195,31 @@ export class ApiWrapper {
 		return vscode.window.createOutputChannel(name);
 	}
 
-	public createWizardPage(title: string): sqlops.window.WizardPage {
-		return sqlops.window.createWizardPage(title);
+	public createWizardPage(title: string): azdata.window.WizardPage {
+		return azdata.window.createWizardPage(title);
 	}
 
 	public registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, ...triggerCharacters: string[]): vscode.Disposable {
 		return vscode.languages.registerCompletionItemProvider(selector, provider, ...triggerCharacters);
 	}
 
-	public createTab(title: string): sqlops.window.DialogTab {
-		return sqlops.window.createTab(title);
+	public createTab(title: string): azdata.window.DialogTab {
+		return azdata.window.createTab(title);
 	}
 
 	// Account APIs
-	public getAllAccounts(): Thenable<sqlops.Account[]> {
-		return sqlops.accounts.getAllAccounts();
+	public getAllAccounts(): Thenable<azdata.Account[]> {
+		return azdata.accounts.getAllAccounts();
 	}
 
-	public getSecurityToken(account: sqlops.Account, resource: sqlops.AzureResource): Thenable<{}> {
-		return sqlops.accounts.getSecurityToken(account, resource);
+	public getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{}> {
+		return azdata.accounts.getSecurityToken(account, resource);
 	}
 
-	public readonly onDidChangeAccounts = sqlops.accounts.onDidChangeAccounts;
+	public readonly onDidChangeAccounts = azdata.accounts.onDidChangeAccounts;
 
 	// Connection APIs
-	public openConnectionDialog(providers: string[], initialConnectionProfile?: sqlops.IConnectionProfile, connectionCompletionOptions?: sqlops.IConnectionCompletionOptions): Thenable<sqlops.connection.Connection> {
-		return sqlops.connection.openConnectionDialog(providers, initialConnectionProfile, connectionCompletionOptions);
+	public openConnectionDialog(providers: string[], initialConnectionProfile?: azdata.IConnectionProfile, connectionCompletionOptions?: azdata.IConnectionCompletionOptions): Thenable<azdata.connection.Connection> {
+		return azdata.connection.openConnectionDialog(providers, initialConnectionProfile, connectionCompletionOptions);
 	}
 }

extensions/azurecore/src/azureResource/azure-resource.d.ts

@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { TreeDataProvider } from 'vscode';
-import { DataProvider, Account } from 'sqlops';
-import { TreeItem } from 'sqlops';
+import { DataProvider, Account } from 'azdata';
+import { TreeItem } from 'azdata';
 
 export namespace azureResource {
 	export interface IAzureResourceProvider extends DataProvider {

extensions/azurecore/src/azureResource/commands.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { window, QuickPickItem } from 'vscode';
-import { AzureResource } from 'sqlops';
+import { AzureResource } from 'azdata';
 import { TokenCredentials } from 'ms-rest';
 import { AppContext } from '../appContext';
 import * as nls from 'vscode-nls';

extensions/azurecore/src/azureResource/interfaces.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { ServiceClientCredentials } from 'ms-rest';
-import { Account, DidChangeAccountsParams } from 'sqlops';
+import { Account, DidChangeAccountsParams } from 'azdata';
 import { Event } from 'vscode';
 
 import { azureResource } from './azure-resource';

extensions/azurecore/src/azureResource/messageTreeNode.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { NodeInfo } from 'sqlops';
+import { NodeInfo } from 'azdata';
 
 import { TreeNode } from './treeNode';
 import { AzureResourceItemType } from './constants';

extensions/azurecore/src/azureResource/providers/database/commands.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { IConnectionProfile } from 'sqlops';
+import { IConnectionProfile } from 'azdata';
 import { AppContext } from '../../../appContext';
 
 import { TreeNode } from '../../treeNode';

extensions/azurecore/src/azureResource/providers/database/databaseTreeDataProvider.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { AzureResource } from 'sqlops';
+import { AzureResource } from 'azdata';
 import { TreeItem, TreeItemCollapsibleState, ExtensionContext } from 'vscode';
 import { TokenCredentials } from 'ms-rest';
 import * as nls from 'vscode-nls';

extensions/azurecore/src/azureResource/providers/databaseServer/commands.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { IConnectionProfile } from 'sqlops';
+import { IConnectionProfile } from 'azdata';
 import { AppContext } from '../../../appContext';
 
 import { TreeNode } from '../../treeNode';

extensions/azurecore/src/azureResource/providers/databaseServer/databaseServerTreeDataProvider.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { AzureResource } from 'sqlops';
+import { AzureResource } from 'azdata';
 import { TreeItem, TreeItemCollapsibleState, ExtensionContext } from 'vscode';
 import { TokenCredentials } from 'ms-rest';
 import * as nls from 'vscode-nls';

extensions/azurecore/src/azureResource/resourceService.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { extensions, TreeItem } from 'vscode';
-import { Account } from 'sqlops';
+import { Account } from 'azdata';
 
 import { azureResource } from './azure-resource';
 import { IAzureResourceNodeWithProviderId } from './interfaces';

extensions/azurecore/src/azureResource/resourceTreeNode.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { NodeInfo } from 'sqlops';
+import { NodeInfo } from 'azdata';
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();

extensions/azurecore/src/azureResource/services/accountService.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { Event } from 'vscode';
-import { Account, DidChangeAccountsParams } from 'sqlops';
+import { Account, DidChangeAccountsParams } from 'azdata';
 import { ApiWrapper } from '../../apiWrapper';
 
 import { IAzureResourceAccountService } from '../interfaces';

extensions/azurecore/src/azureResource/services/subscriptionFilterService.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { WorkspaceConfiguration, ConfigurationTarget } from 'vscode';
-import { Account } from 'sqlops';
+import { Account } from 'azdata';
 
 import { azureResource } from '../azure-resource';
 import { IAzureResourceSubscriptionFilterService, IAzureResourceCacheService } from '../interfaces';

extensions/azurecore/src/azureResource/services/subscriptionService.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { Account } from 'sqlops';
+import { Account } from 'azdata';
 import { ServiceClientCredentials } from 'ms-rest';
 import { SubscriptionClient } from 'azure-arm-resource';
 

extensions/azurecore/src/azureResource/tree/accountNotSignedInTreeNode.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { NodeInfo } from 'sqlops';
+import { NodeInfo } from 'azdata';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 

extensions/azurecore/src/azureResource/tree/accountTreeNode.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { Account, NodeInfo, AzureResource } from 'sqlops';
+import { Account, NodeInfo, AzureResource } from 'azdata';
 import { TokenCredentials } from 'ms-rest';
 import { AppContext } from '../../appContext';
 import * as nls from 'vscode-nls';

extensions/azurecore/src/azureResource/tree/subscriptionTreeNode.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { Account, NodeInfo } from 'sqlops';
+import { Account, NodeInfo } from 'azdata';
 import { AppContext } from '../../appContext';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();

extensions/azurecore/src/azureResource/tree/treeProvider.ts

@@ -35,7 +35,7 @@ export class AzureResourceTreeProvider implements TreeDataProvider<TreeNode>, IA
 		if (!this.isSystemInitialized && !this._loadingTimer) {
 			this._loadingTimer = setInterval(async () => {
 				try {
-					// Call sqlops.accounts.getAllAccounts() to determine whether the system has been initialized.
+					// Call azdata.accounts.getAllAccounts() to determine whether the system has been initialized.
 					await this.appContext.getService<IAzureResourceAccountService>(AzureResourceServiceNames.accountService).getAccounts();
 
 					// System has been initialized

extensions/azurecore/src/azureResource/treeNode.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 
 type TreeNodePredicate = (node: TreeNode) => boolean;
@@ -66,7 +66,7 @@ export abstract class TreeNode {
 	public abstract getChildren(refreshChildren: boolean): TreeNode[] | Promise<TreeNode[]>;
 	public abstract getTreeItem(): vscode.TreeItem | Promise<vscode.TreeItem>;
 
-	public abstract getNodeInfo(): sqlops.NodeInfo;
+	public abstract getNodeInfo(): azdata.NodeInfo;
 
 	/**
 	 * The value to use for this node in the node path

extensions/azurecore/src/controllers/azureResourceController.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import ControllerBase from './controllerBase';
-import { DidChangeAccountsParams } from 'sqlops';
+import { DidChangeAccountsParams } from 'azdata';
 
 import {
 	IAzureResourceCacheService,

extensions/azurecore/src/test/azureResource/providers/database/databaseTreeDataProvider.test.ts

@@ -7,7 +7,7 @@
 
 import * as should from 'should';
 import * as TypeMoq from 'typemoq';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import 'mocha';
 
@@ -24,7 +24,7 @@ let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
 let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
 
 // Mock test data
-const mockAccount: sqlops.Account = {
+const mockAccount: azdata.Account = {
 	key: {
 		accountId: 'mock_account',
 		providerId: 'mock_provider'
@@ -103,7 +103,7 @@ describe('AzureResourceDatabaseTreeDataProvider.getChildren', function(): void {
 		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
 		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
 
-		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens));
+		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens));
 		mockDatabaseService.setup((o) => o.getDatabases(mockSubscription, TypeMoq.It.isAny())).returns(() => Promise.resolve(mockDatabases));
 		mockExtensionContext.setup((o) => o.asAbsolutePath(TypeMoq.It.isAnyString())).returns(() => TypeMoq.It.isAnyString());
 	});

extensions/azurecore/src/test/azureResource/providers/databaseServer/databaseServerTreeDataProvider.test.ts

@@ -7,7 +7,7 @@
 
 import * as should from 'should';
 import * as TypeMoq from 'typemoq';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import 'mocha';
 
@@ -24,7 +24,7 @@ let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
 let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
 
 // Mock test data
-const mockAccount: sqlops.Account = {
+const mockAccount: azdata.Account = {
 	key: {
 		accountId: 'mock_account',
 		providerId: 'mock_provider'
@@ -103,7 +103,7 @@ describe('AzureResourceDatabaseServerTreeDataProvider.getChildren', function():
 		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
 		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
 
-		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens));
+		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens));
 		mockDatabaseServerService.setup((o) => o.getDatabaseServers(mockSubscription, TypeMoq.It.isAny())).returns(() => Promise.resolve(mockDatabaseServers));
 		mockExtensionContext.setup((o) => o.asAbsolutePath(TypeMoq.It.isAnyString())).returns(() => TypeMoq.It.isAnyString());
 	});

extensions/azurecore/src/test/azureResource/resourceService.test.ts

@@ -7,7 +7,7 @@
 
 import * as should from 'should';
 import * as TypeMoq from 'typemoq';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import 'mocha';
 import { fail } from 'assert';
 
@@ -15,7 +15,7 @@ import { azureResource } from '../../azureResource/azure-resource';
 import { AzureResourceService } from '../../azureResource/resourceService';
 
 // Mock test data
-const mockAccount: sqlops.Account = {
+const mockAccount: azdata.Account = {
 	key: {
 		accountId: 'mock_account',
 		providerId: 'mock_provider'

extensions/azurecore/src/test/azureResource/resourceTreeNode.test.ts

@@ -7,7 +7,7 @@
 
 import * as should from 'should';
 import * as TypeMoq from 'typemoq';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import 'mocha';
 
@@ -18,7 +18,7 @@ import { AzureResourceResourceTreeNode } from '../../azureResource/resourceTreeN
 const resourceService = AzureResourceService.getInstance();
 
 // Mock test data
-const mockAccount: sqlops.Account = {
+const mockAccount: azdata.Account = {
 	key: {
 		accountId: 'mock_account',
 		providerId: 'mock_provider'

extensions/azurecore/src/test/azureResource/tree/accountTreeNode.test.ts

@@ -7,7 +7,7 @@
 
 import * as should from 'should';
 import * as TypeMoq from 'typemoq';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import 'mocha';
 import { TokenCredentials } from 'ms-rest';
@@ -42,7 +42,7 @@ let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
 // Mock test data
 const mockTenantId = 'mock_tenant_id';
 
-const mockAccount: sqlops.Account = {
+const mockAccount: azdata.Account = {
 	key: {
 		accountId: 'mock_account',
 		providerId: 'mock_provider'
@@ -105,7 +105,7 @@ describe('AzureResourceAccountTreeNode.info', function(): void {
 		mockAppContext.registerService<IAzureResourceSubscriptionFilterService>(AzureResourceServiceNames.subscriptionFilterService, mockSubscriptionFilterService.object);
 		mockAppContext.registerService<IAzureResourceTenantService>(AzureResourceServiceNames.tenantService, mockTenantService.object);
 
-		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens));
+		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens));
 		mockCacheService.setup((o) => o.generateKey(TypeMoq.It.isAnyString())).returns(() => generateGuid());
 		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockSubscriptionCache);
 		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache = mockSubscriptions);
@@ -193,7 +193,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 		mockAppContext.registerService<IAzureResourceSubscriptionFilterService>(AzureResourceServiceNames.subscriptionFilterService, mockSubscriptionFilterService.object);
 		mockAppContext.registerService<IAzureResourceTenantService>(AzureResourceServiceNames.tenantService, mockTenantService.object);
 
-		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens));
+		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens));
 		mockCacheService.setup((o) => o.generateKey(TypeMoq.It.isAnyString())).returns(() => generateGuid());
 		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockSubscriptionCache);
 		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache = mockSubscriptions);
@@ -208,7 +208,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 
 		const children = await accountTreeNode.getChildren();
 
-		mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
+		mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement), TypeMoq.Times.once());
 		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredential), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(0));
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once());
@@ -243,7 +243,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 		await accountTreeNode.getChildren();
 		const children = await accountTreeNode.getChildren();
 
-		mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
+		mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement), TypeMoq.Times.once());
 		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredential), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once());
@@ -299,7 +299,7 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 
 		const children = await accountTreeNode.getChildren();
 
-		mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
+		mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement), TypeMoq.Times.once());
 		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredential), TypeMoq.Times.once());
 		mockSubscriptionFilterService.verify((o) => o.getSelectedSubscriptions(mockAccount), TypeMoq.Times.once());
 		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.never());
@@ -332,7 +332,7 @@ describe('AzureResourceAccountTreeNode.clearCache', function() : void {
 		mockAppContext.registerService<IAzureResourceSubscriptionFilterService>(AzureResourceServiceNames.subscriptionFilterService, mockSubscriptionFilterService.object);
 		mockAppContext.registerService<IAzureResourceTenantService>(AzureResourceServiceNames.tenantService, mockTenantService.object);
 
-		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens));
+		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, azdata.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockTokens));
 		mockCacheService.setup((o) => o.generateKey(TypeMoq.It.isAnyString())).returns(() => generateGuid());
 		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockSubscriptionCache);
 		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache = mockSubscriptions);

extensions/azurecore/src/test/azureResource/tree/subscriptionTreeNode.test.ts

@@ -7,7 +7,7 @@
 
 import * as should from 'should';
 import * as TypeMoq from 'typemoq';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import 'mocha';
 import { AppContext } from '../../../appContext';
@@ -32,7 +32,7 @@ let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
 let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
 
 // Mock test data
-const mockAccount: sqlops.Account = {
+const mockAccount: azdata.Account = {
 	key: {
 		accountId: 'mock_account',
 		providerId: 'mock_provider'

extensions/azurecore/src/test/azureResource/tree/treeProvider.test.ts

@@ -8,7 +8,7 @@
 import * as vscode from 'vscode';
 import * as should from 'should';
 import * as TypeMoq from 'typemoq';
-import * as sqlops from 'sqlops';
+import * as azdata from 'azdata';
 import 'mocha';
 import { AppContext } from '../../../appContext';
 import { ApiWrapper } from '../../../apiWrapper';
@@ -30,7 +30,7 @@ let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
 let mockAccountService: TypeMoq.IMock<IAzureResourceAccountService>;
 
 // Mock test data
-const mockAccount1: sqlops.Account = {
+const mockAccount1: azdata.Account = {
 	key: {
 		accountId: 'mock_account_1',
 		providerId: 'mock_provider'
@@ -43,7 +43,7 @@ const mockAccount1: sqlops.Account = {
 	properties: undefined,
 	isStale: false
 };
-const mockAccount2: sqlops.Account = {
+const mockAccount2: azdata.Account = {
 	key: {
 		accountId: 'mock_account_2',
 		providerId: 'mock_provider'

extensions/azurecore/src/typings/ref.d.ts

@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 /// <reference path='../../../../src/vs/vscode.d.ts'/>
-/// <reference path='../../../../src/sql/sqlops.d.ts'/>
-/// <reference path='../../../../src/sql/sqlops.proposed.d.ts'/>
+/// <reference path='../../../../src/sql/azdata.d.ts'/>
+/// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
 /// <reference types='@types/node'/>