Alanren/fix4001 (#4011)

* fix for 4001

* Revert "fix for 4001"

This reverts commit 91fed44f063acb44b844a206a13e4074150d8118.

* fix for issue 4001

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,10 @@
 ---
 name: Bug report
 about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
 ---
 
 <!-- Please search existing issues to avoid creating duplicates. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature request
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution or feature you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.vscode/launch.json

@@ -92,6 +92,30 @@
 			"webRoot": "${workspaceFolder}",
 			"timeout": 45000
 		},
+		{
+			"type": "chrome",
+			"request": "launch",
+			"name": "Launch azuredatastudio with new notebook command",
+			"windows": {
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.bat"
+			},
+			"osx": {
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
+			},
+			"linux": {
+				"runtimeExecutable": "${workspaceFolder}/scripts/sql.sh"
+			},
+			"urlFilter": "*index.html*",
+			"runtimeArgs": [
+				"--inspect=5875",
+				"--command=notebook.command.new"
+			],
+			"skipFiles": [
+				"**/winjs*.js"
+			],
+			"webRoot": "${workspaceFolder}",
+			"timeout": 45000
+		},
 		{
 			"type": "node",
 			"request": "launch",
@@ -128,6 +152,16 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceRoot}/extensions/debug-auto-launch"
 			]
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Launch Smoke Test",
+			"program": "${workspaceFolder}/test/smoke/test/index.js",
+			"cwd": "${workspaceFolder}/test/smoke",
+			"env": {
+				"BUILD_ARTIFACTSTAGINGDIRECTORY": "${workspaceFolder}"
+			}
 		}
 	],
 	"compounds": [

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Change Log
 
+## Version 1.3.8
+* Release date: January 9, 2019
+* Release status: General Availability
+
+## What's new in this version
+* #13 Feature Request: Azure Active Directory Authentication
+* #1040 Stream initial query results as they become available
+* #3298 Сan't add an azure account.
+* #2387 Support Per-User Installer
+* SQL Server Import updates for DACPAC\BACPAC
+* SQL Server Profiler UI and UX improvements
+* Updates to [SQL Server 2019 extension](https://docs.microsoft.com/sql/azure-data-studio/sql-server-2019-extension?view=sql-server-ver15)
+* **sp_executesql to SQL** and **New Database** extensions
+
+## Contributions and "thank you"
+We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
+
+* Tarig0  for `Add Routine_Type to CreateStoredProc fixes #3257 (#3286)`
+* oltruong  for `typo fix #3025'`
+* Thomas-S-B for `Removed unnecessary IErrorDetectionStrategy #749`
+* Thomas-S-B for `Simplified code #750`
+
 ## Version 1.2.4
 * Release date: November 6, 2018
 * Release status: General Availability

README.md

@@ -9,16 +9,22 @@ Azure Data Studio is a data management tool that enables you to work with SQL Se
 
 Platform | Link
 -- | --
-Windows Setup Installer | https://go.microsoft.com/fwlink/?linkid=2038320
-Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2038323
-macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2038327
-Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2038332
-Linux RPM | https://go.microsoft.com/fwlink/?linkid=2038401
-Linux DEB | https://go.microsoft.com/fwlink/?linkid=2038405
+Windows User Installer | https://go.microsoft.com/fwlink/?linkid=2049972
+Windows System Installer | https://go.microsoft.com/fwlink/?linkid=2049975
+Windows ZIP | https://go.microsoft.com/fwlink/?linkid=2050146
+macOS ZIP | https://go.microsoft.com/fwlink/?linkid=2049981
+Linux TAR.GZ | https://go.microsoft.com/fwlink/?linkid=2049986
+Linux RPM | https://go.microsoft.com/fwlink/?linkid=2049989
+Linux DEB | https://go.microsoft.com/fwlink/?linkid=2050157
 
 Go to our [download page](https://aka.ms/azuredatastudio) for more specific instructions.
 
-Try out the latest insiders build from `master` at https://github.com/Microsoft/azuredatastudio/releases.
+Try out the latest insiders build from `master`:
+- [Windows User Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-user/insider)
+- [Windows System Installer - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64/insider)
+- [Windows ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/win32-x64-archive/insider)
+- [macOS ZIP - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/darwin/insider)
+- [Linux TAR.GZ - **Insiders build**](https://azuredatastudio-update.azurewebsites.net/latest/linux-x64/insider)
 
 See the [change log](https://github.com/Microsoft/azuredatastudio/blob/master/CHANGELOG.md) for additional details of what's in this release.
 
@@ -62,6 +68,10 @@ The [Microsoft Enterprise and Developer Privacy Statement](https://privacy.micro
 ## Contributions and "Thank You"
 We would like to thank all our users who raised issues, and in particular the following users who helped contribute fixes:
 
+* Tarig0  for `Add Routine_Type to CreateStoredProc fixes #3257 (#3286)`
+* oltruong  for `typo fix #3025'`
+* Thomas-S-B for `Removed unnecessary IErrorDetectionStrategy #749`
+* Thomas-S-B for `Simplified code #750`
 * rdaniels6813  for `Add query plan theme support #3031`
 * Ruturaj123 for `Fixed some typos and grammatical errors #3027`
 * PromoFaux for `Use emoji shortcodes in CONTRIBUTING.md instead of <20> #3009`

azure-pipelines-linux-mac.yml

@@ -34,5 +34,9 @@ steps:
 
 - task: PublishTestResults@2
   inputs:
-    testResultsFiles: '**/test-results.xml'    
-  condition: succeededOrFailed()
+    testResultsFiles: '**/test-results.xml'
+  condition: succeededOrFailed()
+
+- script: |
+    yarn run tslint
+  displayName: 'Run TSLint'

azure-pipelines-windows.yml

@@ -23,4 +23,8 @@ steps:
 - task: PublishTestResults@2
   inputs:
     testResultsFiles: 'test-results.xml'
-  condition: succeededOrFailed()
+  condition: succeededOrFailed()
+
+- script: |
+    yarn run tslint
+  displayName: 'Run TSLint'

build/gulpfile.vscode.js

@@ -65,6 +65,8 @@ const excludedExtensions = [
 	'vscode-colorize-tests',
 	'ms-vscode.node-debug',
 	'ms-vscode.node-debug2',
+	// {{SQL CARBON EDIT}}
+	'integration-tests',
 ];
 
 // {{SQL CARBON EDIT}}
@@ -76,7 +78,7 @@ const sqlBuiltInExtensions = [
 	'import',
 	'profiler'
 ];
-var azureExtensions =  [ 'azurecore'];
+var azureExtensions =  [ 'azurecore', 'mssql'];
 
 const vscodeEntryPoints = _.flatten([
 	buildfile.entrypoint('vs/workbench/workbench.main'),
@@ -278,13 +280,12 @@ function packageBuiltInExtensions() {
 	});
 }
 
-// {{SQL CARBON EDIT}}
-function packageAzureCoreTask(platform, arch) {
+function packageExtensionTask(extensionName, platform, arch) {
 	var destination = path.join(path.dirname(root), 'azuredatastudio') + (platform ? '-' + platform : '') + (arch ? '-' + arch : '');
 	if (platform === 'darwin') {
-		destination = path.join(destination, 'Azure Data Studio.app', 'Contents', 'Resources', 'app', 'extensions', 'azurecore');
+		destination = path.join(destination, 'Azure Data Studio.app', 'Contents', 'Resources', 'app', 'extensions', extensionName);
 	} else {
-		destination = path.join(destination, 'resources', 'app', 'extensions', 'azurecore');
+		destination = path.join(destination, 'resources', 'app', 'extensions', extensionName);
 	}
 
 	platform = platform || process.platform;
@@ -297,7 +298,7 @@ function packageAzureCoreTask(platform, arch) {
 				const extensionName = path.basename(extensionPath);
 				return { name: extensionName, path: extensionPath };
 			})
-			.filter(({ name }) => azureExtensions.indexOf(name) > -1);
+			.filter(({ name }) => extensionName === name);
 
 		const localExtensions = es.merge(...localExtensionDescriptions.map(extension => {
 			return ext.fromLocal(extension.path);
@@ -498,9 +499,13 @@ function packageTask(platform, arch, opts) {
 const buildRoot = path.dirname(root);
 
 // {{SQL CARBON EDIT}}
-gulp.task('vscode-win32-x64-azurecore', ['optimize-vscode'], packageAzureCoreTask('win32', 'x64'));
-gulp.task('vscode-darwin-azurecore', ['optimize-vscode'], packageAzureCoreTask('darwin'));
-gulp.task('vscode-linux-x64-azurecore', ['optimize-vscode'], packageAzureCoreTask('linux', 'x64'));
+gulp.task('vscode-win32-x64-azurecore', ['optimize-vscode'], packageExtensionTask('azurecore', 'win32', 'x64'));
+gulp.task('vscode-darwin-azurecore', ['optimize-vscode'], packageExtensionTask('azurecore', 'darwin'));
+gulp.task('vscode-linux-x64-azurecore', ['optimize-vscode'], packageExtensionTask('azurecore', 'linux', 'x64'));
+
+gulp.task('vscode-win32-x64-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], packageExtensionTask('mssql', 'win32', 'x64'));
+gulp.task('vscode-darwin-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], packageExtensionTask('mssql', 'darwin'));
+gulp.task('vscode-linux-x64-mssql', ['vscode-linux-x64-azurecore', 'optimize-vscode'], packageExtensionTask('mssql', 'linux', 'x64'));
 
 gulp.task('clean-vscode-win32-ia32', util.rimraf(path.join(buildRoot, 'azuredatastudio-win32-ia32')));
 gulp.task('clean-vscode-win32-x64', util.rimraf(path.join(buildRoot, 'azuredatastudio-win32-x64')));
@@ -510,10 +515,10 @@ gulp.task('clean-vscode-linux-x64', util.rimraf(path.join(buildRoot, 'azuredatas
 gulp.task('clean-vscode-linux-arm', util.rimraf(path.join(buildRoot, 'azuredatastudio-linux-arm')));
 
 gulp.task('vscode-win32-ia32', ['optimize-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32'));
-gulp.task('vscode-win32-x64',  ['vscode-win32-x64-azurecore', 'optimize-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64'));
-gulp.task('vscode-darwin', ['vscode-darwin-azurecore', 'optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin'));
+gulp.task('vscode-win32-x64',  ['vscode-win32-x64-azurecore', 'vscode-win32-x64-mssql', 'optimize-vscode', 'clean-vscode-win32-x64'], packageTask('win32', 'x64'));
+gulp.task('vscode-darwin', ['vscode-darwin-azurecore', 'vscode-darwin-mssql', 'optimize-vscode', 'clean-vscode-darwin'], packageTask('darwin'));
 gulp.task('vscode-linux-ia32', ['optimize-vscode', 'clean-vscode-linux-ia32'], packageTask('linux', 'ia32'));
-gulp.task('vscode-linux-x64', ['vscode-linux-x64-azurecore', 'optimize-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64'));
+gulp.task('vscode-linux-x64', ['vscode-linux-x64-azurecore', 'vscode-linux-x64-mssql', 'optimize-vscode', 'clean-vscode-linux-x64'], packageTask('linux', 'x64'));
 gulp.task('vscode-linux-arm', ['optimize-vscode', 'clean-vscode-linux-arm'], packageTask('linux', 'arm'));
 
 gulp.task('vscode-win32-ia32-min', ['minify-vscode', 'clean-vscode-win32-ia32'], packageTask('win32', 'ia32', { minified: true }));

extensions/agent/package.json

@@ -9,7 +9,7 @@
   "icon": "images/sqlserver.png",
   "aiKey": "AIF-5574968e-856d-40d2-af67-c89a14e76412",
   "engines": {
-      "vscode": "0.10.x"
+    "vscode": "0.10.x"
   },
   "activationEvents": [
     "*"
@@ -45,7 +45,7 @@
     "vscode-nls": "^3.2.1"
   },
   "devDependencies": {
-		"mocha-junit-reporter": "^1.17.0",
-		"mocha-multi-reporters": "^1.1.7"
-	}
+    "mocha-junit-reporter": "^1.17.0",
+    "mocha-multi-reporters": "^1.1.7"
+  }
 }

extensions/agent/src/data/alertData.ts

@@ -69,7 +69,7 @@ export class AlertData implements IAgentDialogData {
 			this.eventDescriptionKeyword = alertInfo.eventDescriptionKeyword;
 			this.eventSource = alertInfo.eventSource;
 			this.hasNotification = alertInfo.hasNotification;
-			this.includeEventDescription = alertInfo.includeEventDescription.toString();
+			this.includeEventDescription = alertInfo.includeEventDescription ? alertInfo.includeEventDescription.toString() : null;
 			this.isEnabled = alertInfo.isEnabled;
 			this.jobId = alertInfo.jobId;
 			this.lastOccurrenceDate = alertInfo.lastOccurrenceDate;
@@ -82,7 +82,7 @@ export class AlertData implements IAgentDialogData {
 			this.databaseName = alertInfo.databaseName;
 			this.countResetDate = alertInfo.countResetDate;
 			this.categoryName = alertInfo.categoryName;
-			this.alertType = alertInfo.alertType.toString();
+			this.alertType = alertInfo.alertType ? alertInfo.alertType.toString() : null;
 			this.wmiEventNamespace = alertInfo.wmiEventNamespace;
 			this.wmiEventQuery = alertInfo.wmiEventQuery;
 		}

extensions/agent/src/data/jobData.ts

@@ -26,6 +26,7 @@ export class JobData implements IAgentDialogData {
 	private _operators: string[];
 	private _defaultOwner: string;
 	private _jobCompletionActionConditions: sqlops.CategoryValue[];
+	private _jobCategoryIdsMap: sqlops.AgentJobCategory[];
 
 	public dialogMode: AgentDialogMode = AgentDialogMode.CREATE;
 	public name: string;
@@ -46,6 +47,7 @@ export class JobData implements IAgentDialogData {
 	public alerts: sqlops.AgentAlertInfo[];
 	public jobId: string;
 	public startStepId: number;
+	public categoryType: number;
 
 	constructor(
 		ownerUri: string,
@@ -66,6 +68,8 @@ export class JobData implements IAgentDialogData {
 			this.alerts = jobInfo.alerts;
 			this.jobId = jobInfo.jobId;
 			this.startStepId = jobInfo.startStepId;
+			this.categoryId = jobInfo.categoryId;
+			this.categoryType = jobInfo.categoryType;
 		}
 	}
 
@@ -73,6 +77,10 @@ export class JobData implements IAgentDialogData {
 		return this._jobCategories;
 	}
 
+	public get jobCategoryIdsMap(): sqlops.AgentJobCategory[] {
+		return this._jobCategoryIdsMap;
+	}
+
 	public get operators(): string[] {
 		return this._operators;
 	}
@@ -96,7 +104,7 @@ export class JobData implements IAgentDialogData {
 			this._jobCategories = jobDefaults.categories.map((cat) => {
 				return cat.name;
 			});
-
+			this._jobCategoryIdsMap = jobDefaults.categories;
 			this._defaultOwner = jobDefaults.owner;
 
 			this._operators = ['', this._defaultOwner];
@@ -164,8 +172,8 @@ export class JobData implements IAgentDialogData {
 			hasSchedule: false,
 			hasStep: false,
 			runnable: true,
-			categoryId: 0,
-			categoryType: 1, // LocalJob, hard-coding the value, corresponds to the target tab in SSMS
+			categoryId: this.categoryId,
+			categoryType: this.categoryType,
 			lastRun: '',
 			nextRun: '',
 			jobId: this.jobId,

extensions/agent/src/dialogs/jobDialog.ts

@@ -94,6 +94,9 @@ export class JobDialog extends AgentDialog<JobData>  {
 	private editStepButton: sqlops.ButtonComponent;
 	private deleteStepButton: sqlops.ButtonComponent;
 
+	// Schedule tab controls
+	private removeScheduleButton: sqlops.ButtonComponent;
+
 	// Notifications tab controls
 	private notificationsTabTopLabel: sqlops.TextComponent;
 	private emailCheckBox: sqlops.CheckBoxComponent;
@@ -302,6 +305,7 @@ export class JobDialog extends AgentDialog<JobData>  {
 				this.stepsTable.data = this.convertStepsToData(this.steps);
 				this.steps[previousRow].id = previousStepId;
 				this.steps[rowNumber].id = currentStepId;
+				this.stepsTable.selectedRows = [previousRow];
 			});
 
 			this.moveStepDownButton.onDidClick(() => {
@@ -316,6 +320,7 @@ export class JobDialog extends AgentDialog<JobData>  {
 				this.stepsTable.data = this.convertStepsToData(this.steps);
 				this.steps[nextRow].id = nextStepId;
 				this.steps[rowNumber].id = currentStepId;
+				this.stepsTable.selectedRows = [nextRow];
 			});
 
 			this.editStepButton.onDidClick(() => {
@@ -346,20 +351,30 @@ export class JobDialog extends AgentDialog<JobData>  {
 				if (this.stepsTable.selectedRows.length === 1) {
 					let rowNumber = this.stepsTable.selectedRows[0];
 					AgentUtils.getAgentService().then((agentService) => {
-						let steps = this.model.jobSteps ? this.model.jobSteps : [];
-						let stepData = this.model.jobSteps[rowNumber];
-						agentService.deleteJobStep(this.ownerUri, stepData).then((result) => {
-							if (result && result.success) {
-								delete steps[rowNumber];
-								let data = this.convertStepsToData(steps);
-								this.stepsTable.data = data;
-								this.startStepDropdownValues = [];
-								this.steps.forEach((step) => {
-									this.startStepDropdownValues.push({ displayName: step.id + ': ' + step.stepName, name: step.id.toString() });
-								});
-								this.startStepDropdown.values = this.startStepDropdownValues;
-							}
-						});
+						let stepData = this.steps[rowNumber];
+						if (stepData.jobId) {
+							agentService.deleteJobStep(this.ownerUri, stepData).then((result) => {
+								if (result && result.success) {
+									this.steps.splice(rowNumber, 1);
+									let data = this.convertStepsToData(this.steps);
+									this.stepsTable.data = data;
+									this.startStepDropdownValues = [];
+									this.steps.forEach((step) => {
+										this.startStepDropdownValues.push({ displayName: step.id + ': ' + step.stepName, name: step.id.toString() });
+									});
+									this.startStepDropdown.values = this.startStepDropdownValues;
+								}
+							});
+						} else {
+							this.steps.splice(rowNumber, 1);
+							let data = this.convertStepsToData(this.steps);
+							this.stepsTable.data = data;
+							this.startStepDropdownValues = [];
+							this.steps.forEach((step) => {
+								this.startStepDropdownValues.push({ displayName: step.id + ': ' + step.stepName, name: step.id.toString() });
+							});
+							this.startStepDropdown.values = this.startStepDropdownValues;
+						}
 					});
 				}
 			});
@@ -468,7 +483,11 @@ export class JobDialog extends AgentDialog<JobData>  {
 				label: this.PickScheduleButtonString,
 				width: 80
 			}).component();
-			this.pickScheduleButton.onDidClick((e)=>{
+			this.removeScheduleButton = view.modelBuilder.button().withProperties({
+				label: 'Remove schedule',
+				width: 100
+			}).component();
+			this.pickScheduleButton.onDidClick(()=>{
 				let pickScheduleDialog = new PickScheduleDialog(this.model.ownerUri, this.model.name);
 				pickScheduleDialog.onSuccess((dialogModel) => {
 					let selectedSchedule = dialogModel.selectedSchedule;
@@ -483,12 +502,23 @@ export class JobDialog extends AgentDialog<JobData>  {
 				});
 				pickScheduleDialog.showDialog();
 			});
-
+			this.removeScheduleButton.onDidClick(() => {
+                if (this.schedulesTable.selectedRows.length === 1) {
+                    let selectedRow = this.schedulesTable.selectedRows[0];
+					let selectedScheduleName = this.schedulesTable.data[selectedRow][1];
+					for (let i = 0; i < this.schedules.length; i++) {
+						if (this.schedules[i].name === selectedScheduleName) {
+							this.schedules.splice(i, 1);
+						}
+					}
+					this.populateScheduleTable();
+				}
+			});
 			let formModel = view.modelBuilder.formContainer()
 				.withFormItems([{
 					component: this.schedulesTable,
 					title: this.SchedulesTopLabelString,
-					actions: [this.pickScheduleButton]
+					actions: [this.pickScheduleButton, this.removeScheduleButton]
 				}]).withLayout({ width: '100%' }).component();
 
 			await view.initializeModel(formModel);
@@ -499,10 +529,9 @@ export class JobDialog extends AgentDialog<JobData>  {
 
 	private populateScheduleTable() {
 		let data = this.convertSchedulesToData(this.schedules);
-		if (data.length > 0) {
-			this.schedulesTable.data = data;
-			this.schedulesTable.height = 750;
-		}
+		this.schedulesTable.data = data;
+		this.schedulesTable.height = 750;
+
 	}
 
 	private initializeNotificationsTab() {
@@ -674,5 +703,6 @@ export class JobDialog extends AgentDialog<JobData>  {
 			this.model.alerts = [];
 		}
 		this.model.alerts = this.alerts;
+		this.model.categoryId = +this.model.jobCategoryIdsMap.find(cat => cat.name === this.model.category).id;
 	}
 }

extensions/agent/src/dialogs/jobStepDialog.ts

@@ -29,11 +29,10 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 	private readonly AdvancedTabText: string = localize('jobStepDialog.advanced', 'Advanced');
 	private readonly OpenCommandText: string = localize('jobStepDialog.open', 'Open...');
 	private readonly ParseCommandText: string = localize('jobStepDialog.parse','Parse');
-	private readonly NextButtonText: string = localize('jobStepDialog.next', 'Next');
-	private readonly PreviousButtonText: string = localize('jobStepDialog.previous','Previous');
 	private readonly SuccessfulParseText: string = localize('jobStepDialog.successParse', 'The command was successfully parsed.');
 	private readonly FailureParseText: string = localize('jobStepDialog.failParse', 'The command failed.');
 	private readonly BlankStepNameErrorText: string = localize('jobStepDialog.blankStepName', 'The step name cannot be left blank');
+	private readonly ProcessExitCodeText: string = localize('jobStepDialog.processExitCode', 'Process exit code of a successful command:');
 
 	// General Control Titles
 	private readonly StepNameLabelString: string = localize('jobStepDialog.stepNameLabel', 'Step Name');
@@ -62,6 +61,8 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 
 	// Dropdown options
 	private readonly TSQLScript: string = localize('jobStepDialog.TSQL', 'Transact-SQL script (T-SQL)');
+	private readonly Powershell: string = localize('jobStepDialog.powershell', 'PowerShell');
+	private readonly CmdExec: string = localize('jobStepDialog.CmdExec', 'Operating system (CmdExec)');
 	private readonly AgentServiceAccount: string = localize('jobStepDialog.agentServiceAccount', 'SQL Server Agent Service Account');
 	private readonly NextStep: string = localize('jobStepDialog.nextStep', 'Go to the next step');
 	private readonly QuitJobReportingSuccess: string = localize('jobStepDialog.quitJobSuccess', 'Quit the job reporting success');
@@ -88,6 +89,7 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 	private outputFileNameBox: sqlops.InputBoxComponent;
 	private fileBrowserNameBox: sqlops.InputBoxComponent;
 	private userInputBox: sqlops.InputBoxComponent;
+	private processExitCodeBox: sqlops.InputBoxComponent;
 
 	// Dropdowns
 	private typeDropdown: sqlops.DropDownComponent;
@@ -100,8 +102,6 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 	// Buttons
 	private openButton: sqlops.ButtonComponent;
 	private parseButton: sqlops.ButtonComponent;
-	private nextButton: sqlops.ButtonComponent;
-	private previousButton: sqlops.ButtonComponent;
 	private outputFileBrowserButton: sqlops.ButtonComponent;
 
 	// Checkbox
@@ -179,18 +179,6 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 				inputType: 'text'
 			})
 			.component();
-		this.nextButton = view.modelBuilder.button()
-			.withProperties({
-				label: this.NextButtonText,
-				enabled: false,
-				width: '80px'
-			}).component();
-		this.previousButton = view.modelBuilder.button()
-			.withProperties({
-				label: this.PreviousButtonText,
-				enabled: false,
-				width: '80px'
-			}).component();
 	}
 
 	private createGeneralTab(databases: string[], queryProvider: sqlops.QueryProvider) {
@@ -208,7 +196,7 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 			this.typeDropdown = view.modelBuilder.dropDown()
 				.withProperties({
 					value: this.TSQLScript,
-					values: [this.TSQLScript]
+					values: [this.TSQLScript, this.CmdExec, this.Powershell]
 				})
 				.component();
 			this.runAsDropdown = view.modelBuilder.dropDown()
@@ -218,33 +206,20 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 				})
 				.component();
 			this.runAsDropdown.enabled = false;
-			this.typeDropdown.onValueChanged((type) => {
-				if (type.selected !== this.TSQLScript) {
-					this.runAsDropdown.value = this.AgentServiceAccount;
-					this.runAsDropdown.values = [this.runAsDropdown.value];
-				} else {
-					this.runAsDropdown.value = '';
-					this.runAsDropdown.values = [''];
-				}
-			});
 			this.databaseDropdown = view.modelBuilder.dropDown()
 				.withProperties({
 					value: databases[0],
 					values: databases
 				}).component();
 
+			this.processExitCodeBox = view.modelBuilder.inputBox()
+				.withProperties({
+				}).component();
+			this.processExitCodeBox.enabled = false;
+
 			// create the commands section
 			this.createCommands(view, queryProvider);
 
-			let buttonContainer = view.modelBuilder.flexContainer()
-			.withLayout({
-				flexFlow: 'row',
-				justifyContent: 'space-between',
-				width: 420
-			}).withItems([this.openButton, this.parseButton, this.previousButton, this.nextButton], {
-				flex: '1 1 50%'
-			}).component();
-
 			let formModel = view.modelBuilder.formContainer()
 				.withFormItems([{
 					component: this.nameTextBox,
@@ -258,14 +233,52 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 				}, {
 					component: this.databaseDropdown,
 					title: this.DatabaseLabelString
+				}, {
+					component: this.processExitCodeBox,
+					title: this.ProcessExitCodeText
 				}, {
 					component: this.commandTextBox,
 					title: this.CommandLabelString,
-					actions: [buttonContainer]
+					actions: [this.openButton, this.parseButton]
 				}], {
 						horizontal: false,
 						componentWidth: 420
 					}).component();
+			this.typeDropdown.onValueChanged((type) => {
+				switch (type.selected) {
+					case(this.TSQLScript):
+						this.runAsDropdown.value = '';
+						this.runAsDropdown.values = [''];
+						this.runAsDropdown.enabled = false;
+						this.databaseDropdown.enabled = true;
+						this.databaseDropdown.values = databases;
+						this.databaseDropdown.value = databases[0];
+						this.processExitCodeBox.value = '';
+						this.processExitCodeBox.enabled = false;
+						break;
+					case(this.Powershell):
+						this.runAsDropdown.value = this.AgentServiceAccount;
+						this.runAsDropdown.values = [this.runAsDropdown.value];
+						this.runAsDropdown.enabled = true;
+						this.databaseDropdown.enabled = false;
+						this.databaseDropdown.values = [''];
+						this.databaseDropdown.value = '';
+						this.processExitCodeBox.value = '';
+						this.processExitCodeBox.enabled = false;
+						break;
+					case(this.CmdExec):
+						this.databaseDropdown.enabled = false;
+						this.databaseDropdown.values = [''];
+						this.databaseDropdown.value = '';
+						this.runAsDropdown.value = this.AgentServiceAccount;
+						this.runAsDropdown.values = [this.runAsDropdown.value];
+						this.runAsDropdown.enabled = true;
+						this.processExitCodeBox.enabled = true;
+						this.processExitCodeBox.value = '0';
+						break;
+
+				}
+			});
 			let formWrapper = view.modelBuilder.loadingComponent().withItem(formModel).component();
 			formWrapper.loading = false;
 			await view.initializeModel(formWrapper);
@@ -524,6 +537,7 @@ export class JobStepDialog extends AgentDialog<JobStepData> {
 		this.model.outputFileName = this.outputFileNameBox.value;
 		this.model.appendToLogFile = this.appendToExistingFileCheckbox.checked;
 		this.model.command = this.commandTextBox.value ? this.commandTextBox.value : '';
+		this.model.commandExecutionSuccessCode = this.processExitCodeBox.value ? +this.processExitCodeBox.value : 0;
 	}
 
 	public async initializeDialog() {

extensions/agent/yarn.lock

@@ -25,11 +25,11 @@ debug@^2.2.0:
     ms "2.0.0"
 
 debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
-    ms "2.0.0"
+    ms "^2.1.1"
 
 is-buffer@~1.1.1:
   version "1.1.6"
@@ -37,9 +37,9 @@ is-buffer@~1.1.1:
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 lodash@^4.16.4:
-  version "4.17.10"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
-  integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 md5@^2.1.0:
   version "2.2.1"
@@ -63,9 +63,9 @@ mkdirp@~0.5.1:
     minimist "0.0.8"
 
 mocha-junit-reporter@^1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
-  integrity sha1-LlFJ7UD8XS48px5C21qx/snG2Fw=
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.18.0.tgz#9209a3fba30025ae3ae5e6bfe7f9c5bc3c2e8ee2"
+  integrity sha512-y3XuqKa2+HRYtg0wYyhW/XsLm2Ps+pqf9HaTAt7+MVUAKFJaNAHOrNseTZo9KCxjfIbxUWwckP5qCDDPUmjSWA==
   dependencies:
     debug "^2.2.0"
     md5 "^2.1.0"
@@ -86,6 +86,11 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
+ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
@@ -94,9 +99,9 @@ strip-ansi@^4.0.0:
     ansi-regex "^3.0.0"
 
 vscode-nls@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.2.tgz#3817eca5b985c2393de325197cf4e15eb2aa5350"
-  integrity sha512-/Ur1+tgazwd51+ncRyoy0UIu4dvMdVXS9XMUULQlZIBoNGEwOhwEx9x+hHWoUjldMrOQ32t2CGKo0u6D4R6/hg==
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.2.5.tgz#25520c1955108036dec607c85e00a522f247f1a4"
+  integrity sha512-ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw==
 
 xml@^1.0.0:
   version "1.0.1"

extensions/azurecore/package.json

@@ -17,12 +17,12 @@
 		"configuration": [
 			{
 				"type": "object",
-				"title": "%azure.config.title%",
+				"title": "%azure.resource.config.title%",
 				"properties": {
-					"azureResource.resourceFilter": {
+					"azure.resource.config.filter": {
 						"type": "array",
 						"default": null,
-						"description": "%azure.resourceFilter.description%"
+						"description": "%azure.resource.config.filter.description%"
 					}
 				}
 			},
@@ -61,39 +61,47 @@
 				"category": "Azure Accounts"
 			},
 			{
-				"command": "azureresource.refreshall",
-				"title": "%azureresource.refreshall%",
+				"command": "azure.resource.refreshall",
+				"title": "%azure.resource.refreshall.title%",
 				"icon": {
 					"dark": "resources/dark/refresh_inverse.svg",
 					"light": "resources/light/refresh.svg"
 				}
 			},
 			{
-				"command": "azureresource.refresh",
-				"title": "%azureresource.refresh%",
+				"command": "azure.resource.refresh",
+				"title": "%azure.resource.refresh.title%",
 				"icon": {
 					"dark": "resources/dark/refresh_inverse.svg",
 					"light": "resources/light/refresh.svg"
 				}
 			},
 			{
-				"command": "azureresource.signin",
-				"title": "%azureresource.signin%"
+				"command": "azure.resource.signin",
+				"title": "%azure.resource.signin.title%"
 			},
 			{
-				"command": "azureresource.connectsqldb",
-				"title": "%azureresource.connectsqldb%",
+				"command": "azure.resource.selectsubscriptions",
+				"title": "%azure.resource.selectsubscriptions.title%",
+				"icon": {
+					"dark": "resources/dark/filter_inverse.svg",
+					"light": "resources/light/filter.svg"
+				}
+			},
+			{
+				"command": "azure.resource.connectsqlserver",
+				"title": "%azure.resource.connectsqlserver.title%",
 				"icon": {
 					"dark": "resources/dark/connect_to_inverse.svg",
 					"light": "resources/light/connect_to.svg"
 				}
 			},
 			{
-				"command": "azureresource.selectsubscriptions",
-				"title": "%azureresource.selectsubscriptions%",
+				"command": "azure.resource.connectsqldb",
+				"title": "%azure.resource.connectsqldb.title%",
 				"icon": {
-					"dark": "resources/dark/filter_inverse.svg",
-					"light": "resources/light/filter.svg"
+					"dark": "resources/dark/connect_to_inverse.svg",
+					"light": "resources/light/connect_to.svg"
 				}
 			}
 		],
@@ -110,46 +118,55 @@
 			"azureResource": [
 				{
 					"id": "azureResourceExplorer",
-					"name": "%azure.resourceExplorer.title%"
+					"name": "%azure.resource.explorer.title%"
+				}
+			]
+		},
+		"dataExplorer": {
+			"azureResource": [
+				{
+					"id": "azureResourceExplorer",
+					"name": "%azure.resource.explorer.title%"
 				}
 			]
 		},
 		"menus": {
 			"view/title": [
 				{
-					"command": "azureresource.refreshall",
+					"command": "azure.resource.refreshall",
 					"when": "view == azureResourceExplorer",
 					"group": "navigation@1"
 				}
 			],
 			"view/item/context": [
 				{
-					"command": "azureresource.connectsqldb",
-					"when": "viewItem =~ /^azureResource\\.itemType\\.database(?:Server){0,1}$/",
-					"group": "1azureresource@1"
-				},
-				{
-					"command": "azureresource.connectsqldb",
-					"when": "viewItem =~ /^azureResource\\.itemType\\.database(?:Server){0,1}$/",
+					"command": "azure.resource.selectsubscriptions",
+					"when": "viewItem == azure.resource.itemType.account",
 					"group": "inline"
 				},
 				{
-					"command": "azureresource.selectsubscriptions",
-					"when": "viewItem == azureResource.itemType.account",
+					"command": "azure.resource.refresh",
+					"when": "viewItem =~ /^azure\\.resource\\.itemType\\.(?:account|subscription|databaseContainer|databaseServerContainer)$/",
 					"group": "inline"
 				},
 				{
-					"command": "azureresource.refresh",
-					"when": "viewItem =~ /^azureResource\\.itemType\\.(?:account|subscription|databaseContainer|databaseServerContainer)$/",
+					"command": "azure.resource.connectsqlserver",
+					"when": "viewItem == azure.resource.itemType.databaseServer",
+					"group": "inline"
+				},
+				{
+					"command": "azure.resource.connectsqldb",
+					"when": "viewItem == azure.resource.itemType.database",
 					"group": "inline"
 				}
 			]
-		}
+		},
+		"hasAzureResourceProviders": true
 	},
 	"dependencies": {
-		"request": "2.88.0",
 		"azure-arm-resource": "^7.0.0",
 		"azure-arm-sql": "^5.0.1",
+		"request": "2.88.0",
 		"vscode-nls": "^4.0.0"
 	},
 	"devDependencies": {
@@ -157,6 +174,7 @@
 		"@types/node": "^8.0.24",
 		"mocha": "^5.2.0",
 		"should": "^13.2.1",
-		"typemoq": "^2.1.0"
+		"typemoq": "^2.1.0",
+		"vscode": "^1.1.26"
 	}
-}
+}

extensions/azurecore/package.nls.json

@@ -1,16 +1,20 @@
 {
 	"azure.displayName": "Azure (Core)",
 	"azure.description": "Browse and work with Azure resources",
-	"azure.config.title": "Azure Resource Configuration",
-	"azure.resourceFilter.description": "The resource filter, each element is an account id, a subscription id and name separated by a slash",
-	"azureresource.refreshall": "Refresh All",
-	"azureresource.refresh": "Refresh",
-	"azureresource.signin": "Sign In",
-	"azureresource.connectsqldb": "Connect",
-	"azureresource.selectsubscriptions": "Select Subscriptions",
 	"azure.title": "Azure",
-	"azure.resourceExplorer.title": "Resource Explorer",
+
+	"azure.resource.config.title": "Azure Resource Configuration",
+	"azure.resource.config.filter.description": "The resource filter, each element is an account id, a subscription id and name separated by a slash",
+	"azure.resource.explorer.title": "Resource Explorer",
+	"azure.resource.refreshall.title": "Refresh All",
+	"azure.resource.refresh.title": "Refresh",
+	"azure.resource.signin.title": "Sign In",
+	"azure.resource.selectsubscriptions.title": "Select Subscriptions",
+	"azure.resource.connectsqlserver.title": "Connect",
+	"azure.resource.connectsqldb.title": "Connect",
+
 	"accounts.clearTokenCache": "Clear Azure Account Token Cache",
+
 	"config.enablePublicCloudDescription": "Should Azure public cloud integration be enabled",
 	"config.enableUsGovCloudDescription": "Should US Government Azure cloud (Fairfax) integration be enabled",
 	"config.enableChinaCloudDescription": "Should Azure China integration be enabled",

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

@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TreeDataProvider, TreeItem } from 'vscode';
+import { DataProvider, Account } from 'sqlops';
+
+export namespace azureResource {
+	export interface IAzureResourceProvider extends DataProvider {
+		getTreeDataProvider(): IAzureResourceTreeDataProvider;
+	}
+
+	export interface IAzureResourceTreeDataProvider extends TreeDataProvider<IAzureResourceNode> {
+	}
+
+	export interface IAzureResourceNode {
+		readonly account: Account;
+		readonly subscription: AzureResourceSubscription;
+		readonly tenantId: string;
+		readonly treeItem: TreeItem;
+	}
+
+	export interface AzureResourceSubscription {
+		id: string;
+		name: string;
+	}
+}

extensions/azurecore/src/azureResource/commands.ts

@@ -6,35 +6,48 @@
 'use strict';
 
 import { window, QuickPickItem } from 'vscode';
-import * as sqlops from 'sqlops';
-import { generateGuid } from './utils';
-import { ApiWrapper } from '../apiWrapper';
-import { TreeNode } from '../treeNodes';
+import { AzureResource } from 'sqlops';
+import { TokenCredentials } from 'ms-rest';
+import { AppContext } from '../appContext';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
 
+import { azureResource } from './azure-resource';
+import { TreeNode } from './treeNode';
+import { AzureResourceCredentialError } from './errors';
 import { AzureResourceTreeProvider } from './tree/treeProvider';
-import { AzureResourceDatabaseServerTreeNode } from './tree/databaseServerTreeNode';
-import { AzureResourceDatabaseTreeNode } from './tree/databaseTreeNode';
 import { AzureResourceAccountTreeNode } from './tree/accountTreeNode';
-import { AzureResourceServicePool } from './servicePool';
-import { AzureResourceSubscription } from './models';
+import { IAzureResourceSubscriptionService, IAzureResourceSubscriptionFilterService } from '../azureResource/interfaces';
+import { AzureResourceServiceNames } from './constants';
 
-export function registerAzureResourceCommands(apiWrapper: ApiWrapper, tree: AzureResourceTreeProvider): void {
-	apiWrapper.registerCommand('azureresource.selectsubscriptions', async (node?: TreeNode) => {
+export function registerAzureResourceCommands(appContext: AppContext, tree: AzureResourceTreeProvider): void {
+	appContext.apiWrapper.registerCommand('azure.resource.selectsubscriptions', async (node?: TreeNode) => {
 		if (!(node instanceof AzureResourceAccountTreeNode)) {
 			return;
 		}
 
+		const subscriptionService = appContext.getService<IAzureResourceSubscriptionService>(AzureResourceServiceNames.subscriptionService);
+		const subscriptionFilterService = appContext.getService<IAzureResourceSubscriptionFilterService>(AzureResourceServiceNames.subscriptionFilterService);
+
 		const accountNode = node as AzureResourceAccountTreeNode;
 
-		const servicePool = AzureResourceServicePool.getInstance();
+		const subscriptions = (await accountNode.getCachedSubscriptions()) || <azureResource.AzureResourceSubscription[]>[];
+		if (subscriptions.length === 0) {
+			try {
+				const tokens = await this.servicePool.apiWrapper.getSecurityToken(this.account, AzureResource.ResourceManagement);
 
-		let subscriptions = await accountNode.getCachedSubscriptions();
-		if (!subscriptions || subscriptions.length === 0) {
-			const credentials = await servicePool.credentialService.getCredentials(accountNode.account, sqlops.AzureResource.ResourceManagement);
-			subscriptions = await servicePool.subscriptionService.getSubscriptions(accountNode.account, credentials);
+				for (const tenant of this.account.properties.tenants) {
+					const token = tokens[tenant.id].token;
+					const tokenType = tokens[tenant.id].tokenType;
+
+					subscriptions.push(...await subscriptionService.getSubscriptions(accountNode.account, new TokenCredentials(token, tokenType)));
+				}
+			} catch (error) {
+				throw new AzureResourceCredentialError(localize('azure.resource.selectsubscriptions.credentialError', 'Failed to get credential for account {0}. Please refresh the account.', this.account.key.accountId), error);
+			}
 		}
 
-		const selectedSubscriptions = (await servicePool.subscriptionFilterService.getSelectedSubscriptions(accountNode.account)) || <AzureResourceSubscription[]>[];
+		let selectedSubscriptions = (await subscriptionFilterService.getSelectedSubscriptions(accountNode.account)) || <azureResource.AzureResourceSubscription[]>[];
 		const selectedSubscriptionIds: string[] = [];
 		if (selectedSubscriptions.length > 0) {
 			selectedSubscriptionIds.push(...selectedSubscriptions.map((subscription) => subscription.id));
@@ -43,11 +56,11 @@ export function registerAzureResourceCommands(apiWrapper: ApiWrapper, tree: Azur
 			selectedSubscriptionIds.push(...subscriptions.map((subscription) => subscription.id));
 		}
 
-		interface SubscriptionQuickPickItem extends QuickPickItem {
-			subscription: AzureResourceSubscription;
+		interface AzureResourceSubscriptionQuickPickItem extends QuickPickItem {
+			subscription: azureResource.AzureResourceSubscription;
 		}
 
-		const subscriptionItems: SubscriptionQuickPickItem[] = subscriptions.map((subscription) => {
+		const subscriptionQuickPickItems: AzureResourceSubscriptionQuickPickItem[] = subscriptions.map((subscription) => {
 			return {
 				label: subscription.name,
 				picked: selectedSubscriptionIds.indexOf(subscription.id) !== -1,
@@ -55,66 +68,22 @@ export function registerAzureResourceCommands(apiWrapper: ApiWrapper, tree: Azur
 			};
 		});
 
-		const pickedSubscriptionItems = (await window.showQuickPick(subscriptionItems, { canPickMany: true }));
-		if (pickedSubscriptionItems && pickedSubscriptionItems.length > 0) {
+		const selectedSubscriptionQuickPickItems = (await window.showQuickPick(subscriptionQuickPickItems, { canPickMany: true }));
+		if (selectedSubscriptionQuickPickItems && selectedSubscriptionQuickPickItems.length > 0) {
 			tree.refresh(node, false);
 
-			const pickedSubscriptions = pickedSubscriptionItems.map((subscriptionItem) => subscriptionItem.subscription);
-			await servicePool.subscriptionFilterService.saveSelectedSubscriptions(accountNode.account, pickedSubscriptions);
+			selectedSubscriptions = selectedSubscriptionQuickPickItems.map((subscriptionItem) => subscriptionItem.subscription);
+			await subscriptionFilterService.saveSelectedSubscriptions(accountNode.account, selectedSubscriptions);
 		}
 	});
 
-	apiWrapper.registerCommand('azureresource.refreshall', () => tree.notifyNodeChanged(undefined));
+	appContext.apiWrapper.registerCommand('azure.resource.refreshall', () => tree.notifyNodeChanged(undefined));
 
-	apiWrapper.registerCommand('azureresource.refresh', async (node?: TreeNode) => {
+	appContext.apiWrapper.registerCommand('azure.resource.refresh', async (node?: TreeNode) => {
 		tree.refresh(node, true);
 	});
 
-	apiWrapper.registerCommand('azureresource.connectsqldb', async (node?: TreeNode) => {
-		let connectionProfile: sqlops.IConnectionProfile = {
-			id: generateGuid(),
-			connectionName: undefined,
-			serverName: undefined,
-			databaseName: undefined,
-			userName: undefined,
-			password: '',
-			authenticationType: undefined,
-			savePassword: true,
-			groupFullName: '',
-			groupId: '',
-			providerName: undefined,
-			saveProfile: true,
-			options: {
-			}
-		};
-
-		if (node instanceof AzureResourceDatabaseServerTreeNode) {
-			let databaseServer = node.databaseServer;
-			connectionProfile.connectionName = `connection to '${databaseServer.defaultDatabaseName}' on '${databaseServer.fullName}'`;
-			connectionProfile.serverName = databaseServer.fullName;
-			connectionProfile.databaseName = databaseServer.defaultDatabaseName;
-			connectionProfile.userName = databaseServer.loginName;
-			connectionProfile.authenticationType = 'SqlLogin';
-			connectionProfile.providerName = 'MSSQL';
-		}
-
-		if (node instanceof AzureResourceDatabaseTreeNode) {
-			let database = node.database;
-			connectionProfile.connectionName = `connection to '${database.name}' on '${database.serverFullName}'`;
-			connectionProfile.serverName = database.serverFullName;
-			connectionProfile.databaseName = database.name;
-			connectionProfile.userName = database.loginName;
-			connectionProfile.authenticationType = 'SqlLogin';
-			connectionProfile.providerName = 'MSSQL';
-		}
-
-		const conn = await apiWrapper.openConnectionDialog(undefined, connectionProfile, { saveConnection: true, showDashboard: true });
-		if (conn) {
-			apiWrapper.executeCommand('workbench.view.connections');
-		}
-	});
-
-	apiWrapper.registerCommand('azureresource.signin', async (node?: TreeNode) => {
-		apiWrapper.executeCommand('sql.action.accounts.manageLinkedAccount');
+	appContext.apiWrapper.registerCommand('azure.resource.signin', async (node?: TreeNode) => {
+		appContext.apiWrapper.executeCommand('sql.action.accounts.manageLinkedAccount');
 	});
 }

extensions/azurecore/src/azureResource/constants.ts

@@ -6,11 +6,19 @@
 'use strict';
 
 export enum AzureResourceItemType {
-	account = 'azureResource.itemType.account',
-	subscription = 'azureResource.itemType.subscription',
-	databaseContainer = 'azureResource.itemType.databaseContainer',
-	database = 'azureResource.itemType.database',
-	databaseServerContainer = 'azureResource.itemType.databaseServerContainer',
-	databaseServer = 'azureResource.itemType.databaseServer',
-	message = 'azureResource.itemType.message'
+	account = 'azure.resource.itemType.account',
+	subscription = 'azure.resource.itemType.subscription',
+	databaseContainer = 'azure.resource.itemType.databaseContainer',
+	database = 'azure.resource.itemType.database',
+	databaseServerContainer = 'azure.resource.itemType.databaseServerContainer',
+	databaseServer = 'azure.resource.itemType.databaseServer',
+	message = 'azure.resource.itemType.message'
 }
+
+export enum AzureResourceServiceNames {
+	cacheService = 'AzureResourceCacheService',
+	accountService = 'AzureResourceAccountService',
+	subscriptionService = 'AzureResourceSubscriptionService',
+	subscriptionFilterService = 'AzureResourceSubscriptionFilterService',
+	tenantService = 'AzureResourceTenantService'
+}

extensions/azurecore/src/azureResource/errors.ts

@@ -8,7 +8,7 @@
 export class AzureResourceCredentialError extends Error {
 	constructor(
 		message: string,
-		public innerError: Error
+		public readonly innerError: Error
 	) {
 		super(message);
 	}

extensions/azurecore/src/azureResource/interfaces.ts

@@ -6,49 +6,40 @@
 'use strict';
 
 import { ServiceClientCredentials } from 'ms-rest';
-import * as sqlops from 'sqlops';
+import { Account, DidChangeAccountsParams } from 'sqlops';
 import { Event } from 'vscode';
 
-import { AzureResourceSubscription, AzureResourceDatabaseServer, AzureResourceDatabase } from './models';
+import { azureResource } from './azure-resource';
 
 export interface IAzureResourceAccountService {
-	getAccounts(): Promise<sqlops.Account[]>;
+	getAccounts(): Promise<Account[]>;
 
-	readonly onDidChangeAccounts: Event<sqlops.DidChangeAccountsParams>;
-}
-
-export interface IAzureResourceCredentialService {
-	getCredentials(account: sqlops.Account, resource: sqlops.AzureResource): Promise<ServiceClientCredentials[]>;
+	readonly onDidChangeAccounts: Event<DidChangeAccountsParams>;
 }
 
 export interface IAzureResourceSubscriptionService {
-	getSubscriptions(account: sqlops.Account, credentials: ServiceClientCredentials[]): Promise<AzureResourceSubscription[]>;
+	getSubscriptions(account: Account, credential: ServiceClientCredentials): Promise<azureResource.AzureResourceSubscription[]>;
 }
 
 export interface IAzureResourceSubscriptionFilterService {
-	getSelectedSubscriptions(account: sqlops.Account): Promise<AzureResourceSubscription[]>;
+	getSelectedSubscriptions(account: Account): Promise<azureResource.AzureResourceSubscription[]>;
 
-	saveSelectedSubscriptions(account: sqlops.Account, selectedSubscriptions: AzureResourceSubscription[]): Promise<void>;
-}
-
-export interface IAzureResourceDatabaseServerService {
-	getDatabaseServers(subscription: AzureResourceSubscription, credentials: ServiceClientCredentials[]): Promise<AzureResourceDatabaseServer[]>;
-}
-
-export interface IAzureResourceDatabaseService {
-	getDatabases(subscription: AzureResourceSubscription, credentials: ServiceClientCredentials[]): Promise<AzureResourceDatabase[]>;
+	saveSelectedSubscriptions(account: Account, selectedSubscriptions: azureResource.AzureResourceSubscription[]): Promise<void>;
 }
 
 export interface IAzureResourceCacheService {
+	generateKey(id: string): string;
+
 	get<T>(key: string): T | undefined;
 
 	update<T>(key: string, value: T): void;
 }
 
-export interface IAzureResourceContextService {
-	getAbsolutePath(relativePath: string): string;
-
-	executeCommand(commandId: string, ...args: any[]): void;
-
-	showErrorMessage(errorMessage: string): void;
+export interface IAzureResourceTenantService {
+	getTenantId(subscription: azureResource.AzureResourceSubscription): Promise<string>;
 }
+
+export interface IAzureResourceNodeWithProviderId {
+	resourceProviderId: string;
+	resourceNode: azureResource.IAzureResourceNode;
+}

extensions/azurecore/src/azureResource/messageTreeNode.ts

@@ -7,9 +7,9 @@
 
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { NodeInfo } from 'sqlops';
-import { TreeNode } from '../../treeNodes';
 
-import { AzureResourceItemType } from '../constants';
+import { TreeNode } from './treeNode';
+import { AzureResourceItemType } from './constants';
 
 export class AzureResourceMessageTreeNode extends TreeNode {
 	public constructor(

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

@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IConnectionProfile } from 'sqlops';
+import { AppContext } from '../../../appContext';
+
+import { TreeNode } from '../../treeNode';
+import { generateGuid } from '../../utils';
+import { AzureResourceItemType } from '../../constants';
+import { IAzureResourceDatabaseNode } from './interfaces';
+import { AzureResourceResourceTreeNode } from '../../resourceTreeNode';
+
+export function registerAzureResourceDatabaseCommands(appContext: AppContext): void {
+	appContext.apiWrapper.registerCommand('azure.resource.connectsqldb', async (node?: TreeNode) => {
+		if (!node)
+		{
+			return;
+		}
+
+		const treeItem = await node.getTreeItem();
+		if (treeItem.contextValue !== AzureResourceItemType.database) {
+			return;
+		}
+
+		const resourceNode = (node as AzureResourceResourceTreeNode).resourceNodeWithProviderId.resourceNode;
+		const database = (resourceNode as IAzureResourceDatabaseNode).database;
+
+		let connectionProfile: IConnectionProfile = {
+			id: generateGuid(),
+			connectionName: undefined,
+			serverName: database.serverFullName,
+			databaseName: database.name,
+			userName: database.loginName,
+			password: '',
+			authenticationType: 'SqlLogin',
+			savePassword: true,
+			groupFullName: '',
+			groupId: '',
+			providerName: 'MSSQL',
+			saveProfile: true,
+			options: {}
+		};
+
+		const conn = await appContext.apiWrapper.openConnectionDialog(undefined, connectionProfile, { saveConnection: true, showDashboard: true });
+		if (conn) {
+			appContext.apiWrapper.executeCommand('workbench.view.connections');
+		}
+	});
+}

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

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ExtensionContext } from 'vscode';
+import { ApiWrapper } from '../../../apiWrapper';
+
+import { azureResource } from '../../azure-resource';
+import { IAzureResourceDatabaseService } from './interfaces';
+import { AzureResourceDatabaseTreeDataProvider } from './databaseTreeDataProvider';
+
+export class AzureResourceDatabaseProvider implements azureResource.IAzureResourceProvider {
+	public constructor(
+		databaseService: IAzureResourceDatabaseService,
+		apiWrapper: ApiWrapper,
+		extensionContext: ExtensionContext
+	) {
+		this._databaseService = databaseService;
+		this._apiWrapper = apiWrapper;
+		this._extensionContext = extensionContext;
+	}
+
+	public getTreeDataProvider(): azureResource.IAzureResourceTreeDataProvider {
+		return new AzureResourceDatabaseTreeDataProvider(this._databaseService, this._apiWrapper, this._extensionContext);
+	}
+
+	public get providerId(): string {
+		return 'azure.resource.providers.database';
+	}
+
+	private _databaseService: IAzureResourceDatabaseService = undefined;
+	private _apiWrapper: ApiWrapper = undefined;
+	private _extensionContext: ExtensionContext = undefined;
+}

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

@@ -0,0 +1,41 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ServiceClientCredentials } from 'ms-rest';
+import { SqlManagementClient } from 'azure-arm-sql';
+
+import { azureResource } from '../../azure-resource';
+import { IAzureResourceDatabaseService } from './interfaces';
+import { AzureResourceDatabase } from './models';
+
+export class AzureResourceDatabaseService implements IAzureResourceDatabaseService {
+	public async getDatabases(subscription: azureResource.AzureResourceSubscription, credential: ServiceClientCredentials): Promise<AzureResourceDatabase[]> {
+		const databases: AzureResourceDatabase[] = [];
+		const sqlManagementClient = new SqlManagementClient(credential, subscription.id);
+		const svrs = await sqlManagementClient.servers.list();
+		for (const svr of svrs) {
+			// Extract resource group name from svr.id
+			const svrIdRegExp = new RegExp(`\/subscriptions\/${subscription.id}\/resourceGroups\/(.+)\/providers\/Microsoft\.Sql\/servers\/${svr.name}`);
+			if (!svrIdRegExp.test(svr.id)) {
+				continue;
+			}
+
+			const founds = svrIdRegExp.exec(svr.id);
+			const resouceGroup = founds[1];
+
+			const dbs = await sqlManagementClient.databases.listByServer(resouceGroup, svr.name);
+			dbs.forEach((db) => databases.push({
+				name: db.name,
+				serverName: svr.name,
+				serverFullName: svr.fullyQualifiedDomainName,
+				loginName: svr.administratorLogin
+			}));
+		}
+
+		return databases;
+	}
+}

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

@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { AzureResource } from 'sqlops';
+import { TreeItem, TreeItemCollapsibleState, ExtensionContext } from 'vscode';
+import { TokenCredentials } from 'ms-rest';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+import { azureResource } from '../../azure-resource';
+import { IAzureResourceDatabaseService, IAzureResourceDatabaseNode } from './interfaces';
+import { AzureResourceDatabase } from './models';
+import { AzureResourceItemType } from '../../../azureResource/constants';
+import { ApiWrapper } from '../../../apiWrapper';
+
+export class AzureResourceDatabaseTreeDataProvider implements azureResource.IAzureResourceTreeDataProvider {
+	public constructor(
+		databaseService: IAzureResourceDatabaseService,
+		apiWrapper: ApiWrapper,
+		extensionContext: ExtensionContext
+	) {
+		this._databaseService = databaseService;
+		this._apiWrapper = apiWrapper;
+		this._extensionContext = extensionContext;
+	}
+
+	public getTreeItem(element: azureResource.IAzureResourceNode): TreeItem | Thenable<TreeItem> {
+		return element.treeItem;
+	}
+
+	public async getChildren(element?: azureResource.IAzureResourceNode): Promise<azureResource.IAzureResourceNode[]> {
+		if (!element) {
+			return [this.createContainerNode()];
+		}
+
+		const tokens = await this._apiWrapper.getSecurityToken(element.account, AzureResource.ResourceManagement);
+		const credential = new TokenCredentials(tokens[element.tenantId].token, tokens[element.tenantId].tokenType);
+
+		const databases: AzureResourceDatabase[] = (await this._databaseService.getDatabases(element.subscription, credential)) || <AzureResourceDatabase[]>[];
+
+		return databases.map((database) => <IAzureResourceDatabaseNode>{
+			account: element.account,
+			subscription: element.subscription,
+			tenantId: element.tenantId,
+			database: database,
+			treeItem: {
+				id: `databaseServer_${database.serverFullName}.database_${database.name}`,
+				label: `${database.name} (${database.serverName})`,
+				iconPath: {
+					dark: this._extensionContext.asAbsolutePath('resources/dark/sql_database_inverse.svg'),
+					light: this._extensionContext.asAbsolutePath('resources/light/sql_database.svg')
+				},
+				collapsibleState: TreeItemCollapsibleState.None,
+				contextValue: AzureResourceItemType.database
+			}
+		});
+	}
+
+	private createContainerNode(): azureResource.IAzureResourceNode {
+		return {
+			account: undefined,
+			subscription: undefined,
+			tenantId: undefined,
+			treeItem: {
+				id: AzureResourceDatabaseTreeDataProvider.containerId,
+				label: AzureResourceDatabaseTreeDataProvider.containerLabel,
+				iconPath: {
+					dark: this._extensionContext.asAbsolutePath('resources/dark/folder_inverse.svg'),
+					light: this._extensionContext.asAbsolutePath('resources/light/folder.svg')
+				},
+				collapsibleState: TreeItemCollapsibleState.Collapsed,
+				contextValue: AzureResourceItemType.databaseContainer
+			}
+		};
+	}
+
+	private _databaseService: IAzureResourceDatabaseService = undefined;
+	private _apiWrapper: ApiWrapper = undefined;
+	private _extensionContext: ExtensionContext = undefined;
+
+	private static readonly containerId = 'azure.resource.providers.database.treeDataProvider.databaseContainer';
+	private static readonly containerLabel = localize('azure.resource.providers.database.treeDataProvider.databaseContainerLabel', 'SQL Databases');
+}

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

@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ServiceClientCredentials } from 'ms-rest';
+
+import { azureResource } from '../../azure-resource';
+import { AzureResourceDatabase } from './models';
+
+export interface IAzureResourceDatabaseService {
+	getDatabases(subscription: azureResource.AzureResourceSubscription, credential: ServiceClientCredentials): Promise<AzureResourceDatabase[]>;
+}
+
+export interface IAzureResourceDatabaseNode extends azureResource.IAzureResourceNode {
+	readonly database: AzureResourceDatabase;
+}

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

@@ -0,0 +1,13 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+export interface AzureResourceDatabase {
+	name: string;
+	serverName: string;
+	serverFullName: string;
+	loginName: string;
+}

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

@@ -0,0 +1,53 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IConnectionProfile } from 'sqlops';
+import { AppContext } from '../../../appContext';
+
+import { TreeNode } from '../../treeNode';
+import { generateGuid } from '../../utils';
+import { AzureResourceItemType } from '../../constants';
+import { IAzureResourceDatabaseServerNode } from './interfaces';
+import { AzureResourceResourceTreeNode } from '../../resourceTreeNode';
+
+export function registerAzureResourceDatabaseServerCommands(appContext: AppContext): void {
+	appContext.apiWrapper.registerCommand('azure.resource.connectsqlserver', async (node?: TreeNode) => {
+		if (!node)
+		{
+			return;
+		}
+
+		const treeItem = await node.getTreeItem();
+		if (treeItem.contextValue !== AzureResourceItemType.databaseServer) {
+			return;
+		}
+
+		const resourceNode = (node as AzureResourceResourceTreeNode).resourceNodeWithProviderId.resourceNode;
+		const databaseServer = (resourceNode as IAzureResourceDatabaseServerNode).databaseServer;
+
+		let connectionProfile: IConnectionProfile = {
+			id: generateGuid(),
+			connectionName: undefined,
+			serverName: databaseServer.fullName,
+			databaseName: databaseServer.defaultDatabaseName,
+			userName: databaseServer.loginName,
+			password: '',
+			authenticationType: 'SqlLogin',
+			savePassword: true,
+			groupFullName: '',
+			groupId: '',
+			providerName: 'MSSQL',
+			saveProfile: true,
+			options: {}
+		};
+
+		const conn = await appContext.apiWrapper.openConnectionDialog(undefined, connectionProfile, { saveConnection: true, showDashboard: true });
+		if (conn) {
+			appContext.apiWrapper.executeCommand('workbench.view.connections');
+		}
+	});
+}

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

@@ -0,0 +1,37 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ExtensionContext } from 'vscode';
+import { ApiWrapper } from '../../../apiWrapper';
+
+import { azureResource } from '../../azure-resource';
+import { IAzureResourceDatabaseServerService } from './interfaces';
+import { AzureResourceDatabaseServerTreeDataProvider } from './databaseServerTreeDataProvider';
+
+export class AzureResourceDatabaseServerProvider implements azureResource.IAzureResourceProvider {
+	public constructor(
+		databaseServerService: IAzureResourceDatabaseServerService,
+		apiWrapper: ApiWrapper,
+		extensionContext: ExtensionContext
+	) {
+		this._databaseServerService = databaseServerService;
+		this._apiWrapper = apiWrapper;
+		this._extensionContext = extensionContext;
+	}
+
+	public getTreeDataProvider(): azureResource.IAzureResourceTreeDataProvider {
+		return new AzureResourceDatabaseServerTreeDataProvider(this._databaseServerService, this._apiWrapper, this._extensionContext);
+	}
+
+	public get providerId(): string {
+		return 'azure.resource.providers.databaseServer';
+	}
+
+	private _databaseServerService: IAzureResourceDatabaseServerService = undefined;
+	private _apiWrapper: ApiWrapper = undefined;
+	private _extensionContext: ExtensionContext = undefined;
+}

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

@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ServiceClientCredentials } from 'ms-rest';
+import { SqlManagementClient } from 'azure-arm-sql';
+
+import { azureResource } from '../../azure-resource';
+import { IAzureResourceDatabaseServerService } from './interfaces';
+import { AzureResourceDatabaseServer } from './models';
+
+export class AzureResourceDatabaseServerService implements IAzureResourceDatabaseServerService {
+	public async getDatabaseServers(subscription: azureResource.AzureResourceSubscription, credential: ServiceClientCredentials): Promise<AzureResourceDatabaseServer[]> {
+		const databaseServers: AzureResourceDatabaseServer[] = [];
+
+		const sqlManagementClient = new SqlManagementClient(credential, subscription.id);
+		const svrs = await sqlManagementClient.servers.list();
+
+		svrs.forEach((svr) => databaseServers.push({
+			name: svr.name,
+			 fullName: svr.fullyQualifiedDomainName,
+			 loginName: svr.administratorLogin,
+			 defaultDatabaseName: 'master'
+		}));
+
+		return databaseServers;
+	}
+}

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

@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { AzureResource } from 'sqlops';
+import { TreeItem, TreeItemCollapsibleState, ExtensionContext } from 'vscode';
+import { TokenCredentials } from 'ms-rest';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+import { azureResource } from '../../azure-resource';
+import { IAzureResourceDatabaseServerService, IAzureResourceDatabaseServerNode } from './interfaces';
+import { AzureResourceDatabaseServer } from './models';
+import { AzureResourceItemType } from '../../../azureResource/constants';
+import { ApiWrapper } from '../../../apiWrapper';
+
+export class AzureResourceDatabaseServerTreeDataProvider implements azureResource.IAzureResourceTreeDataProvider {
+	public constructor(
+		databaseServerService: IAzureResourceDatabaseServerService,
+		apiWrapper: ApiWrapper,
+		extensionContext: ExtensionContext
+	) {
+		this._databaseServerService = databaseServerService;
+		this._apiWrapper = apiWrapper;
+		this._extensionContext = extensionContext;
+	}
+
+	public getTreeItem(element: azureResource.IAzureResourceNode): TreeItem | Thenable<TreeItem> {
+		return element.treeItem;
+	}
+
+	public async getChildren(element?: azureResource.IAzureResourceNode): Promise<azureResource.IAzureResourceNode[]> {
+		if (!element) {
+			return [this.createContainerNode()];
+		}
+
+		const tokens = await this._apiWrapper.getSecurityToken(element.account, AzureResource.ResourceManagement);
+		const credential = new TokenCredentials(tokens[element.tenantId].token, tokens[element.tenantId].tokenType);
+
+		const databaseServers: AzureResourceDatabaseServer[] = (await this._databaseServerService.getDatabaseServers(element.subscription, credential)) || <AzureResourceDatabaseServer[]>[];
+
+		return databaseServers.map((databaseServer) => <IAzureResourceDatabaseServerNode>{
+			account: element.account,
+			subscription: element.subscription,
+			tenantId: element.tenantId,
+			databaseServer: databaseServer,
+			treeItem: {
+				id: `databaseServer_${databaseServer.name}`,
+				label: databaseServer.name,
+				iconPath: {
+					dark: this._extensionContext.asAbsolutePath('resources/dark/sql_server_inverse.svg'),
+					light: this._extensionContext.asAbsolutePath('resources/light/sql_server.svg')
+				},
+				collapsibleState: TreeItemCollapsibleState.None,
+				contextValue: AzureResourceItemType.databaseServer
+			}
+		});
+	}
+
+	private createContainerNode(): azureResource.IAzureResourceNode {
+		return {
+			account: undefined,
+			subscription: undefined,
+			tenantId: undefined,
+			treeItem: {
+				id: AzureResourceDatabaseServerTreeDataProvider.containerId,
+				label: AzureResourceDatabaseServerTreeDataProvider.containerLabel,
+				iconPath: {
+					dark: this._extensionContext.asAbsolutePath('resources/dark/folder_inverse.svg'),
+					light: this._extensionContext.asAbsolutePath('resources/light/folder.svg')
+				},
+				collapsibleState: TreeItemCollapsibleState.Collapsed,
+				contextValue: AzureResourceItemType.databaseServerContainer
+			}
+		};
+	}
+
+	private _databaseServerService: IAzureResourceDatabaseServerService = undefined;
+	private _apiWrapper: ApiWrapper = undefined;
+	private _extensionContext: ExtensionContext = undefined;
+
+	private static readonly containerId = 'azure.resource.providers.databaseServer.treeDataProvider.databaseServerContainer';
+	private static readonly containerLabel = localize('azure.resource.providers.databaseServer.treeDataProvider.databaseServerContainerLabel', 'SQL Servers');
+}

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

@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { ServiceClientCredentials }  from 'ms-rest';
+
+import { azureResource } from '../../azure-resource';
+import { AzureResourceDatabaseServer } from './models';
+
+export interface IAzureResourceDatabaseServerService {
+	getDatabaseServers(subscription: azureResource.AzureResourceSubscription, credentials: ServiceClientCredentials): Promise<AzureResourceDatabaseServer[]>;
+}
+
+export interface IAzureResourceDatabaseServerNode extends azureResource.IAzureResourceNode {
+	readonly databaseServer: AzureResourceDatabaseServer;
+}

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

@@ -5,21 +5,9 @@
 
 'use strict';
 
-export interface AzureResourceSubscription {
-	id: string;
-	name: string;
-}
-
 export interface AzureResourceDatabaseServer {
 	name: string;
 	fullName: string;
 	loginName: string;
 	defaultDatabaseName: string;
-}
-
-export interface AzureResourceDatabase {
-	name: string;
-	serverName: string;
-	serverFullName: string;
-	loginName: string;
-}
+}

extensions/azurecore/src/azureResource/resourceService.ts

@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { extensions, TreeItem } from 'vscode';
+import { Account } from 'sqlops';
+
+import { azureResource } from './azure-resource';
+import { IAzureResourceNodeWithProviderId } from './interfaces';
+
+export class AzureResourceService {
+	private constructor() {
+	}
+
+	public static getInstance(): AzureResourceService {
+		return AzureResourceService._instance;
+	}
+
+	public async listResourceProviderIds(): Promise<string[]> {
+		await this.ensureResourceProvidersRegistered();
+
+		return Object.keys(this._resourceProviders);
+	}
+
+	public registerResourceProvider(resourceProvider: azureResource.IAzureResourceProvider): void {
+		this.doRegisterResourceProvider(resourceProvider);
+	}
+
+	public clearResourceProviders(): void {
+		this._resourceProviders = {};
+		this._treeDataProviders = {};
+		this._areResourceProvidersLoaded = false;
+	}
+
+	public async getRootChildren(resourceProviderId: string, account: Account, subscription: azureResource.AzureResourceSubscription, tenatId: string): Promise<IAzureResourceNodeWithProviderId[]> {
+		await this.ensureResourceProvidersRegistered();
+
+		if (!(resourceProviderId in this._resourceProviders)) {
+			throw new Error(`Azure resource provider doesn't exist. Id: ${resourceProviderId}`);
+		}
+
+		const treeDataProvider = this._treeDataProviders[resourceProviderId];
+		const children = await treeDataProvider.getChildren();
+
+		return children.map((child) => <IAzureResourceNodeWithProviderId>{
+			resourceProviderId: resourceProviderId,
+			resourceNode: <azureResource.IAzureResourceNode>{
+				account: account,
+				subscription: subscription,
+				tenantId: tenatId,
+				treeItem: child.treeItem
+			}
+		});
+	}
+
+	public async getChildren(resourceProviderId: string, element: azureResource.IAzureResourceNode): Promise<IAzureResourceNodeWithProviderId[]> {
+		await this.ensureResourceProvidersRegistered();
+
+		if (!(resourceProviderId in this._resourceProviders)) {
+			throw new Error(`Azure resource provider doesn't exist. Id: ${resourceProviderId}`);
+		}
+
+		const treeDataProvider = this._treeDataProviders[resourceProviderId];
+		const children = await treeDataProvider.getChildren(element);
+
+		return children.map((child) => <IAzureResourceNodeWithProviderId>{
+			resourceProviderId: resourceProviderId,
+			resourceNode: child
+		});
+	}
+
+	public async getTreeItem(resourceProviderId: string, element?: azureResource.IAzureResourceNode): Promise<TreeItem> {
+		await this.ensureResourceProvidersRegistered();
+
+		if (!(resourceProviderId in this._resourceProviders)) {
+			throw new Error(`Azure resource provider doesn't exist. Id: ${resourceProviderId}`);
+		}
+
+		const treeDataProvider = this._treeDataProviders[resourceProviderId];
+		return treeDataProvider.getTreeItem(element);
+	}
+
+	public get areResourceProvidersLoaded(): boolean {
+		return this._areResourceProvidersLoaded;
+	}
+
+	public set areResourceProvidersLoaded(value: boolean) {
+		this._areResourceProvidersLoaded = value;
+	}
+
+	private async ensureResourceProvidersRegistered(): Promise<void> {
+		if (this._areResourceProvidersLoaded) {
+			return;
+		}
+
+		for (const extension of extensions.all) {
+			const contributes = extension.packageJSON && extension.packageJSON.contributes;
+			if (!contributes) {
+				continue;
+			}
+
+			if (contributes['hasAzureResourceProviders']) {
+				await extension.activate();
+
+				if (extension.exports && extension.exports.provideResources) {
+					for (const resourceProvider of <azureResource.IAzureResourceProvider[]>extension.exports.provideResources()) {
+						this.doRegisterResourceProvider(resourceProvider);
+					}
+				}
+			}
+		}
+
+		this._areResourceProvidersLoaded = true;
+	}
+
+	private doRegisterResourceProvider(resourceProvider: azureResource.IAzureResourceProvider): void {
+		this._resourceProviders[resourceProvider.providerId] = resourceProvider;
+		this._treeDataProviders[resourceProvider.providerId] = resourceProvider.getTreeDataProvider();
+	}
+
+	private _areResourceProvidersLoaded: boolean = false;
+	private _resourceProviders: { [resourceProviderId: string]: azureResource.IAzureResourceProvider } = {};
+	private _treeDataProviders: { [resourceProviderId: string]: azureResource.IAzureResourceTreeDataProvider } = {};
+
+	private static readonly _instance = new AzureResourceService();
+}

extensions/azurecore/src/azureResource/resourceTreeNode.ts

@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { NodeInfo } from 'sqlops';
+import { TreeItem, TreeItemCollapsibleState } from 'vscode';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+import { TreeNode } from './treeNode';
+import { AzureResourceService } from './resourceService';
+import { IAzureResourceNodeWithProviderId } from './interfaces';
+import { AzureResourceMessageTreeNode } from './messageTreeNode';
+import { AzureResourceErrorMessageUtil } from './utils';
+
+export class AzureResourceResourceTreeNode extends TreeNode {
+	public constructor(
+		public readonly resourceNodeWithProviderId: IAzureResourceNodeWithProviderId,
+		parent: TreeNode
+	) {
+		super();
+
+		this.parent = parent;
+	}
+
+	public async getChildren(): Promise<TreeNode[]> {
+		// It is a leaf node.
+		if (this.resourceNodeWithProviderId.resourceNode.treeItem.collapsibleState === TreeItemCollapsibleState.None) {
+			return <TreeNode[]>[];
+		}
+
+		try {
+			const children = await this._resourceService.getChildren(this.resourceNodeWithProviderId.resourceProviderId, this.resourceNodeWithProviderId.resourceNode);
+
+			if (children.length === 0) {
+				return [AzureResourceMessageTreeNode.create(AzureResourceResourceTreeNode.noResourcesLabel, this)];
+			} else {
+				return children.map((child) => {
+					// To make tree node's id unique, otherwise, treeModel.js would complain 'item already registered'
+					child.resourceNode.treeItem.id = `${this.resourceNodeWithProviderId.resourceNode.treeItem.id}.${child.resourceNode.treeItem.id}`;
+					return new AzureResourceResourceTreeNode(child, this);
+				});
+			}
+		} catch (error) {
+			return [AzureResourceMessageTreeNode.create(AzureResourceErrorMessageUtil.getErrorMessage(error), this)];
+		}
+	}
+
+	public getTreeItem(): TreeItem | Promise<TreeItem> {
+		return this._resourceService.getTreeItem(this.resourceNodeWithProviderId.resourceProviderId, this.resourceNodeWithProviderId.resourceNode);
+	}
+
+	public getNodeInfo(): NodeInfo {
+		const treeItem = this.resourceNodeWithProviderId.resourceNode.treeItem;
+
+		return {
+			label: treeItem.label,
+			isLeaf: treeItem.collapsibleState === TreeItemCollapsibleState.None ? true : false,
+			errorMessage: undefined,
+			metadata: undefined,
+			nodePath: this.generateNodePath(),
+			nodeStatus: undefined,
+			nodeType: treeItem.contextValue,
+			nodeSubType: undefined,
+			iconType: treeItem.contextValue
+		};
+	}
+
+	public get nodePathValue(): string {
+		return this.resourceNodeWithProviderId.resourceNode.treeItem.id;
+	}
+
+	private _resourceService = AzureResourceService.getInstance();
+
+	private static readonly noResourcesLabel = localize('azure.resource.resourceTreeNode.noResourcesLabel', 'No Resources found.');
+}

extensions/azurecore/src/azureResource/servicePool.ts

@@ -1,35 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 {
-	IAzureResourceAccountService,
-	IAzureResourceCredentialService,
-	IAzureResourceSubscriptionService,
-	IAzureResourceSubscriptionFilterService,
-	IAzureResourceDatabaseService,
-	IAzureResourceDatabaseServerService,
-	IAzureResourceCacheService,
-	IAzureResourceContextService } from './interfaces';
-
-export class AzureResourceServicePool {
-	private constructor() { }
-
-	public static getInstance(): AzureResourceServicePool {
-		return AzureResourceServicePool._instance;
-	}
-
-	public contextService: IAzureResourceContextService;
-	public cacheService: IAzureResourceCacheService;
-	public accountService: IAzureResourceAccountService;
-	public credentialService: IAzureResourceCredentialService;
-	public subscriptionService: IAzureResourceSubscriptionService;
-	public subscriptionFilterService: IAzureResourceSubscriptionFilterService;
-	public databaseService: IAzureResourceDatabaseService;
-	public databaseServerService: IAzureResourceDatabaseServerService;
-
-	private static readonly _instance = new AzureResourceServicePool();
-}

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

@@ -5,21 +5,30 @@
 
 'use strict';
 
-import { ExtensionContext } from "vscode";
+import { ExtensionContext } from 'vscode';
 
-import { IAzureResourceCacheService } from "../interfaces";
+import { IAzureResourceCacheService } from '../interfaces';
 
 export class AzureResourceCacheService implements IAzureResourceCacheService {
 	public constructor(
-		public readonly context: ExtensionContext
+		context: ExtensionContext
 	) {
+		this._context = context;
 	}
 
-	public get<T>(key: string): T | undefined {
-		return this.context.workspaceState.get(key);
+	public generateKey(id: string): string {
+        return `${AzureResourceCacheService.cacheKeyPrefix}.${id}`;
+    }
+
+    public get<T>(key: string): T | undefined {
+		return this._context.workspaceState.get(key);
 	}
 
 	public update<T>(key: string, value: T): void {
-		this.context.workspaceState.update(key, value);
+		this._context.workspaceState.update(key, value);
 	}
+
+	private _context: ExtensionContext = undefined;
+
+	private static readonly cacheKeyPrefix = 'azure.resource.cache';
 }

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

@@ -1,36 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 { ExtensionContext } from "vscode";
-import { ApiWrapper } from "../../apiWrapper";
-
-import { IAzureResourceContextService } from "../interfaces";
-
-export class AzureResourceContextService implements IAzureResourceContextService {
-	public constructor(
-		context: ExtensionContext,
-		apiWrapper: ApiWrapper
-	) {
-		this._context = context;
-		this._apiWrapper = apiWrapper;
-	}
-
-	public getAbsolutePath(relativePath: string): string {
-		return this._context.asAbsolutePath(relativePath);
-	}
-
-	public executeCommand(commandId: string, ...args: any[]): void {
-		this._apiWrapper.executeCommand(commandId, args);
-	}
-
-	public showErrorMessage(errorMessage: string): void {
-		this._apiWrapper.showErrorMessage(errorMessage);
-	}
-
-	private _context: ExtensionContext = undefined;
-	private _apiWrapper: ApiWrapper = undefined;
-}

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

@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 sqlops from 'sqlops';
-import { TokenCredentials, ServiceClientCredentials } from 'ms-rest';
-import { ApiWrapper } from '../../apiWrapper';
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
-
-import { IAzureResourceCredentialService } from '../interfaces';
-import { AzureResourceCredentialError } from '../errors';
-
-export class AzureResourceCredentialService implements IAzureResourceCredentialService {
-	public constructor(
-		apiWrapper: ApiWrapper
-	) {
-		this._apiWrapper = apiWrapper;
-	}
-
-	public async getCredentials(account: sqlops.Account, resource: sqlops.AzureResource): Promise<ServiceClientCredentials[]> {
-		try {
-			let credentials: TokenCredentials[] = [];
-			let tokens = await this._apiWrapper.getSecurityToken(account, resource);
-
-			for (let tenant of account.properties.tenants) {
-				let token = tokens[tenant.id].token;
-				let tokenType = tokens[tenant.id].tokenType;
-
-				credentials.push(new TokenCredentials(token, tokenType));
-			}
-
-			return credentials;
-		} catch (error) {
-			throw new AzureResourceCredentialError(localize('azureResource.services.credentialService.credentialError', 'Failed to get credential for account {0}. Please refresh the account.', account.key.accountId), error);
-		}
-	}
-
-	private _apiWrapper: ApiWrapper = undefined;
-}

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

@@ -1,39 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 { ServiceClientCredentials } from 'ms-rest';
-import { SqlManagementClient } from 'azure-arm-sql';
-
-import { IAzureResourceDatabaseServerService } from '../interfaces';
-import { AzureResourceSubscription, AzureResourceDatabaseServer } from '../models';
-
-export class AzureResourceDatabaseServerService implements IAzureResourceDatabaseServerService {
-	public async getDatabaseServers(subscription: AzureResourceSubscription, credentials: ServiceClientCredentials[]): Promise<AzureResourceDatabaseServer[]> {
-		let databaseServers: AzureResourceDatabaseServer[] = [];
-		for (let cred of credentials) {
-			let sqlManagementClient = new SqlManagementClient(cred, subscription.id);
-			try {
-				let svrs = await sqlManagementClient.servers.list();
-				svrs.forEach((svr) => databaseServers.push({
-					name: svr.name,
-					fullName: svr.fullyQualifiedDomainName,
-					loginName: svr.administratorLogin,
-					defaultDatabaseName: 'master'
-				}));
-			} catch (error) {
-				if (error.code === 'InvalidAuthenticationTokenTenant' && error.statusCode === 401) {
-					/**
-					 * There may be multiple tenants for an account and it may throw exceptions like following. Just swallow the exception here.
-					 *   The access token is from the wrong issuer. It must match one of the tenants associated with this subscription.
-					 */
-				}
-			}
-		}
-
-		return databaseServers;
-	}
-}

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

@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 { ServiceClientCredentials } from 'ms-rest';
-import { SqlManagementClient } from 'azure-arm-sql';
-
-import { IAzureResourceDatabaseService } from '../interfaces';
-import { AzureResourceSubscription, AzureResourceDatabase } from '../models';
-
-export class AzureResourceDatabaseService implements IAzureResourceDatabaseService {
-	public async getDatabases(subscription: AzureResourceSubscription, credentials: ServiceClientCredentials[]): Promise<AzureResourceDatabase[]> {
-		let databases: AzureResourceDatabase[] = [];
-		for (let cred of credentials) {
-			let sqlManagementClient = new SqlManagementClient(cred, subscription.id);
-			try {
-				let svrs = await sqlManagementClient.servers.list();
-				for (let svr of svrs) {
-					// Extract resource group name from svr.id
-					let svrIdRegExp = new RegExp(`\/subscriptions\/${subscription.id}\/resourceGroups\/(.+)\/providers\/Microsoft\.Sql\/servers\/${svr.name}`);
-					if (!svrIdRegExp.test(svr.id)) {
-						continue;
-					}
-
-					let founds = svrIdRegExp.exec(svr.id);
-					let resouceGroup = founds[1];
-
-					let dbs = await sqlManagementClient.databases.listByServer(resouceGroup, svr.name);
-					dbs.forEach((db) => databases.push({
-						name: db.name,
-						serverName: svr.name,
-						serverFullName: svr.fullyQualifiedDomainName,
-						loginName: svr.administratorLogin
-					}));
-				}
-			} catch (error) {
-				if (error.code === 'InvalidAuthenticationTokenTenant' && error.statusCode === 401) {
-					/**
-					 * There may be multiple tenants for an account and it may throw exceptions like following. Just swallow the exception here.
-					 *   The access token is from the wrong issuer. It must match one of the tenants associated with this subscription.
-					 */
-				}
-			}
-		}
-
-		return databases;
-	}
-}

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

@@ -8,11 +8,11 @@
 import { WorkspaceConfiguration, ConfigurationTarget } from 'vscode';
 import { Account } from 'sqlops';
 
+import { azureResource } from '../azure-resource';
 import { IAzureResourceSubscriptionFilterService, IAzureResourceCacheService } from '../interfaces';
-import { AzureResourceSubscription } from '../models';
 
 interface AzureResourceSelectedSubscriptionsCache {
-	selectedSubscriptions: { [accountId: string]: AzureResourceSubscription[]};
+	selectedSubscriptions: { [accountId: string]: azureResource.AzureResourceSubscription[]};
 }
 
 export class AzureResourceSubscriptionFilterService implements IAzureResourceSubscriptionFilterService {
@@ -20,12 +20,14 @@ export class AzureResourceSubscriptionFilterService implements IAzureResourceSub
 		cacheService: IAzureResourceCacheService
 	) {
 		this._cacheService = cacheService;
+
+		this._cacheKey = this._cacheService.generateKey('selectedSubscriptions');
 	}
 
-	public async getSelectedSubscriptions(account: Account): Promise<AzureResourceSubscription[]> {
-		let selectedSubscriptions: AzureResourceSubscription[] = [];
+	public async getSelectedSubscriptions(account: Account): Promise<azureResource.AzureResourceSubscription[]> {
+		let selectedSubscriptions: azureResource.AzureResourceSubscription[] = [];
 
-		const cache = this._cacheService.get<AzureResourceSelectedSubscriptionsCache>(AzureResourceSubscriptionFilterService.CacheKey);
+		const cache = this._cacheService.get<AzureResourceSelectedSubscriptionsCache>(this._cacheKey);
 		if (cache) {
 			selectedSubscriptions = cache.selectedSubscriptions[account.key.accountId];
 		}
@@ -33,10 +35,10 @@ export class AzureResourceSubscriptionFilterService implements IAzureResourceSub
 		return selectedSubscriptions;
 	}
 
-	public async saveSelectedSubscriptions(account: Account, selectedSubscriptions: AzureResourceSubscription[]): Promise<void> {
-		let selectedSubscriptionsCache: { [accountId: string]: AzureResourceSubscription[]} = {};
+	public async saveSelectedSubscriptions(account: Account, selectedSubscriptions: azureResource.AzureResourceSubscription[]): Promise<void> {
+		let selectedSubscriptionsCache: { [accountId: string]: azureResource.AzureResourceSubscription[]} = {};
 
-		const cache = this._cacheService.get<AzureResourceSelectedSubscriptionsCache>(AzureResourceSubscriptionFilterService.CacheKey);
+		const cache = this._cacheService.get<AzureResourceSelectedSubscriptionsCache>(this._cacheKey);
 		if (cache) {
 			selectedSubscriptionsCache = cache.selectedSubscriptions;
 		}
@@ -47,14 +49,14 @@ export class AzureResourceSubscriptionFilterService implements IAzureResourceSub
 
 		selectedSubscriptionsCache[account.key.accountId] = selectedSubscriptions;
 
-		this._cacheService.update<AzureResourceSelectedSubscriptionsCache>(AzureResourceSubscriptionFilterService.CacheKey, { selectedSubscriptions: selectedSubscriptionsCache });
+		this._cacheService.update<AzureResourceSelectedSubscriptionsCache>(this._cacheKey, { selectedSubscriptions: selectedSubscriptionsCache });
 
 		const filters: string[] = [];
 		for (const accountId in selectedSubscriptionsCache) {
 			filters.push(...selectedSubscriptionsCache[accountId].map((subcription) => `${accountId}/${subcription.id}/${subcription.name}`));
 		}
 
-		const resourceFilterConfig = this._config.inspect<string[]>(AzureResourceSubscriptionFilterService.FilterConfigName);
+		const resourceFilterConfig = this._config.inspect<string[]>(AzureResourceSubscriptionFilterService.filterConfigName);
 		let configTarget = ConfigurationTarget.Global;
 		if (resourceFilterConfig) {
 			if (resourceFilterConfig.workspaceFolderValue) {
@@ -66,12 +68,12 @@ export class AzureResourceSubscriptionFilterService implements IAzureResourceSub
 			}
 		}
 
-		await this._config.update(AzureResourceSubscriptionFilterService.FilterConfigName, filters, configTarget);
+		await this._config.update(AzureResourceSubscriptionFilterService.filterConfigName, filters, configTarget);
 	}
 
 	private _config: WorkspaceConfiguration = undefined;
 	private _cacheService: IAzureResourceCacheService = undefined;
+	private _cacheKey: string = undefined;
 
-	private static readonly FilterConfigName = 'resourceFilter';
-	private static readonly CacheKey = 'azureResource.cache.selectedSubscriptions';
+	private static readonly filterConfigName = 'azure.resource.config.filter';
 }

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

@@ -9,24 +9,19 @@ import { Account } from 'sqlops';
 import { ServiceClientCredentials } from 'ms-rest';
 import { SubscriptionClient } from 'azure-arm-resource';
 
+import { azureResource } from '../azure-resource';
 import { IAzureResourceSubscriptionService } from '../interfaces';
-import { AzureResourceSubscription } from '../models';
 
 export class AzureResourceSubscriptionService implements IAzureResourceSubscriptionService {
-	public async getSubscriptions(account: Account, credentials: ServiceClientCredentials[]): Promise<AzureResourceSubscription[]> {
-		let subscriptions: AzureResourceSubscription[] = [];
-		for (let cred of credentials) {
-			let subClient = new SubscriptionClient.SubscriptionClient(cred);
-			try {
-				let subs = await subClient.subscriptions.list();
-				subs.forEach((sub) => subscriptions.push({
-					id: sub.subscriptionId,
-					name: sub.displayName
-				}));
-			} catch (error) {
-				// Swallow the exception here.
-			}
-		}
+	public async getSubscriptions(account: Account, credential: ServiceClientCredentials): Promise<azureResource.AzureResourceSubscription[]> {
+		const subscriptions: azureResource.AzureResourceSubscription[] = [];
+
+		const subClient = new SubscriptionClient.SubscriptionClient(credential);
+		const subs = await subClient.subscriptions.list();
+		subs.forEach((sub) => subscriptions.push({
+			id: sub.subscriptionId,
+			name: sub.displayName
+		}));
 
 		return subscriptions;
 	}

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

@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 request from 'request';
+
+import { azureResource } from '../azure-resource';
+import { IAzureResourceTenantService } from '../interfaces';
+
+export class AzureResourceTenantService implements IAzureResourceTenantService {
+	public async getTenantId(subscription: azureResource.AzureResourceSubscription): Promise<string> {
+		const requestPromisified = new Promise<string>((resolve, reject) => {
+			const url = `https://management.azure.com/subscriptions/${subscription.id}?api-version=2014-04-01`;
+			request(url, function (error, response, body) {
+				if (response.statusCode === 401) {
+					const tenantIdRegEx = /authorization_uri="https:\/\/login\.windows\.net\/([0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12})"/;
+					const teantIdString = response.headers['www-authenticate'];
+					if (tenantIdRegEx.test(teantIdString)) {
+						resolve(tenantIdRegEx.exec(teantIdString)[1]);
+					} else {
+						reject();
+					}
+				}
+			});
+		});
+
+		return await requestPromisified;
+	}
+}

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

@@ -7,10 +7,10 @@
 
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { NodeInfo } from 'sqlops';
-import { TreeNode } from '../../treeNodes';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
+import { TreeNode } from '../treeNode';
 import { AzureResourceItemType } from '../constants';
 
 export class AzureResourceAccountNotSignedInTreeNode extends TreeNode {
@@ -19,11 +19,11 @@ export class AzureResourceAccountNotSignedInTreeNode extends TreeNode {
 	}
 
 	public getTreeItem(): TreeItem | Promise<TreeItem> {
-		let item = new TreeItem(AzureResourceAccountNotSignedInTreeNode.SignInLabel, TreeItemCollapsibleState.None);
+		let item = new TreeItem(AzureResourceAccountNotSignedInTreeNode.signInLabel, TreeItemCollapsibleState.None);
 		item.contextValue = AzureResourceItemType.message;
 		item.command = {
-			title: AzureResourceAccountNotSignedInTreeNode.SignInLabel,
-			command: 'azureresource.signin',
+			title: AzureResourceAccountNotSignedInTreeNode.signInLabel,
+			command: 'azure.resource.signin',
 			arguments: [this]
 		};
 		return item;
@@ -31,7 +31,7 @@ export class AzureResourceAccountNotSignedInTreeNode extends TreeNode {
 
 	public getNodeInfo(): NodeInfo {
 		return {
-			label: AzureResourceAccountNotSignedInTreeNode.SignInLabel,
+			label: AzureResourceAccountNotSignedInTreeNode.signInLabel,
 			isLeaf: true,
 			errorMessage: undefined,
 			metadata: undefined,
@@ -47,5 +47,5 @@ export class AzureResourceAccountNotSignedInTreeNode extends TreeNode {
 		return 'message_accountNotSignedIn';
 	}
 
-	private static readonly SignInLabel = localize('azureResource.tree.accountNotSignedInTreeNode.signIn', 'Sign in to Azure ...');
+	private static readonly signInLabel = localize('azure.resource.tree.accountNotSignedInTreeNode.signInLabel', 'Sign in to Azure ...');
 }

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

@@ -6,44 +6,59 @@
 'use strict';
 
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { Account, NodeInfo } from 'sqlops';
-import { TreeNode } from '../../treeNodes';
+import { Account, NodeInfo, AzureResource } from 'sqlops';
+import { TokenCredentials } from 'ms-rest';
+import { AppContext } from '../../appContext';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
+import { azureResource } from '../azure-resource';
+import { TreeNode } from '../treeNode';
+import { AzureResourceCredentialError } from '../errors';
 import { AzureResourceContainerTreeNodeBase } from './baseTreeNodes';
-import { AzureResourceItemType } from '../constants';
+import { AzureResourceItemType, AzureResourceServiceNames } from '../constants';
 import { AzureResourceSubscriptionTreeNode } from './subscriptionTreeNode';
-import { AzureResourceMessageTreeNode } from './messageTreeNode';
+import { AzureResourceMessageTreeNode } from '../messageTreeNode';
 import { AzureResourceErrorMessageUtil } from '../utils';
-import { AzureResourceSubscription } from '../models';
-import { IAzureResourceTreeChangeHandler } from './treeProvider';
+import { IAzureResourceTreeChangeHandler } from './treeChangeHandler';
+import { IAzureResourceSubscriptionService, IAzureResourceSubscriptionFilterService, IAzureResourceTenantService } from '../../azureResource/interfaces';
 
 export class AzureResourceAccountTreeNode extends AzureResourceContainerTreeNodeBase {
 	public constructor(
-		account: Account,
+		public readonly account: Account,
+		appContext: AppContext,
 		treeChangeHandler: IAzureResourceTreeChangeHandler
 	) {
-		super(account, treeChangeHandler, undefined);
+		super(appContext, treeChangeHandler, undefined);
+
+		this._subscriptionService = this.appContext.getService<IAzureResourceSubscriptionService>(AzureResourceServiceNames.subscriptionService);
+		this._subscriptionFilterService = this.appContext.getService<IAzureResourceSubscriptionFilterService>(AzureResourceServiceNames.subscriptionFilterService);
+		this._tenantService = this.appContext.getService<IAzureResourceTenantService>(AzureResourceServiceNames.tenantService);
 
 		this._id = `account_${this.account.key.accountId}`;
+		this.setCacheKey(`${this._id}.subscriptions`);
 		this._label = this.generateLabel();
 	}
 
 	public async getChildren(): Promise<TreeNode[]> {
 		try {
-			let subscriptions: AzureResourceSubscription[] = [];
+			let subscriptions: azureResource.AzureResourceSubscription[] = [];
 
 			if (this._isClearingCache) {
-				const credentials = await this.getCredentials();
-				subscriptions = (await this.servicePool.subscriptionService.getSubscriptions(this.account, credentials)) || <AzureResourceSubscription[]>[];
+				try {
+				    const tokens = await this.appContext.apiWrapper.getSecurityToken(this.account, AzureResource.ResourceManagement);
 
-				let cache = this.getCache<AzureResourceSubscriptionsCache>();
-				if (!cache) {
-					cache = { subscriptions: { } };
+					for (const tenant of this.account.properties.tenants) {
+						const token = tokens[tenant.id].token;
+						const tokenType = tokens[tenant.id].tokenType;
+
+						subscriptions.push(...(await this._subscriptionService.getSubscriptions(this.account, new TokenCredentials(token, tokenType)) || <azureResource.AzureResourceSubscription[]>[]));
+					}
+				} catch (error) {
+					throw new AzureResourceCredentialError(localize('azure.resource.tree.accountTreeNode.credentialError', 'Failed to get credential for account {0}. Please refresh the account.', this.account.key.accountId), error);
 				}
-				cache.subscriptions[this.account.key.accountId] = subscriptions;
-				this.updateCache<AzureResourceSubscriptionsCache>(cache);
+
+				this.updateCache<azureResource.AzureResourceSubscription[]>(subscriptions);
 
 				this._isClearingCache = false;
 			} else {
@@ -52,8 +67,8 @@ export class AzureResourceAccountTreeNode extends AzureResourceContainerTreeNode
 
 			this._totalSubscriptionCount = subscriptions.length;
 
-			let selectedSubscriptions = await this.servicePool.subscriptionFilterService.getSelectedSubscriptions(this.account);
-			let selectedSubscriptionIds = (selectedSubscriptions || <AzureResourceSubscription[]>[]).map((subscription) => subscription.id);
+			const selectedSubscriptions = await this._subscriptionFilterService.getSelectedSubscriptions(this.account);
+			const selectedSubscriptionIds = (selectedSubscriptions || <azureResource.AzureResourceSubscription[]>[]).map((subscription) => subscription.id);
 			if (selectedSubscriptionIds.length > 0) {
 				subscriptions = subscriptions.filter((subscription) => selectedSubscriptionIds.indexOf(subscription.id) !== -1);
 				this._selectedSubscriptionCount = selectedSubscriptionIds.length;
@@ -65,31 +80,33 @@ export class AzureResourceAccountTreeNode extends AzureResourceContainerTreeNode
 			this.refreshLabel();
 
 			if (subscriptions.length === 0) {
-				return [AzureResourceMessageTreeNode.create(AzureResourceAccountTreeNode.NoSubscriptions, this)];
+				return [AzureResourceMessageTreeNode.create(AzureResourceAccountTreeNode.noSubscriptionsLabel, this)];
 			} else {
-				return subscriptions.map((subscription) => new AzureResourceSubscriptionTreeNode(subscription, this.account, this.treeChangeHandler, this));
+				return await Promise.all(subscriptions.map(async (subscription) => {
+					const tenantId = await this._tenantService.getTenantId(subscription);
+
+					return new AzureResourceSubscriptionTreeNode(this.account, subscription, tenantId, this.appContext, this.treeChangeHandler, this);
+				}));
 			}
 		} catch (error) {
+			if (error instanceof AzureResourceCredentialError) {
+				this.appContext.apiWrapper.executeCommand('azure.resource.signin');
+			}
 			return [AzureResourceMessageTreeNode.create(AzureResourceErrorMessageUtil.getErrorMessage(error), this)];
 		}
 	}
 
-	public async getCachedSubscriptions(): Promise<AzureResourceSubscription[]> {
-		const subscriptions: AzureResourceSubscription[] = [];
-		const cache = this.getCache<AzureResourceSubscriptionsCache>();
-		if (cache) {
-			subscriptions.push(...cache.subscriptions[this.account.key.accountId]);
-		}
-		return subscriptions;
+	public async getCachedSubscriptions(): Promise<azureResource.AzureResourceSubscription[]> {
+		return this.getCache<azureResource.AzureResourceSubscription[]>();
 	}
 
 	public getTreeItem(): TreeItem | Promise<TreeItem> {
-		let item = new TreeItem(this._label, TreeItemCollapsibleState.Collapsed);
+		const item = new TreeItem(this._label, TreeItemCollapsibleState.Collapsed);
 		item.id = this._id;
 		item.contextValue = AzureResourceItemType.account;
 		item.iconPath = {
-			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/account_inverse.svg'),
-			light: this.servicePool.contextService.getAbsolutePath('resources/light/account.svg')
+			dark: this.appContext.extensionContext.asAbsolutePath('resources/dark/account_inverse.svg'),
+			light: this.appContext.extensionContext.asAbsolutePath('resources/light/account.svg')
 		};
 		return item;
 	}
@@ -128,10 +145,6 @@ export class AzureResourceAccountTreeNode extends AzureResourceContainerTreeNode
 		}
 	}
 
-	protected get cacheKey(): string {
-		return 'azureResource.cache.subscriptions';
-	}
-
 	private generateLabel(): string {
 		let label = `${this.account.displayInfo.displayName} (${this.account.key.accountId})`;
 
@@ -142,14 +155,14 @@ export class AzureResourceAccountTreeNode extends AzureResourceContainerTreeNode
 		return label;
 	}
 
+	private _subscriptionService: IAzureResourceSubscriptionService = undefined;
+	private _subscriptionFilterService: IAzureResourceSubscriptionFilterService = undefined;
+	private _tenantService: IAzureResourceTenantService = undefined;
+
 	private _id: string = undefined;
 	private _label: string = undefined;
 	private _totalSubscriptionCount = 0;
 	private _selectedSubscriptionCount = 0;
 
-	private static readonly NoSubscriptions = localize('azureResource.tree.accountTreeNode.noSubscriptions', 'No Subscriptions found.');
-}
-
-interface AzureResourceSubscriptionsCache {
-	subscriptions: { [accountId: string]: AzureResourceSubscription[] };
-}
+	private static readonly noSubscriptionsLabel = localize('azure.resource.tree.accountTreeNode.noSubscriptionsLabel', 'No Subscriptions found.');
+}

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

@@ -5,16 +5,16 @@
 
 'use strict';
 
-import * as sqlops from 'sqlops';
-import { ServiceClientCredentials } from 'ms-rest';
-import { TreeNode } from '../../treeNodes';
+import { AppContext } from '../../appContext';
 
-import { AzureResourceServicePool } from '../servicePool';
-import { AzureResourceCredentialError } from '../errors';
+import { TreeNode } from '../treeNode';
 import { IAzureResourceTreeChangeHandler } from './treeChangeHandler';
+import { IAzureResourceCacheService } from '../../azureResource/interfaces';
+import { AzureResourceServiceNames } from '../constants';
 
 export abstract class AzureResourceTreeNodeBase extends TreeNode {
 	public constructor(
+		public readonly appContext: AppContext,
 		public readonly treeChangeHandler: IAzureResourceTreeChangeHandler,
 		parent: TreeNode
 	) {
@@ -22,17 +22,17 @@ export abstract class AzureResourceTreeNodeBase extends TreeNode {
 
 		this.parent = parent;
 	}
-
-	public readonly servicePool = AzureResourceServicePool.getInstance();
 }
 
 export abstract class AzureResourceContainerTreeNodeBase extends AzureResourceTreeNodeBase {
 	public constructor(
-		public readonly account: sqlops.Account,
+		appContext: AppContext,
 		treeChangeHandler: IAzureResourceTreeChangeHandler,
 		parent: TreeNode
 	) {
-		super(treeChangeHandler, parent);
+		super(appContext, treeChangeHandler, parent);
+
+		this._cacheService = this.appContext.getService<IAzureResourceCacheService>(AzureResourceServiceNames.cacheService);
 	}
 
 	public clearCache(): void {
@@ -43,29 +43,19 @@ export abstract class AzureResourceContainerTreeNodeBase extends AzureResourceTr
 		return this._isClearingCache;
 	}
 
-	protected async getCredentials(): Promise<ServiceClientCredentials[]> {
-		try {
-			return await this.servicePool.credentialService.getCredentials(this.account, sqlops.AzureResource.ResourceManagement);
-		} catch (error) {
-			if (error instanceof AzureResourceCredentialError) {
-				this.servicePool.contextService.showErrorMessage(error.message);
-
-				this.servicePool.contextService.executeCommand('azureresource.signin');
-			} else {
-				throw error;
-			}
-		}
-	}
+	protected setCacheKey(id: string): void {
+        this._cacheKey = this._cacheService.generateKey(id);
+    }
 
 	protected updateCache<T>(cache: T): void {
-		this.servicePool.cacheService.update<T>(this.cacheKey, cache);
+		this._cacheService.update<T>(this._cacheKey, cache);
 	}
 
 	protected getCache<T>(): T {
-		return this.servicePool.cacheService.get<T>(this.cacheKey);
+		return this._cacheService.get<T>(this._cacheKey);
 	}
 
-	protected abstract get cacheKey(): string;
-
 	protected _isClearingCache = true;
+	private _cacheService: IAzureResourceCacheService = undefined;
+	private _cacheKey: string = undefined;
 }

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

@@ -1,103 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { Account, NodeInfo } from 'sqlops';
-import { TreeNode } from '../../treeNodes';
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
-
-import { AzureResourceContainerTreeNodeBase } from './baseTreeNodes';
-import { AzureResourceItemType } from '../constants';
-import { AzureResourceErrorMessageUtil } from '../utils';
-import { AzureResourceDatabaseTreeNode } from './databaseTreeNode';
-import { AzureResourceMessageTreeNode } from './messageTreeNode';
-import { AzureResourceSubscription, AzureResourceDatabase } from '../models';
-import { IAzureResourceTreeChangeHandler } from './treeProvider';
-
-export class AzureResourceDatabaseContainerTreeNode extends AzureResourceContainerTreeNodeBase {
-	public constructor(
-		public readonly subscription: AzureResourceSubscription,
-		account: Account,
-		treeChangeHandler: IAzureResourceTreeChangeHandler,
-		parent: TreeNode
-	) {
-		super(account, treeChangeHandler, parent);
-	}
-
-	public async getChildren(): Promise<TreeNode[]> {
-		try {
-			let databases: AzureResourceDatabase[] = [];
-
-			if (this._isClearingCache) {
-				let credentials = await this.getCredentials();
-				databases = (await this.servicePool.databaseService.getDatabases(this.subscription, credentials)) || <AzureResourceDatabase[]>[];
-
-				let cache = this.getCache<AzureResourceDatabasesCache>();
-				if (!cache) {
-					cache = { databases: { } };
-				}
-				cache.databases[this.subscription.id] = databases;
-				this.updateCache(cache);
-
-				this._isClearingCache = false;
-			} else {
-				const cache = this.getCache<AzureResourceDatabasesCache>();
-				if (cache) {
-					databases = cache.databases[this.subscription.id] || <AzureResourceDatabase[]>[];
-				}
-			}
-
-			if (databases.length === 0) {
-				return [AzureResourceMessageTreeNode.create(AzureResourceDatabaseContainerTreeNode.NoDatabases, this)];
-			} else {
-				return databases.map((database) => new AzureResourceDatabaseTreeNode(database, this.treeChangeHandler, this));
-			}
-		} catch (error) {
-			return [AzureResourceMessageTreeNode.create(AzureResourceErrorMessageUtil.getErrorMessage(error), this)];
-		}
-	}
-
-	public getTreeItem(): TreeItem | Promise<TreeItem> {
-		let item = new TreeItem(AzureResourceDatabaseContainerTreeNode.Label, TreeItemCollapsibleState.Collapsed);
-		item.contextValue = AzureResourceItemType.databaseContainer;
-		item.iconPath = {
-			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/folder_inverse.svg'),
-			light: this.servicePool.contextService.getAbsolutePath('resources/light/folder.svg')
-		};
-		return item;
-	}
-
-	public getNodeInfo(): NodeInfo {
-		return {
-			label: AzureResourceDatabaseContainerTreeNode.Label,
-			isLeaf: false,
-			errorMessage: undefined,
-			metadata: undefined,
-			nodePath: this.generateNodePath(),
-			nodeStatus: undefined,
-			nodeType: AzureResourceItemType.databaseContainer,
-			nodeSubType: undefined,
-			iconType: AzureResourceItemType.databaseContainer
-		};
-	}
-
-	public get nodePathValue(): string {
-		return 'databaseContainer';
-	}
-
-	protected get cacheKey(): string {
-		return 'azureResource.cache.databases';
-	}
-
-	private static readonly Label = localize('azureResource.tree.databaseContainerTreeNode.label', 'SQL Databases');
-	private static readonly NoDatabases = localize('azureResource.tree.databaseContainerTreeNode.noDatabases', 'No SQL Databases found.');
-}
-
-interface AzureResourceDatabasesCache {
-	databases: { [subscriptionId: string]: AzureResourceDatabase[] };
-}

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

@@ -1,103 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { Account, NodeInfo } from 'sqlops';
-import { TreeNode } from '../../treeNodes';
-import * as nls from 'vscode-nls';
-const localize = nls.loadMessageBundle();
-
-import { AzureResourceContainerTreeNodeBase } from './baseTreeNodes';
-import { AzureResourceItemType } from '../constants';
-import { AzureResourceMessageTreeNode } from './messageTreeNode';
-import { AzureResourceErrorMessageUtil } from '../utils';
-import { AzureResourceSubscription, AzureResourceDatabaseServer } from '../models';
-import { AzureResourceDatabaseServerTreeNode } from './databaseServerTreeNode';
-import { IAzureResourceTreeChangeHandler } from './treeProvider';
-
-export class AzureResourceDatabaseServerContainerTreeNode extends AzureResourceContainerTreeNodeBase {
-	public constructor(
-		public readonly subscription: AzureResourceSubscription,
-		account: Account,
-		treeChangeHandler: IAzureResourceTreeChangeHandler,
-		parent: TreeNode
-	) {
-		super(account, treeChangeHandler, parent);
-	}
-
-	public async getChildren(): Promise<TreeNode[]> {
-		try {
-			let databaseServers: AzureResourceDatabaseServer[] = [];
-
-			if (this._isClearingCache) {
-				let credentials = await this.getCredentials();
-				databaseServers = (await this.servicePool.databaseServerService.getDatabaseServers(this.subscription, credentials)) || <AzureResourceDatabaseServer[]>[];
-
-				let cache = this.getCache<AzureResourceDatabaseServersCache>();
-				if (!cache) {
-					cache = { databaseServers: { } };
-				}
-				cache.databaseServers[this.subscription.id] = databaseServers;
-				this.updateCache<AzureResourceDatabaseServersCache>(cache);
-
-				this._isClearingCache = false;
-			} else {
-				const cache = this.getCache<AzureResourceDatabaseServersCache>();
-				if (cache) {
-					databaseServers = cache.databaseServers[this.subscription.id] || <AzureResourceDatabaseServer[]>[];
-				}
-			}
-
-			if (databaseServers.length === 0) {
-				return [AzureResourceMessageTreeNode.create(AzureResourceDatabaseServerContainerTreeNode.NoDatabaseServers, this)];
-			} else {
-				return databaseServers.map((server) => new AzureResourceDatabaseServerTreeNode(server, this.treeChangeHandler, this));
-			}
-		} catch (error) {
-			return [AzureResourceMessageTreeNode.create(AzureResourceErrorMessageUtil.getErrorMessage(error), this)];
-		}
-	}
-
-	public getTreeItem(): TreeItem | Promise<TreeItem> {
-		let item = new TreeItem(AzureResourceDatabaseServerContainerTreeNode.Label, TreeItemCollapsibleState.Collapsed);
-		item.contextValue = AzureResourceItemType.databaseServerContainer;
-		item.iconPath = {
-			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/folder_inverse.svg'),
-			light: this.servicePool.contextService.getAbsolutePath('resources/light/folder.svg')
-		};
-		return item;
-	}
-
-	public getNodeInfo(): NodeInfo {
-		return {
-			label: AzureResourceDatabaseServerContainerTreeNode.Label,
-			isLeaf: false,
-			errorMessage: undefined,
-			metadata: undefined,
-			nodePath: this.generateNodePath(),
-			nodeStatus: undefined,
-			nodeType: AzureResourceItemType.databaseServerContainer,
-			nodeSubType: undefined,
-			iconType: AzureResourceItemType.databaseServerContainer
-		};
-	}
-
-	public get nodePathValue(): string {
-		return 'databaseServerContainer';
-	}
-
-	protected get cacheKey(): string {
-		return 'azureResource.cache.databaseServers';
-	}
-
-	private static readonly Label = localize('azureResource.tree.databaseServerContainerTreeNode.label', 'SQL Servers');
-	private static readonly NoDatabaseServers = localize('azureResource.tree.databaseContainerTreeNode.noDatabaseServers', 'No SQL Servers found.');
-}
-
-interface AzureResourceDatabaseServersCache {
-	databaseServers: { [subscriptionId: string]: AzureResourceDatabaseServer[] };
-}

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

@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { NodeInfo } from 'sqlops';
-import { TreeNode } from '../../treeNodes';
-
-import { AzureResourceTreeNodeBase } from './baseTreeNodes';
-import { AzureResourceItemType } from '../constants';
-import { AzureResourceDatabaseServer } from '../models';
-import { IAzureResourceTreeChangeHandler } from './treeProvider';
-
-export class AzureResourceDatabaseServerTreeNode extends AzureResourceTreeNodeBase {
-	public constructor(
-		public readonly databaseServer: AzureResourceDatabaseServer,
-		treeChangeHandler: IAzureResourceTreeChangeHandler,
-		parent: TreeNode
-	) {
-		super(treeChangeHandler, parent);
-	}
-
-	public async getChildren(): Promise<TreeNode[]> {
-		return [];
-	}
-
-	public getTreeItem(): TreeItem | Promise<TreeItem> {
-		let item = new TreeItem(this.databaseServer.name, TreeItemCollapsibleState.None);
-		item.contextValue = AzureResourceItemType.databaseServer;
-		item.iconPath = {
-			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/sql_server_inverse.svg'),
-			light: this.servicePool.contextService.getAbsolutePath('resources/light/sql_server.svg')
-		};
-		return item;
-	}
-
-	public getNodeInfo(): NodeInfo {
-		return {
-			label: this.databaseServer.name,
-			isLeaf: true,
-			errorMessage: undefined,
-			metadata: undefined,
-			nodePath: this.generateNodePath(),
-			nodeStatus: undefined,
-			nodeType: AzureResourceItemType.databaseServer,
-			nodeSubType: undefined,
-			iconType: AzureResourceItemType.databaseServer
-		};
-	}
-
-	public get nodePathValue(): string {
-		return `databaseServer_${this.databaseServer.name}`;
-	}
-}

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

@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 { TreeItem, TreeItemCollapsibleState } from 'vscode';
-import { NodeInfo } from 'sqlops';
-import { TreeNode } from '../../treeNodes';
-
-import { AzureResourceTreeNodeBase } from './baseTreeNodes';
-import { AzureResourceItemType } from '../constants';
-import { AzureResourceDatabase } from '../models';
-import { IAzureResourceTreeChangeHandler } from './treeProvider';
-
-export class AzureResourceDatabaseTreeNode extends AzureResourceTreeNodeBase {
-	public constructor(
-		public readonly database: AzureResourceDatabase,
-		treeChangeHandler: IAzureResourceTreeChangeHandler,
-		parent: TreeNode
-	) {
-		super(treeChangeHandler, parent);
-
-		this._label = `${this.database.name} (${this.database.serverName})`;
-	}
-
-	public async getChildren(): Promise<TreeNode[]> {
-		return [];
-	}
-
-	public getTreeItem(): TreeItem | Promise<TreeItem> {
-		let item = new TreeItem(this._label, TreeItemCollapsibleState.None);
-		item.contextValue = AzureResourceItemType.database;
-		item.iconPath = {
-			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/sql_database_inverse.svg'),
-			light: this.servicePool.contextService.getAbsolutePath('resources/light/sql_database.svg')
-		};
-		return item;
-	}
-
-	public getNodeInfo(): NodeInfo {
-		return {
-			label: this._label,
-			isLeaf: true,
-			errorMessage: undefined,
-			metadata: undefined,
-			nodePath: this.generateNodePath(),
-			nodeStatus: undefined,
-			nodeType: AzureResourceItemType.database,
-			nodeSubType: undefined,
-			iconType: AzureResourceItemType.database
-		};
-	}
-
-	public get nodePathValue(): string {
-		return `database_${this.database.name}`;
-	}
-
-	private _label: string = undefined;
-}

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

@@ -7,38 +7,66 @@
 
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { Account, NodeInfo } from 'sqlops';
-import { TreeNode } from '../../treeNodes';
+import { AppContext } from '../../appContext';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
 
-import { AzureResourceTreeNodeBase, AzureResourceContainerTreeNodeBase } from './baseTreeNodes';
+import { azureResource } from '../azure-resource';
+import { TreeNode } from '../treeNode';
+import { IAzureResourceNodeWithProviderId } from '../interfaces';
+import { AzureResourceContainerTreeNodeBase } from './baseTreeNodes';
 import { AzureResourceItemType } from '../constants';
-import { AzureResourceDatabaseContainerTreeNode } from './databaseContainerTreeNode';
-import { AzureResourceDatabaseServerContainerTreeNode } from './databaseServerContainerTreeNode';
-import { AzureResourceSubscription } from '../models';
 import { IAzureResourceTreeChangeHandler } from './treeChangeHandler';
+import { AzureResourceMessageTreeNode } from '../messageTreeNode';
+import { AzureResourceErrorMessageUtil } from '../utils';
+import { AzureResourceService } from '../resourceService';
+import { AzureResourceResourceTreeNode } from '../resourceTreeNode';
 
-export class AzureResourceSubscriptionTreeNode extends AzureResourceTreeNodeBase {
+export class AzureResourceSubscriptionTreeNode extends AzureResourceContainerTreeNodeBase {
 	public constructor(
-		public readonly subscription: AzureResourceSubscription,
-		account: Account,
+		public readonly account: Account,
+		public readonly subscription: azureResource.AzureResourceSubscription,
+		public readonly tenatId: string,
+		appContext: AppContext,
 		treeChangeHandler: IAzureResourceTreeChangeHandler,
 		parent: TreeNode
 	) {
-		super(treeChangeHandler, parent);
+		super(appContext, treeChangeHandler, parent);
 
-		this._children.push(new AzureResourceDatabaseContainerTreeNode(subscription, account, treeChangeHandler, this));
-		this._children.push(new AzureResourceDatabaseServerContainerTreeNode(subscription, account, treeChangeHandler, this));
+		this._id = `account_${this.account.key.accountId}.subscription_${this.subscription.id}.tenant_${this.tenatId}`;
+		this.setCacheKey(`${this._id}.resources`);
 	}
 
 	public async getChildren(): Promise<TreeNode[]> {
-		return this._children;
+		try {
+			const resourceService = AzureResourceService.getInstance();
+
+			const children: IAzureResourceNodeWithProviderId[] = [];
+
+			for (const resourceProviderId of await resourceService.listResourceProviderIds()) {
+				children.push(...await resourceService.getRootChildren(resourceProviderId, this.account, this.subscription, this.tenatId));
+			}
+
+			if (children.length === 0) {
+				return [AzureResourceMessageTreeNode.create(AzureResourceSubscriptionTreeNode.noResourcesLabel, this)];
+			} else {
+				return children.map((child) => {
+					// To make tree node's id unique, otherwise, treeModel.js would complain 'item already registered'
+					child.resourceNode.treeItem.id = `${this._id}.${child.resourceNode.treeItem.id}`;
+					return new AzureResourceResourceTreeNode(child, this);
+				});
+			}
+		} catch (error) {
+			return [AzureResourceMessageTreeNode.create(AzureResourceErrorMessageUtil.getErrorMessage(error), this)];
+		}
 	}
 
 	public getTreeItem(): TreeItem | Promise<TreeItem> {
-		let item = new TreeItem(this.subscription.name, TreeItemCollapsibleState.Collapsed);
+		const item = new TreeItem(this.subscription.name, TreeItemCollapsibleState.Collapsed);
 		item.contextValue = AzureResourceItemType.subscription;
 		item.iconPath = {
-			dark: this.servicePool.contextService.getAbsolutePath('resources/dark/subscription_inverse.svg'),
-			light: this.servicePool.contextService.getAbsolutePath('resources/light/subscription.svg')
+			dark: this.appContext.extensionContext.asAbsolutePath('resources/dark/subscription_inverse.svg'),
+			light: this.appContext.extensionContext.asAbsolutePath('resources/light/subscription.svg')
 		};
 		return item;
 	}
@@ -58,8 +86,10 @@ export class AzureResourceSubscriptionTreeNode extends AzureResourceTreeNodeBase
 	}
 
 	public get nodePathValue(): string {
-		return `subscription_${this.subscription.id}`;
+        return this._id;
 	}
 
-	private _children: AzureResourceContainerTreeNodeBase[] = [];
+	private _id: string = undefined;
+
+	private static readonly noResourcesLabel = localize('azure.resource.tree.subscriptionTreeNode.noResourcesLabel', 'No Resources found.');
 }

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

@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { TreeNode } from '../../treeNodes';
+import { TreeNode } from '../treeNode';
 
 export interface IAzureResourceTreeChangeHandler {
 	notifyNodeChanged(node: TreeNode): void;

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

@@ -6,26 +6,25 @@
 'use strict';
 
 import { TreeDataProvider, EventEmitter, Event, TreeItem } from 'vscode';
-import { DidChangeAccountsParams } from 'sqlops';
-import { TreeNode } from '../../treeNodes';
 import { setInterval, clearInterval } from 'timers';
+import { AppContext } from '../../appContext';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { AzureResourceServicePool } from '../servicePool';
+import { TreeNode } from '../treeNode';
 import { AzureResourceAccountTreeNode } from './accountTreeNode';
 import { AzureResourceAccountNotSignedInTreeNode } from './accountNotSignedInTreeNode';
-import { AzureResourceMessageTreeNode } from './messageTreeNode';
-import { AzureResourceContainerTreeNodeBase, AzureResourceTreeNodeBase } from './baseTreeNodes';
+import { AzureResourceMessageTreeNode } from '../messageTreeNode';
+import { AzureResourceContainerTreeNodeBase } from './baseTreeNodes';
 import { AzureResourceErrorMessageUtil } from '../utils';
-
-export interface IAzureResourceTreeChangeHandler {
-	notifyNodeChanged(node: TreeNode): void;
-}
+import { IAzureResourceTreeChangeHandler } from './treeChangeHandler';
+import { IAzureResourceAccountService } from '../../azureResource/interfaces';
+import { AzureResourceServiceNames } from '../constants';
 
 export class AzureResourceTreeProvider implements TreeDataProvider<TreeNode>, IAzureResourceTreeChangeHandler {
-	public constructor() {
-		AzureResourceServicePool.getInstance().accountService.onDidChangeAccounts((e: DidChangeAccountsParams) => { this._onDidChangeTreeData.fire(undefined); });
+	public constructor(
+		public readonly appContext: AppContext
+	) {
 	}
 
 	public async getChildren(element?: TreeNode): Promise<TreeNode[]> {
@@ -33,11 +32,11 @@ export class AzureResourceTreeProvider implements TreeDataProvider<TreeNode>, IA
 			return element.getChildren(true);
 		}
 
-		if (!this.isSystemInitialized) {
+		if (!this.isSystemInitialized && !this._loadingTimer) {
 			this._loadingTimer = setInterval(async () => {
 				try {
 					// Call sqlops.accounts.getAllAccounts() to determine whether the system has been initialized.
-					await AzureResourceServicePool.getInstance().accountService.getAccounts();
+					await this.appContext.getService<IAzureResourceAccountService>(AzureResourceServiceNames.accountService).getAccounts();
 
 					// System has been initialized
 					this.isSystemInitialized = true;
@@ -51,16 +50,16 @@ export class AzureResourceTreeProvider implements TreeDataProvider<TreeNode>, IA
 					// System not initialized yet
 					this.isSystemInitialized = false;
 				}
-			}, AzureResourceTreeProvider.LoadingTimerInterval);
+			}, AzureResourceTreeProvider.loadingTimerInterval);
 
-			return [AzureResourceMessageTreeNode.create(AzureResourceTreeProvider.Loading, undefined)];
+			return [AzureResourceMessageTreeNode.create(AzureResourceTreeProvider.loadingLabel, undefined)];
 		}
 
 		try {
-			const accounts = await AzureResourceServicePool.getInstance().accountService.getAccounts();
+			const accounts = await this.appContext.getService<IAzureResourceAccountService>(AzureResourceServiceNames.accountService).getAccounts();
 
 			if (accounts && accounts.length > 0) {
-				return accounts.map((account) => new AzureResourceAccountTreeNode(account, this));
+				return accounts.map((account) => new AzureResourceAccountTreeNode(account, this.appContext, this));
 			} else {
 				return [new AzureResourceAccountNotSignedInTreeNode()];
 			}
@@ -96,6 +95,6 @@ export class AzureResourceTreeProvider implements TreeDataProvider<TreeNode>, IA
 	private _loadingTimer: NodeJS.Timer = undefined;
 	private _onDidChangeTreeData = new EventEmitter<TreeNode>();
 
-	private static readonly Loading = localize('azureResource.tree.treeProvider.loading', 'Loading ...');
-	private static readonly LoadingTimerInterval = 5000;
+	private static readonly loadingLabel = localize('azure.resource.tree.treeProvider.loadingLabel', 'Loading ...');
+	private static readonly loadingTimerInterval = 5000;
 }

extensions/azurecore/src/azureResource/treeNode.ts

@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 sqlops from 'sqlops';
+import * as vscode from 'vscode';
+
+type TreeNodePredicate = (node: TreeNode) => boolean;
+
+export abstract class TreeNode {
+	public generateNodePath(): string {
+		let path = undefined;
+		if (this.parent) {
+			path = this.parent.generateNodePath();
+		}
+		path = path ? `${path}/${this.nodePathValue}` : this.nodePathValue;
+		return path;
+	}
+
+	public findNodeByPath(path: string, expandIfNeeded: boolean = false): Promise<TreeNode> {
+		let condition: TreeNodePredicate = (node: TreeNode) => node.getNodeInfo().nodePath === path;
+		let filter: TreeNodePredicate = (node: TreeNode) => path.startsWith(node.getNodeInfo().nodePath);
+		return TreeNode.findNode(this, condition, filter, true);
+	}
+
+	public static async findNode(node: TreeNode, condition: TreeNodePredicate, filter: TreeNodePredicate, expandIfNeeded: boolean): Promise<TreeNode> {
+		if (!node) {
+			return undefined;
+		}
+
+		if (condition(node)) {
+			return node;
+		}
+
+		let nodeInfo = node.getNodeInfo();
+		if (nodeInfo.isLeaf) {
+			return undefined;
+		}
+
+		// TODO support filtering by already expanded / not yet expanded
+		let children = await node.getChildren(false);
+		if (children) {
+			for (let child of children) {
+				if (filter && filter(child)) {
+					let childNode =  await this.findNode(child, condition, filter, expandIfNeeded);
+					if (childNode) {
+						return childNode;
+					}
+				}
+			}
+		}
+		return undefined;
+	}
+
+	public get parent(): TreeNode {
+		return this._parent;
+	}
+
+	public set parent(node: TreeNode) {
+		this._parent = node;
+	}
+
+	public abstract getChildren(refreshChildren: boolean): TreeNode[] | Promise<TreeNode[]>;
+	public abstract getTreeItem(): vscode.TreeItem | Promise<vscode.TreeItem>;
+
+	public abstract getNodeInfo(): sqlops.NodeInfo;
+
+	/**
+	 * The value to use for this node in the node path
+	 */
+	public abstract get nodePathValue(): string;
+
+	private _parent: TreeNode = undefined;
+}

extensions/azurecore/src/azureResource/utils.ts

@@ -12,10 +12,9 @@ export function getErrorMessage(error: Error | string): string {
     return (error instanceof Error) ? error.message : error;
 }
 
-
 export class AzureResourceErrorMessageUtil {
 	public static getErrorMessage(error: Error | string): string {
-		return localize('azureResource.error', 'Error: {0}', getErrorMessage(error));
+		return localize('azure.resource.error', 'Error: {0}', getErrorMessage(error));
 	}
 }
 
@@ -41,4 +40,57 @@ export function generateGuid(): string {
     let clockSequenceHi: string = hexValues[8 + (Math.random() * 4) | 0];
     return oct.substr(0, 8) + '-' + oct.substr(9, 4) + '-4' + oct.substr(13, 3) + '-' + clockSequenceHi + oct.substr(16, 3) + '-' + oct.substr(19, 12);
     /* tslint:enable:no-bitwise */
+}
+
+export function equals(one: any, other: any): boolean {
+    if (one === other) {
+        return true;
+    }
+    if (one === null || one === undefined || other === null || other === undefined) {
+        return false;
+    }
+    if (typeof one !== typeof other) {
+        return false;
+    }
+    if (typeof one !== 'object') {
+        return false;
+    }
+    if ((Array.isArray(one)) !== (Array.isArray(other))) {
+        return false;
+    }
+
+    let i: number;
+    let key: string;
+
+    if (Array.isArray(one)) {
+        if (one.length !== other.length) {
+            return false;
+        }
+        for (i = 0; i < one.length; i++) {
+            if (!equals(one[i], other[i])) {
+                return false;
+            }
+        }
+    } else {
+        const oneKeys: string[] = [];
+
+        for (key in one) {
+            oneKeys.push(key);
+        }
+        oneKeys.sort();
+        const otherKeys: string[] = [];
+        for (key in other) {
+            otherKeys.push(key);
+        }
+        otherKeys.sort();
+        if (!equals(oneKeys, otherKeys)) {
+            return false;
+        }
+        for (i = 0; i < oneKeys.length; i++) {
+            if (!equals(one[oneKeys[i]], other[oneKeys[i]])) {
+                return false;
+            }
+        }
+    }
+    return true;
 }

extensions/azurecore/src/controllers/azureResourceController.ts

@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 ControllerBase from './controllerBase';
+import { DidChangeAccountsParams } from 'sqlops';
+
+import {
+	IAzureResourceCacheService,
+	IAzureResourceAccountService,
+	IAzureResourceSubscriptionService,
+	IAzureResourceSubscriptionFilterService,
+	IAzureResourceTenantService } from '../azureResource/interfaces';
+import { AzureResourceServiceNames } from '../azureResource/constants';
+import { AzureResourceTreeProvider } from '../azureResource/tree/treeProvider';
+import { registerAzureResourceCommands } from '../azureResource/commands';
+import { AzureResourceAccountService } from '../azureResource/services/accountService';
+import { AzureResourceSubscriptionService } from '../azureResource/services/subscriptionService';
+import { AzureResourceSubscriptionFilterService } from '../azureResource/services/subscriptionFilterService';
+import { AzureResourceCacheService } from '../azureResource/services/cacheService';
+import { AzureResourceTenantService } from '../azureResource/services/tenantService';
+
+import { registerAzureResourceDatabaseServerCommands } from '../azureResource/providers/databaseServer/commands';
+import { registerAzureResourceDatabaseCommands } from '../azureResource/providers/database/commands';
+import { equals } from '../azureResource/utils';
+
+export default class AzureResourceController extends ControllerBase {
+	public activate(): Promise<boolean> {
+		this.appContext.registerService<IAzureResourceCacheService>(AzureResourceServiceNames.cacheService, new AzureResourceCacheService(this.extensionContext));
+		this.appContext.registerService<IAzureResourceAccountService>(AzureResourceServiceNames.accountService, new AzureResourceAccountService(this.apiWrapper));
+		this.appContext.registerService<IAzureResourceSubscriptionService>(AzureResourceServiceNames.subscriptionService, new AzureResourceSubscriptionService());
+		this.appContext.registerService<IAzureResourceSubscriptionFilterService>(AzureResourceServiceNames.subscriptionFilterService, new AzureResourceSubscriptionFilterService(new AzureResourceCacheService(this.extensionContext)));
+		this.appContext.registerService<IAzureResourceTenantService>(AzureResourceServiceNames.tenantService, new AzureResourceTenantService());
+
+		const azureResourceTree = new AzureResourceTreeProvider(this.appContext);
+		this.extensionContext.subscriptions.push(this.apiWrapper.registerTreeDataProvider('azureResourceExplorer', azureResourceTree));
+
+		let previousAccounts = undefined;
+		this.appContext.getService<IAzureResourceAccountService>(AzureResourceServiceNames.accountService).onDidChangeAccounts((e: DidChangeAccountsParams) => {
+			// the onDidChangeAccounts event will trigger in many cases where the accounts didn't actually change
+			// the notifyNodeChanged event triggers a refresh which triggers a getChildren which can trigger this callback
+			// this below check short-circuits the infinite callback loop
+			if (!equals(e.accounts, previousAccounts)) {
+				azureResourceTree.notifyNodeChanged(undefined);
+			}
+			previousAccounts = e.accounts;
+		});
+
+		registerAzureResourceCommands(this.appContext, azureResourceTree);
+
+		registerAzureResourceDatabaseServerCommands(this.appContext);
+
+		registerAzureResourceDatabaseCommands(this.appContext);
+
+		return Promise.resolve(true);
+	}
+
+	public deactivate(): void {
+	}
+}

extensions/azurecore/src/controllers/mainController.ts

@@ -1,54 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 ControllerBase from './controllerBase';
-
-import { AzureResourceTreeProvider } from '../azureResource/tree/treeProvider';
-import { registerAzureResourceCommands } from '../azureResource/commands';
-import { AzureResourceServicePool } from '../azureResource/servicePool';
-import { AzureResourceCredentialService } from '../azureResource/services/credentialService';
-import { AzureResourceAccountService } from '../azureResource/services/accountService';
-import { AzureResourceSubscriptionService } from '../azureResource/services/subscriptionService';
-import { AzureResourceSubscriptionFilterService } from '../azureResource/services/subscriptionFilterService';
-import { AzureResourceDatabaseServerService } from '../azureResource/services/databaseServerService';
-import { AzureResourceDatabaseService } from '../azureResource/services/databaseService';
-import { AzureResourceCacheService } from '../azureResource/services/cacheService';
-import { AzureResourceContextService } from '../azureResource/services/contextService';
-
-/**
- * The main controller class that initializes the extension
- */
-export default class MainController extends ControllerBase {
-	// PUBLIC METHODS //////////////////////////////////////////////////////
-	/**
-	 * Deactivates the extension
-	 */
-	public deactivate(): void {
-	}
-
-	public activate(): Promise<boolean> {
-		this.configureAzureResource();
-		return Promise.resolve(true);
-	}
-
-	private configureAzureResource(): void {
-		let servicePool = AzureResourceServicePool.getInstance();
-		servicePool.cacheService = new AzureResourceCacheService(this.extensionContext);
-		servicePool.contextService = new AzureResourceContextService(this.extensionContext, this.apiWrapper);
-		servicePool.accountService = new AzureResourceAccountService(this.apiWrapper);
-		servicePool.credentialService = new AzureResourceCredentialService(this.apiWrapper);
-		servicePool.subscriptionService = new AzureResourceSubscriptionService();
-		servicePool.subscriptionFilterService = new AzureResourceSubscriptionFilterService(new AzureResourceCacheService(this.extensionContext));
-		servicePool.databaseService = new AzureResourceDatabaseService();
-		servicePool.databaseServerService = new AzureResourceDatabaseServerService();
-
-		let azureResourceTree = new AzureResourceTreeProvider();
-		this.extensionContext.subscriptions.push(this.apiWrapper.registerTreeDataProvider('azureResourceExplorer', azureResourceTree));
-
-		registerAzureResourceCommands(this.apiWrapper, azureResourceTree);
-	}
-}

extensions/azurecore/src/extension.ts

@@ -6,12 +6,17 @@ import * as path from 'path';
 import * as os from 'os';
 import * as constants from './constants';
 
-import MainController from './controllers/mainController';
+import AzureResourceController from './controllers/azureResourceController';
 import { AppContext } from './appContext';
 import ControllerBase from './controllers/controllerBase';
 import { ApiWrapper } from './apiWrapper';
 import { AzureAccountProviderService } from './account-provider/azureAccountProviderService';
 
+import { AzureResourceDatabaseServerProvider } from './azureResource/providers/databaseServer/databaseServerProvider';
+import { AzureResourceDatabaseServerService } from './azureResource/providers/databaseServer/databaseServerService';
+import { AzureResourceDatabaseProvider } from './azureResource/providers/database/databaseProvider';
+import { AzureResourceDatabaseService } from './azureResource/providers/database/databaseService';
+
 let controllers: ControllerBase[] = [];
 
 
@@ -35,7 +40,8 @@ export function getDefaultLogLocation() {
 // this method is called when your extension is activated
 // your extension is activated the very first time the command is executed
 export function activate(extensionContext: vscode.ExtensionContext) {
-	let appContext = new AppContext(extensionContext, new ApiWrapper());
+	const apiWrapper = new ApiWrapper();
+	let appContext = new AppContext(extensionContext, apiWrapper);
 	let activations: Thenable<boolean>[] = [];
 
 	// Create the folder for storing the token caches
@@ -56,21 +62,19 @@ export function activate(extensionContext: vscode.ExtensionContext) {
 	extensionContext.subscriptions.push(accountProviderService);
 	accountProviderService.activate();
 
-	// Start the main controller
-	let mainController = new MainController(appContext);
-	controllers.push(mainController);
-	extensionContext.subscriptions.push(mainController);
-	activations.push(mainController.activate());
+	const azureResourceController = new AzureResourceController(appContext);
+	controllers.push(azureResourceController);
+	extensionContext.subscriptions.push(azureResourceController);
+	activations.push(azureResourceController.activate());
 
-	return Promise.all(activations)
-		.then((results: boolean[]) => {
-			for (let result of results) {
-				if (!result) {
-					return false;
-				}
-			}
-			return true;
-		});
+	return {
+		provideResources() {
+			return [
+				new AzureResourceDatabaseServerProvider(new AzureResourceDatabaseServerService(), apiWrapper, extensionContext),
+				new AzureResourceDatabaseProvider(new AzureResourceDatabaseService(), apiWrapper, extensionContext)
+			];
+		}
+	};
 }
 
 // this method is called when your extension is deactivated

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

@@ -9,8 +9,8 @@ import * as should from 'should';
 import * as vscode from 'vscode';
 import 'mocha';
 
-import { AzureResourceItemType } from '../../../azureResource/constants';
-import { AzureResourceMessageTreeNode } from '../../../azureResource/tree/messageTreeNode';
+import { AzureResourceItemType } from '../../azureResource/constants';
+import { AzureResourceMessageTreeNode } from '../../azureResource/messageTreeNode';
 
 describe('AzureResourceMessageTreeNode.info', function(): void {
 	it('Should be correct when created.', async function(): Promise<void> {

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

@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 should from 'should';
+import * as TypeMoq from 'typemoq';
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import 'mocha';
+
+import { azureResource } from '../../../../azureResource/azure-resource';
+import { ApiWrapper } from '../../../../apiWrapper';
+import { IAzureResourceDatabaseService } from '../../../../azureResource/providers/database/interfaces';
+import { AzureResourceDatabaseTreeDataProvider } from '../../../../azureResource/providers/database/databaseTreeDataProvider';
+import { AzureResourceDatabase } from '../../../../azureResource/providers/database/models';
+import { AzureResourceItemType } from '../../../../azureResource/constants';
+
+// Mock services
+let mockDatabaseService: TypeMoq.IMock<IAzureResourceDatabaseService>;
+let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
+let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
+
+// Mock test data
+const mockAccount: sqlops.Account = {
+	key: {
+		accountId: 'mock_account',
+		providerId: 'mock_provider'
+	},
+	displayInfo: {
+		displayName: 'mock_account@test.com',
+		accountType: 'Microsoft',
+		contextualDisplayName: 'test'
+	},
+	properties: undefined,
+	isStale: false
+};
+
+const mockSubscription: azureResource.AzureResourceSubscription = {
+	id: 'mock_subscription',
+	name: 'mock subscription'
+};
+
+const mockTenantId: string = 'mock_tenant';
+
+const mockResourceRootNode: azureResource.IAzureResourceNode = {
+	account: mockAccount,
+	subscription: mockSubscription,
+	tenantId: mockTenantId,
+	treeItem: {
+		id: 'mock_resource_root_node',
+		label: 'mock resource root node',
+		iconPath: undefined,
+		collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
+		contextValue: 'mock_resource_root_node'
+	}
+};
+
+const mockTokens = {};
+mockTokens[mockTenantId] = {
+	token: 'mock_token',
+	tokenType: 'Bearer'
+};
+
+const mockDatabases: AzureResourceDatabase[] = [
+	{
+		name: 'mock database 1',
+		serverName: 'mock database server 1',
+		serverFullName: 'mock database server full name 1',
+		loginName: 'mock login'
+	},
+	{
+		name: 'mock database 2',
+		serverName: 'mock database server 2',
+		serverFullName: 'mock database server full name 2',
+		loginName: 'mock login'
+	}
+];
+
+describe('AzureResourceDatabaseTreeDataProvider.info', function(): void {
+	beforeEach(() => {
+		mockDatabaseService = TypeMoq.Mock.ofType<IAzureResourceDatabaseService>();
+		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
+		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
+	});
+
+	it('Should be correct when created.', async function(): Promise<void> {
+		const treeDataProvider = new AzureResourceDatabaseTreeDataProvider(mockDatabaseService.object, mockApiWrapper.object, mockExtensionContext.object);
+
+		const treeItem = await treeDataProvider.getTreeItem(mockResourceRootNode);
+		should(treeItem.id).equal(mockResourceRootNode.treeItem.id);
+		should(treeItem.label).equal(mockResourceRootNode.treeItem.label);
+		should(treeItem.collapsibleState).equal(mockResourceRootNode.treeItem.collapsibleState);
+		should(treeItem.contextValue).equal(mockResourceRootNode.treeItem.contextValue);
+	});
+});
+
+describe('AzureResourceDatabaseTreeDataProvider.getChildren', function(): void {
+	beforeEach(() => {
+		mockDatabaseService = TypeMoq.Mock.ofType<IAzureResourceDatabaseService>();
+		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
+		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
+
+		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.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());
+	});
+
+	it('Should return container node when element is undefined.', async function(): Promise<void> {
+		const treeDataProvider = new AzureResourceDatabaseTreeDataProvider(mockDatabaseService.object, mockApiWrapper.object, mockExtensionContext.object);
+
+		const children = await treeDataProvider.getChildren();
+
+		should(children).Array();
+		should(children.length).equal(1);
+
+		const child = children[0];
+		should(child.account).undefined();
+		should(child.subscription).undefined();
+		should(child.tenantId).undefined();
+		should(child.treeItem.id).equal('azure.resource.providers.database.treeDataProvider.databaseContainer');
+		should(child.treeItem.label).equal('SQL Databases');
+		should(child.treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.Collapsed);
+		should(child.treeItem.contextValue).equal('azure.resource.itemType.databaseContainer');
+	});
+
+	it('Should return resource nodes when it is container node.', async function(): Promise<void> {
+		const treeDataProvider = new AzureResourceDatabaseTreeDataProvider(mockDatabaseService.object, mockApiWrapper.object, mockExtensionContext.object);
+
+		const children = await treeDataProvider.getChildren(mockResourceRootNode);
+
+		should(children).Array();
+		should(children.length).equal(mockDatabases.length);
+
+		for (let ix = 0; ix < children.length; ix++) {
+			const child = children[ix];
+			const database = mockDatabases[ix];
+
+			should(child.account).equal(mockAccount);
+			should(child.subscription).equal(mockSubscription);
+			should(child.tenantId).equal(mockTenantId);
+			should(child.treeItem.id).equal(`databaseServer_${database.serverFullName}.database_${database.name}`);
+			should(child.treeItem.label).equal(`${database.name} (${database.serverName})`);
+			should(child.treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.None);
+			should(child.treeItem.contextValue).equal(AzureResourceItemType.database);
+		}
+	});
+});

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

@@ -0,0 +1,150 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 should from 'should';
+import * as TypeMoq from 'typemoq';
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import 'mocha';
+
+import { azureResource } from '../../../../azureResource/azure-resource';
+import { ApiWrapper } from '../../../../apiWrapper';
+import { IAzureResourceDatabaseServerService } from '../../../../azureResource/providers/databaseServer/interfaces';
+import { AzureResourceDatabaseServerTreeDataProvider } from '../../../../azureResource/providers/databaseServer/databaseServerTreeDataProvider';
+import { AzureResourceDatabaseServer } from '../../../../azureResource/providers/databaseServer/models';
+import { AzureResourceItemType } from '../../../../azureResource/constants';
+
+// Mock services
+let mockDatabaseServerService: TypeMoq.IMock<IAzureResourceDatabaseServerService>;
+let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
+let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
+
+// Mock test data
+const mockAccount: sqlops.Account = {
+	key: {
+		accountId: 'mock_account',
+		providerId: 'mock_provider'
+	},
+	displayInfo: {
+		displayName: 'mock_account@test.com',
+		accountType: 'Microsoft',
+		contextualDisplayName: 'test'
+	},
+	properties: undefined,
+	isStale: false
+};
+
+const mockSubscription: azureResource.AzureResourceSubscription = {
+	id: 'mock_subscription',
+	name: 'mock subscription'
+};
+
+const mockTenantId: string = 'mock_tenant';
+
+const mockResourceRootNode: azureResource.IAzureResourceNode = {
+	account: mockAccount,
+	subscription: mockSubscription,
+	tenantId: mockTenantId,
+	treeItem: {
+		id: 'mock_resource_root_node',
+		label: 'mock resource root node',
+		iconPath: undefined,
+		collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
+		contextValue: 'mock_resource_root_node'
+	}
+};
+
+const mockTokens = {};
+mockTokens[mockTenantId] = {
+	token: 'mock_token',
+	tokenType: 'Bearer'
+};
+
+const mockDatabaseServers: AzureResourceDatabaseServer[] = [
+	{
+		name: 'mock database server 1',
+		fullName: 'mock database server full name 1',
+		loginName: 'mock login',
+		defaultDatabaseName: 'master'
+	},
+	{
+		name: 'mock database server 2',
+		fullName: 'mock database server full name 2',
+		loginName: 'mock login',
+		defaultDatabaseName: 'master'
+	}
+];
+
+describe('AzureResourceDatabaseServerTreeDataProvider.info', function(): void {
+	beforeEach(() => {
+		mockDatabaseServerService = TypeMoq.Mock.ofType<IAzureResourceDatabaseServerService>();
+		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
+		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
+	});
+
+	it('Should be correct when created.', async function(): Promise<void> {
+		const treeDataProvider = new AzureResourceDatabaseServerTreeDataProvider(mockDatabaseServerService.object, mockApiWrapper.object, mockExtensionContext.object);
+
+		const treeItem = await treeDataProvider.getTreeItem(mockResourceRootNode);
+		should(treeItem.id).equal(mockResourceRootNode.treeItem.id);
+		should(treeItem.label).equal(mockResourceRootNode.treeItem.label);
+		should(treeItem.collapsibleState).equal(mockResourceRootNode.treeItem.collapsibleState);
+		should(treeItem.contextValue).equal(mockResourceRootNode.treeItem.contextValue);
+	});
+});
+
+describe('AzureResourceDatabaseServerTreeDataProvider.getChildren', function(): void {
+	beforeEach(() => {
+		mockDatabaseServerService = TypeMoq.Mock.ofType<IAzureResourceDatabaseServerService>();
+		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
+		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
+
+		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.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());
+	});
+
+	it('Should return container node when element is undefined.', async function(): Promise<void> {
+		const treeDataProvider = new AzureResourceDatabaseServerTreeDataProvider(mockDatabaseServerService.object, mockApiWrapper.object, mockExtensionContext.object);
+
+		const children = await treeDataProvider.getChildren();
+
+		should(children).Array();
+		should(children.length).equal(1);
+
+		const child = children[0];
+		should(child.account).undefined();
+		should(child.subscription).undefined();
+		should(child.tenantId).undefined();
+		should(child.treeItem.id).equal('azure.resource.providers.databaseServer.treeDataProvider.databaseServerContainer');
+		should(child.treeItem.label).equal('SQL Servers');
+		should(child.treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.Collapsed);
+		should(child.treeItem.contextValue).equal('azure.resource.itemType.databaseServerContainer');
+	});
+
+	it('Should return resource nodes when it is container node.', async function(): Promise<void> {
+		const treeDataProvider = new AzureResourceDatabaseServerTreeDataProvider(mockDatabaseServerService.object, mockApiWrapper.object, mockExtensionContext.object);
+
+		const children = await treeDataProvider.getChildren(mockResourceRootNode);
+
+		should(children).Array();
+		should(children.length).equal(mockDatabaseServers.length);
+
+		for (let ix = 0; ix < children.length; ix++) {
+			const child = children[ix];
+			const databaseServer = mockDatabaseServers[ix];
+
+			should(child.account).equal(mockAccount);
+			should(child.subscription).equal(mockSubscription);
+			should(child.tenantId).equal(mockTenantId);
+			should(child.treeItem.id).equal(`databaseServer_${databaseServer.name}`);
+			should(child.treeItem.label).equal(databaseServer.name);
+			should(child.treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.None);
+			should(child.treeItem.contextValue).equal(AzureResourceItemType.databaseServer);
+		}
+	});
+});

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

@@ -0,0 +1,180 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 should from 'should';
+import * as TypeMoq from 'typemoq';
+import * as sqlops from 'sqlops';
+import 'mocha';
+import { fail } from 'assert';
+
+import { azureResource } from '../../azureResource/azure-resource';
+import { AzureResourceService } from '../../azureResource/resourceService';
+
+// Mock test data
+const mockAccount: sqlops.Account = {
+	key: {
+		accountId: 'mock_account',
+		providerId: 'mock_provider'
+	},
+	displayInfo: {
+		displayName: 'mock_account@test.com',
+		accountType: 'Microsoft',
+		contextualDisplayName: 'test'
+	},
+	properties: undefined,
+	isStale: false
+};
+
+const mockSubscription: azureResource.AzureResourceSubscription = {
+	id: 'mock_subscription',
+	name: 'mock subscription'
+};
+
+const mockTenantId: string = 'mock_tenant';
+
+let mockResourceTreeDataProvider1: TypeMoq.IMock<azureResource.IAzureResourceTreeDataProvider>;
+let mockResourceProvider1: TypeMoq.IMock<azureResource.IAzureResourceProvider>;
+
+let mockResourceTreeDataProvider2: TypeMoq.IMock<azureResource.IAzureResourceTreeDataProvider>;
+let mockResourceProvider2: TypeMoq.IMock<azureResource.IAzureResourceProvider>;
+
+const resourceService: AzureResourceService = AzureResourceService.getInstance();
+
+describe('AzureResourceService.listResourceProviderIds', function(): void {
+	beforeEach(() => {
+		mockResourceTreeDataProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider1.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider1.setup((o) => o.getTreeItem(TypeMoq.It.isAny())).returns(() => Promise.resolve(TypeMoq.It.isAny()));
+		mockResourceProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider1.setup((o) => o.providerId).returns(() => 'mockResourceProvider1');
+		mockResourceProvider1.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider1.object);
+
+		mockResourceTreeDataProvider2 = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider2.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider2.setup((o) => o.getTreeItem(TypeMoq.It.isAny())).returns(() => Promise.resolve(TypeMoq.It.isAny()));
+		mockResourceProvider2 = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider2.setup((o) => o.providerId).returns(() => 'mockResourceProvider2');
+		mockResourceProvider2.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider2.object);
+
+		resourceService.clearResourceProviders();
+		resourceService.areResourceProvidersLoaded = true;
+	});
+
+	it('Should be correct when registering providers.', async function(): Promise<void> {
+		resourceService.registerResourceProvider(mockResourceProvider1.object);
+		let providerIds = await resourceService.listResourceProviderIds();
+		should(providerIds).Array();
+		should(providerIds.length).equal(1);
+		should(providerIds[0]).equal(mockResourceProvider1.object.providerId);
+
+		resourceService.registerResourceProvider(mockResourceProvider2.object);
+		providerIds = await resourceService.listResourceProviderIds();
+		should(providerIds).Array();
+		should(providerIds.length).equal(2);
+		should(providerIds[0]).equal(mockResourceProvider1.object.providerId);
+		should(providerIds[1]).equal(mockResourceProvider2.object.providerId);
+	});
+});
+
+describe('AzureResourceService.getRootChildren', function(): void {
+	beforeEach(() => {
+		mockResourceTreeDataProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider1.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider1.setup((o) => o.getTreeItem(TypeMoq.It.isAny())).returns(() => Promise.resolve(TypeMoq.It.isAny()));
+		mockResourceProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider1.setup((o) => o.providerId).returns(() => 'mockResourceProvider1');
+		mockResourceProvider1.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider1.object);
+
+		resourceService.clearResourceProviders();
+		resourceService.registerResourceProvider(mockResourceProvider1.object);
+		resourceService.areResourceProvidersLoaded = true;
+	});
+
+	it('Should be correct when provider id is correct.', async function(): Promise<void> {
+		const children = await resourceService.getRootChildren(mockResourceProvider1.object.providerId, mockAccount, mockSubscription, mockTenantId);
+
+		should(children).Array();
+	});
+
+	it('Should throw exceptions when provider id is incorrect.', async function(): Promise<void> {
+		const providerId = 'non_existent_provider_id';
+		try {
+			await resourceService.getRootChildren(providerId, mockAccount, mockSubscription, mockTenantId);
+		} catch (error) {
+			should(error.message).equal(`Azure resource provider doesn't exist. Id: ${providerId}`);
+			return;
+		}
+
+		fail();
+	});
+});
+
+describe('AzureResourceService.getChildren', function(): void {
+	beforeEach(() => {
+		mockResourceTreeDataProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider1.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider1.setup((o) => o.getChildren(TypeMoq.It.isAny())).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider1.setup((o) => o.getTreeItem(TypeMoq.It.isAny())).returns(() => Promise.resolve(TypeMoq.It.isAny()));
+		mockResourceProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider1.setup((o) => o.providerId).returns(() => 'mockResourceProvider1');
+		mockResourceProvider1.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider1.object);
+
+		resourceService.clearResourceProviders();
+		resourceService.registerResourceProvider(mockResourceProvider1.object);
+		resourceService.areResourceProvidersLoaded = true;
+	});
+
+	it('Should be correct when provider id is correct.', async function(): Promise<void> {
+		const children = await resourceService.getChildren(mockResourceProvider1.object.providerId, TypeMoq.It.isAny());
+		should(children).Array();
+	});
+
+	it('Should throw exceptions when provider id is incorrect.', async function(): Promise<void> {
+		const providerId = 'non_existent_provider_id';
+		try {
+			await resourceService.getRootChildren(providerId, mockAccount, mockSubscription, mockTenantId);
+		} catch (error) {
+			should(error.message).equal(`Azure resource provider doesn't exist. Id: ${providerId}`);
+			return;
+		}
+
+		fail();
+	});
+});
+
+describe('AzureResourceService.getTreeItem', function(): void {
+	beforeEach(() => {
+		mockResourceTreeDataProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider1.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider1.setup((o) => o.getChildren(TypeMoq.It.isAny())).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider1.setup((o) => o.getTreeItem(TypeMoq.It.isAny())).returns(() => Promise.resolve(TypeMoq.It.isAny()));
+		mockResourceProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider1.setup((o) => o.providerId).returns(() => 'mockResourceProvider1');
+		mockResourceProvider1.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider1.object);
+
+		resourceService.clearResourceProviders();
+		resourceService.registerResourceProvider(mockResourceProvider1.object);
+		resourceService.areResourceProvidersLoaded = true;
+	});
+
+	it('Should be correct when provider id is correct.', async function(): Promise<void> {
+		const treeItem = await resourceService.getTreeItem(mockResourceProvider1.object.providerId, TypeMoq.It.isAny());
+		should(treeItem).Object();
+	});
+
+	it('Should throw exceptions when provider id is incorrect.', async function(): Promise<void> {
+		const providerId = 'non_existent_provider_id';
+		try {
+			await resourceService.getRootChildren(providerId, mockAccount, mockSubscription, mockTenantId);
+		} catch (error) {
+			should(error.message).equal(`Azure resource provider doesn't exist. Id: ${providerId}`);
+			return;
+		}
+
+		fail();
+	});
+});

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

@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 should from 'should';
+import * as TypeMoq from 'typemoq';
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import 'mocha';
+
+import { azureResource } from '../../azureResource/azure-resource';
+import { AzureResourceService } from '../../azureResource/resourceService';
+import { AzureResourceResourceTreeNode } from '../../azureResource/resourceTreeNode';
+
+const resourceService = AzureResourceService.getInstance();
+
+// Mock test data
+const mockAccount: sqlops.Account = {
+	key: {
+		accountId: 'mock_account',
+		providerId: 'mock_provider'
+	},
+	displayInfo: {
+		displayName: 'mock_account@test.com',
+		accountType: 'Microsoft',
+		contextualDisplayName: 'test'
+	},
+	properties: undefined,
+	isStale: false
+};
+
+const mockSubscription: azureResource.AzureResourceSubscription = {
+	id: 'mock_subscription',
+	name: 'mock subscription'
+};
+
+const mockTenantId: string = 'mock_tenant';
+
+const mockResourceProviderId: string = 'mock_resource_provider';
+
+const mockResourceRootNode: azureResource.IAzureResourceNode = {
+	account: mockAccount,
+	subscription: mockSubscription,
+	tenantId: mockTenantId,
+	treeItem: {
+		id: 'mock_resource_root_node',
+		label: 'mock resource root node',
+		iconPath: undefined,
+		collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
+		contextValue: 'mock_resource_root_node'
+	}
+};
+
+const mockResourceNode1: azureResource.IAzureResourceNode = {
+	account: mockAccount,
+	subscription: mockSubscription,
+	tenantId: mockTenantId,
+	treeItem: {
+		id: 'mock_resource_node_1',
+		label: 'mock resource node 1',
+		iconPath: undefined,
+		collapsibleState: vscode.TreeItemCollapsibleState.None,
+		contextValue: 'mock_resource_node'
+	}
+};
+
+const mockResourceNode2: azureResource.IAzureResourceNode = {
+	account: mockAccount,
+	subscription: mockSubscription,
+	tenantId: mockTenantId,
+	treeItem: {
+		id: 'mock_resource_node_2',
+		label: 'mock resource node 2',
+		iconPath: undefined,
+		collapsibleState: vscode.TreeItemCollapsibleState.None,
+		contextValue: 'mock_resource_node'
+	}
+};
+
+const mockResourceNodes: azureResource.IAzureResourceNode[] = [mockResourceNode1, mockResourceNode2];
+
+let mockResourceTreeDataProvider: TypeMoq.IMock<azureResource.IAzureResourceTreeDataProvider>;
+let mockResourceProvider: TypeMoq.IMock<azureResource.IAzureResourceProvider>;
+
+describe('AzureResourceResourceTreeNode.info', function(): void {
+	beforeEach(() => {
+		mockResourceTreeDataProvider = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider.setup((o) => o.getTreeItem(mockResourceRootNode)).returns(() => mockResourceRootNode.treeItem);
+		mockResourceTreeDataProvider.setup((o) => o.getChildren(mockResourceRootNode)).returns(() => Promise.resolve(mockResourceNodes));
+
+		mockResourceProvider = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider.setup((o) => o.providerId).returns(() => mockResourceProviderId);
+		mockResourceProvider.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider.object);
+
+		resourceService.clearResourceProviders();
+		resourceService.registerResourceProvider(mockResourceProvider.object);
+
+		resourceService.areResourceProvidersLoaded = true;
+	});
+
+	it('Should be correct when created.', async function(): Promise<void> {
+		const resourceTreeNode = new AzureResourceResourceTreeNode({
+			resourceProviderId: mockResourceProviderId,
+			resourceNode: mockResourceRootNode
+		}, undefined);
+
+		should(resourceTreeNode.nodePathValue).equal(mockResourceRootNode.treeItem.id);
+
+		const treeItem = await resourceTreeNode.getTreeItem();
+		should(treeItem.id).equal(mockResourceRootNode.treeItem.id);
+		should(treeItem.label).equal(mockResourceRootNode.treeItem.label);
+		should(treeItem.collapsibleState).equal(mockResourceRootNode.treeItem.collapsibleState);
+		should(treeItem.contextValue).equal(mockResourceRootNode.treeItem.contextValue);
+
+		const nodeInfo = resourceTreeNode.getNodeInfo();
+		should(nodeInfo.label).equal(mockResourceRootNode.treeItem.label);
+		should(nodeInfo.isLeaf).equal(mockResourceRootNode.treeItem.collapsibleState === vscode.TreeItemCollapsibleState.None);
+		should(nodeInfo.nodeType).equal(mockResourceRootNode.treeItem.contextValue);
+		should(nodeInfo.iconType).equal(mockResourceRootNode.treeItem.contextValue);
+	});
+});
+
+describe('AzureResourceResourceTreeNode.getChildren', function(): void {
+	beforeEach(() => {
+		mockResourceTreeDataProvider = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider.setup((o) => o.getChildren(mockResourceRootNode)).returns(() => Promise.resolve(mockResourceNodes));
+
+		mockResourceProvider = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider.setup((o) => o.providerId).returns(() => mockResourceProviderId);
+		mockResourceProvider.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider.object);
+
+		resourceService.clearResourceProviders();
+		resourceService.registerResourceProvider(mockResourceProvider.object);
+
+		resourceService.areResourceProvidersLoaded = true;
+	});
+
+	it('Should return resource nodes when it is container node.', async function(): Promise<void> {
+		const resourceTreeNode = new AzureResourceResourceTreeNode({
+			resourceProviderId: mockResourceProviderId,
+			resourceNode: mockResourceRootNode
+		}, undefined);
+
+		const children = await resourceTreeNode.getChildren();
+
+		mockResourceTreeDataProvider.verify((o) => o.getChildren(mockResourceRootNode), TypeMoq.Times.once());
+
+		should(children).Array();
+		should(children.length).equal(mockResourceNodes.length);
+
+		for (let ix = 0; ix < children.length; ix++) {
+			const child = children[ix];
+
+			should(child).instanceOf(AzureResourceResourceTreeNode);
+
+			const childNode = (child as AzureResourceResourceTreeNode).resourceNodeWithProviderId;
+			should(childNode.resourceProviderId).equal(mockResourceProviderId);
+			should(childNode.resourceNode.account).equal(mockAccount);
+			should(childNode.resourceNode.subscription).equal(mockSubscription);
+			should(childNode.resourceNode.tenantId).equal(mockTenantId);
+			should(childNode.resourceNode.treeItem.id).equal(mockResourceNodes[ix].treeItem.id);
+			should(childNode.resourceNode.treeItem.label).equal(mockResourceNodes[ix].treeItem.label);
+			should(childNode.resourceNode.treeItem.collapsibleState).equal(mockResourceNodes[ix].treeItem.collapsibleState);
+			should(childNode.resourceNode.treeItem.contextValue).equal(mockResourceNodes[ix].treeItem.contextValue);
+		}
+	});
+
+	it('Should return empty when it is leaf node.', async function(): Promise<void> {
+		const resourceTreeNode = new AzureResourceResourceTreeNode({
+			resourceProviderId: mockResourceProviderId,
+			resourceNode: mockResourceNode1
+		}, undefined);
+
+		const children = await resourceTreeNode.getChildren();
+
+		mockResourceTreeDataProvider.verify((o) => o.getChildren(), TypeMoq.Times.exactly(0));
+
+		should(children).Array();
+		should(children.length).equal(0);
+	});
+});

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

@@ -26,7 +26,7 @@ describe('AzureResourceAccountNotSignedInTreeNode.info', function(): void {
 		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.None);
 		should(treeItem.command).not.undefined();
 		should(treeItem.command.title).equal(label);
-		should(treeItem.command.command).equal('azureresource.signin');
+		should(treeItem.command.command).equal('azure.resource.signin');
 
 		const nodeInfo = treeNode.getNodeInfo();
 		should(nodeInfo.isLeaf).true();

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

@@ -10,35 +10,38 @@ import * as TypeMoq from 'typemoq';
 import * as sqlops from 'sqlops';
 import * as vscode from 'vscode';
 import 'mocha';
-import { ServiceClientCredentials } from 'ms-rest';
+import { TokenCredentials } from 'ms-rest';
+import { AppContext } from '../../../appContext';
 
-import { AzureResourceServicePool } from '../../../azureResource/servicePool';
+import { azureResource } from '../../../azureResource/azure-resource';
 import {
 	IAzureResourceCacheService,
-	IAzureResourceContextService,
-	IAzureResourceCredentialService,
 	IAzureResourceSubscriptionService,
-	IAzureResourceSubscriptionFilterService
+	IAzureResourceSubscriptionFilterService,
+	IAzureResourceTenantService
 } from '../../../azureResource/interfaces';
 import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
 import { AzureResourceAccountTreeNode } from '../../../azureResource/tree/accountTreeNode';
-import { AzureResourceSubscription } from '../../../azureResource/models';
 import { AzureResourceSubscriptionTreeNode } from '../../../azureResource/tree/subscriptionTreeNode';
-import { AzureResourceItemType } from '../../../azureResource/constants';
-import { AzureResourceMessageTreeNode } from '../../../azureResource/tree/messageTreeNode';
+import { AzureResourceItemType, AzureResourceServiceNames } from '../../../azureResource/constants';
+import { AzureResourceMessageTreeNode } from '../../../azureResource/messageTreeNode';
+import { ApiWrapper } from '../../../apiWrapper';
+import { generateGuid } from '../../../azureResource/utils';
 
 // Mock services
-const mockServicePool = AzureResourceServicePool.getInstance();
-
+let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
+let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
 let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
-let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
-let mockCredentialService: TypeMoq.IMock<IAzureResourceCredentialService>;
 let mockSubscriptionService: TypeMoq.IMock<IAzureResourceSubscriptionService>;
 let mockSubscriptionFilterService: TypeMoq.IMock<IAzureResourceSubscriptionFilterService>;
+let mockTenantService: TypeMoq.IMock<IAzureResourceTenantService>;
+let mockAppContext: AppContext;
 
 let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
 
 // Mock test data
+const mockTenantId = 'mock_tenant_id';
+
 const mockAccount: sqlops.Account = {
 	key: {
 		accountId: 'mock_account',
@@ -49,51 +52,68 @@ const mockAccount: sqlops.Account = {
 		accountType: 'Microsoft',
 		contextualDisplayName: 'test'
 	},
-	properties: undefined,
+	properties: {
+		tenants: [
+			{
+				id: mockTenantId
+			}
+		]
+	},
 	isStale: false
 };
 
-const mockCredential = TypeMoq.Mock.ofType<ServiceClientCredentials>().object;
-const mockCredentials = [mockCredential];
-
-const mockSubscription1: AzureResourceSubscription = {
+const mockSubscription1: azureResource.AzureResourceSubscription = {
 	id: 'mock_subscription_1',
 	name: 'mock subscription 1'
 };
-const mockSubscription2: AzureResourceSubscription = {
+
+const mockSubscription2: azureResource.AzureResourceSubscription = {
 	id: 'mock_subscription_2',
 	name: 'mock subscription 2'
 };
+
 const mockSubscriptions = [mockSubscription1, mockSubscription2];
+
 const mockFilteredSubscriptions = [mockSubscription1];
 
-let mockSubscriptionCache: { subscriptions: { [accountId: string]: AzureResourceSubscription[]} };
+const mockTokens = {};
+mockTokens[mockTenantId] = {
+	token: 'mock_token',
+	tokenType: 'Bearer'
+};
+
+const mockCredential = new TokenCredentials(mockTokens[mockTenantId].token, mockTokens[mockTenantId].tokenType);
+
+let mockSubscriptionCache: azureResource.AzureResourceSubscription[] = [];
 
 describe('AzureResourceAccountTreeNode.info', function(): void {
 	beforeEach(() => {
-		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
+		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
+		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
 		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
-		mockCredentialService = TypeMoq.Mock.ofType<IAzureResourceCredentialService>();
 		mockSubscriptionService = TypeMoq.Mock.ofType<IAzureResourceSubscriptionService>();
 		mockSubscriptionFilterService = TypeMoq.Mock.ofType<IAzureResourceSubscriptionFilterService>();
+		mockTenantService = TypeMoq.Mock.ofType<IAzureResourceTenantService>();
 
 		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
 
-		mockSubscriptionCache = { subscriptions: {} };
+		mockSubscriptionCache = [];
 
-		mockServicePool.contextService = mockContextService.object;
-		mockServicePool.cacheService = mockCacheService.object;
-		mockServicePool.credentialService = mockCredentialService.object;
-		mockServicePool.subscriptionService = mockSubscriptionService.object;
-		mockServicePool.subscriptionFilterService = mockSubscriptionFilterService.object;
+		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object);
+		mockAppContext.registerService<IAzureResourceCacheService>(AzureResourceServiceNames.cacheService, mockCacheService.object);
+		mockAppContext.registerService<IAzureResourceSubscriptionService>(AzureResourceServiceNames.subscriptionService, mockSubscriptionService.object);
+		mockAppContext.registerService<IAzureResourceSubscriptionFilterService>(AzureResourceServiceNames.subscriptionFilterService, mockSubscriptionFilterService.object);
+		mockAppContext.registerService<IAzureResourceTenantService>(AzureResourceServiceNames.tenantService, mockTenantService.object);
 
-		mockCredentialService.setup((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockCredentials));
+		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.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.subscriptions[mockAccount.key.accountId] = mockSubscriptions);
+		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache = mockSubscriptions);
+		mockTenantService.setup((o) => o.getTenantId(TypeMoq.It.isAny())).returns(() => Promise.resolve(mockTenantId));
 	});
 
 	it('Should be correct when created.', async function(): Promise<void> {
-		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockAppContext, mockTreeChangeHandler.object);
 
 		const accountTreeNodeId = `account_${mockAccount.key.accountId}`;
 		const accountTreeNodeLabel = `${mockAccount.displayInfo.displayName} (${mockAccount.key.accountId})`;
@@ -114,14 +134,17 @@ describe('AzureResourceAccountTreeNode.info', function(): void {
 	});
 
 	it('Should be correct when there are subscriptions listed.', async function(): Promise<void> {
-		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(mockSubscriptions));
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredential)).returns(() => Promise.resolve(mockSubscriptions));
 		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve(undefined));
 
 		const accountTreeNodeLabel = `${mockAccount.displayInfo.displayName} (${mockAccount.key.accountId}) (${mockSubscriptions.length} / ${mockSubscriptions.length} subscriptions)`;
 
-		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockAppContext, mockTreeChangeHandler.object);
 
-		await accountTreeNode.getChildren();
+		const subscriptionNodes = await accountTreeNode.getChildren();
+
+		should(subscriptionNodes).Array();
+		should(subscriptionNodes.length).equal(mockSubscriptions.length);
 
 		const treeItem = await accountTreeNode.getTreeItem();
 		should(treeItem.label).equal(accountTreeNodeLabel);
@@ -131,14 +154,17 @@ describe('AzureResourceAccountTreeNode.info', function(): void {
 	});
 
 	it('Should be correct when there are subscriptions filtered.', async function(): Promise<void> {
-		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(mockSubscriptions));
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredential)).returns(() => Promise.resolve(mockSubscriptions));
 		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve(mockFilteredSubscriptions));
 
 		const accountTreeNodeLabel = `${mockAccount.displayInfo.displayName} (${mockAccount.key.accountId}) (${mockFilteredSubscriptions.length} / ${mockSubscriptions.length} subscriptions)`;
 
-		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockAppContext, mockTreeChangeHandler.object);
 
-		await accountTreeNode.getChildren();
+		const subscriptionNodes = await accountTreeNode.getChildren();
+
+		should(subscriptionNodes).Array();
+		should(subscriptionNodes.length).equal(mockFilteredSubscriptions.length);
 
 		const treeItem = await accountTreeNode.getTreeItem();
 		should(treeItem.label).equal(accountTreeNodeLabel);
@@ -150,36 +176,41 @@ describe('AzureResourceAccountTreeNode.info', function(): void {
 
 describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 	beforeEach(() => {
+		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
+		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
 		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
-		mockCredentialService = TypeMoq.Mock.ofType<IAzureResourceCredentialService>();
 		mockSubscriptionService = TypeMoq.Mock.ofType<IAzureResourceSubscriptionService>();
 		mockSubscriptionFilterService = TypeMoq.Mock.ofType<IAzureResourceSubscriptionFilterService>();
+		mockTenantService = TypeMoq.Mock.ofType<IAzureResourceTenantService>();
 
 		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
 
-		mockSubscriptionCache = { subscriptions: {} };
+		mockSubscriptionCache = [];
 
-		mockServicePool.cacheService = mockCacheService.object;
-		mockServicePool.credentialService = mockCredentialService.object;
-		mockServicePool.subscriptionService = mockSubscriptionService.object;
-		mockServicePool.subscriptionFilterService = mockSubscriptionFilterService.object;
+		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object);
+		mockAppContext.registerService<IAzureResourceCacheService>(AzureResourceServiceNames.cacheService, mockCacheService.object);
+		mockAppContext.registerService<IAzureResourceSubscriptionService>(AzureResourceServiceNames.subscriptionService, mockSubscriptionService.object);
+		mockAppContext.registerService<IAzureResourceSubscriptionFilterService>(AzureResourceServiceNames.subscriptionFilterService, mockSubscriptionFilterService.object);
+		mockAppContext.registerService<IAzureResourceTenantService>(AzureResourceServiceNames.tenantService, mockTenantService.object);
 
-		mockCredentialService.setup((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockCredentials));
+		mockApiWrapper.setup((o) => o.getSecurityToken(mockAccount, sqlops.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.subscriptions[mockAccount.key.accountId] = mockSubscriptions);
+		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockSubscriptionCache = mockSubscriptions);
+		mockTenantService.setup((o) => o.getTenantId(TypeMoq.It.isAny())).returns(() => Promise.resolve(mockTenantId));
 	});
 
 	it('Should load subscriptions from scratch and update cache when it is clearing cache.', async function(): Promise<void> {
-		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(mockSubscriptions));
-		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve(undefined));
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredential)).returns(() => Promise.resolve(mockSubscriptions));
+		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve([]));
 
-		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockAppContext, mockTreeChangeHandler.object);
 
 		const children = await accountTreeNode.getChildren();
 
-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
-		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredentials), TypeMoq.Times.once());
-		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.once());
+		mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, sqlops.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());
 		mockSubscriptionFilterService.verify((o) => o.getSelectedSubscriptions(mockAccount), TypeMoq.Times.once());
 
@@ -192,43 +223,42 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 		should(children).Array();
 		should(children.length).equal(mockSubscriptions.length);
 
-		should(Object.keys(mockSubscriptionCache.subscriptions)).deepEqual([mockAccount.key.accountId]);
-		should(mockSubscriptionCache.subscriptions[mockAccount.key.accountId]).deepEqual(mockSubscriptions);
+		should(mockSubscriptionCache).deepEqual(mockSubscriptions);
 
 		for (let ix = 0; ix < mockSubscriptions.length; ix++) {
 			const child = children[ix];
 			const subscription = mockSubscriptions[ix];
 
 			should(child).instanceof(AzureResourceSubscriptionTreeNode);
-			should(child.nodePathValue).equal(`subscription_${subscription.id}`);
+			should(child.nodePathValue).equal(`account_${mockAccount.key.accountId}.subscription_${subscription.id}.tenant_${mockTenantId}`);
 		}
 	});
 
 	it('Should load subscriptions from cache when it is not clearing cache.', async function(): Promise<void> {
-		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(mockSubscriptions));
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredential)).returns(() => Promise.resolve(mockSubscriptions));
 		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve(undefined));
 
-		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockAppContext, mockTreeChangeHandler.object);
 
 		await accountTreeNode.getChildren();
 		const children = await accountTreeNode.getChildren();
 
-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.exactly(1));
-		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredentials), TypeMoq.Times.exactly(1));
-		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(2));
-		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.exactly(1));
+		mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, sqlops.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());
 
-		should(children.length).equal(mockSubscriptionCache.subscriptions[mockAccount.key.accountId].length);
+		should(children.length).equal(mockSubscriptionCache.length);
 
-		for (let ix = 0; ix < mockSubscriptionCache.subscriptions[mockAccount.key.accountId].length; ix++) {
-			should(children[ix].nodePathValue).equal(`subscription_${mockSubscriptionCache.subscriptions[mockAccount.key.accountId][ix].id}`);
+		for (let ix = 0; ix < mockSubscriptionCache.length; ix++) {
+			should(children[ix].nodePathValue).equal(`account_${mockAccount.key.accountId}.subscription_${mockSubscriptionCache[ix].id}.tenant_${mockTenantId}`);
 		}
 	});
 
 	it('Should handle when there is no subscriptions.', async function(): Promise<void> {
-		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(undefined));
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredential)).returns(() => Promise.resolve(undefined));
 
-		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockAppContext, mockTreeChangeHandler.object);
 
 		const children = await accountTreeNode.getChildren();
 
@@ -242,10 +272,10 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 	});
 
 	it('Should honor subscription filtering.', async function(): Promise<void> {
-		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => Promise.resolve(mockSubscriptions));
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredential)).returns(() => Promise.resolve(mockSubscriptions));
 		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => Promise.resolve(mockFilteredSubscriptions));
 
-		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockAppContext, mockTreeChangeHandler.object);
 
 		const children = await accountTreeNode.getChildren();
 
@@ -255,23 +285,25 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 		should(children.length).equal(mockFilteredSubscriptions.length);
 
 		for (let ix = 0; ix < mockFilteredSubscriptions.length; ix++) {
-			should(children[ix].nodePathValue).equal(`subscription_${mockFilteredSubscriptions[ix].id}`);
+			should(children[ix].nodePathValue).equal(`account_${mockAccount.key.accountId}.subscription_${mockFilteredSubscriptions[ix].id}.tenant_${mockTenantId}`);
 		}
 	});
 
 	it('Should handle errors.', async function(): Promise<void> {
-		const mockError = 'Test error';
-		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredentials)).returns(() => { throw new Error(mockError); });
+		mockSubscriptionService.setup((o) => o.getSubscriptions(mockAccount, mockCredential)).returns(() => Promise.resolve(mockSubscriptions));
 
-		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+		const mockError = 'Test error';
+		mockSubscriptionFilterService.setup((o) => o.getSelectedSubscriptions(mockAccount)).returns(() => { throw new Error(mockError); });
+
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockAppContext, mockTreeChangeHandler.object);
 
 		const children = await accountTreeNode.getChildren();
 
-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
-		mockSubscriptionService.verify((o) => o.getSubscriptions(mockAccount, mockCredentials), TypeMoq.Times.once());
+		mockApiWrapper.verify((o) => o.getSecurityToken(mockAccount, sqlops.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());
-		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.never());
-		mockSubscriptionFilterService.verify((o) => o.getSelectedSubscriptions(mockAccount), TypeMoq.Times.never());
+		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.once());
 
 		should(children).Array();
 		should(children.length).equal(1);
@@ -283,12 +315,33 @@ describe('AzureResourceAccountTreeNode.getChildren', function(): void {
 
 describe('AzureResourceAccountTreeNode.clearCache', function() : void {
 	beforeEach(() => {
+		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
+		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
+		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
+		mockSubscriptionService = TypeMoq.Mock.ofType<IAzureResourceSubscriptionService>();
+		mockSubscriptionFilterService = TypeMoq.Mock.ofType<IAzureResourceSubscriptionFilterService>();
+		mockTenantService = TypeMoq.Mock.ofType<IAzureResourceTenantService>();
+
 		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockSubscriptionCache = [];
+
+		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object);
+		mockAppContext.registerService<IAzureResourceCacheService>(AzureResourceServiceNames.cacheService, mockCacheService.object);
+		mockAppContext.registerService<IAzureResourceSubscriptionService>(AzureResourceServiceNames.subscriptionService, mockSubscriptionService.object);
+		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));
+		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);
+		mockTenantService.setup((o) => o.getTenantId(TypeMoq.It.isAny())).returns(() => Promise.resolve(mockTenantId));
 	});
 
 	it('Should clear cache.', async function(): Promise<void> {
-		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockTreeChangeHandler.object);
+		const accountTreeNode = new AzureResourceAccountTreeNode(mockAccount, mockAppContext, mockTreeChangeHandler.object);
 		accountTreeNode.clearCache();
 		should(accountTreeNode.isClearingCache).true();
 	});
-});
+});

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

@@ -1,219 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 should from 'should';
-import * as TypeMoq from 'typemoq';
-import * as sqlops from 'sqlops';
-import * as vscode from 'vscode';
-import 'mocha';
-import { ServiceClientCredentials } from 'ms-rest';
-
-import { AzureResourceServicePool } from '../../../azureResource/servicePool';
-import {
-	IAzureResourceCacheService,
-	IAzureResourceContextService,
-	IAzureResourceCredentialService,
-	IAzureResourceDatabaseService
-} from '../../../azureResource/interfaces';
-import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
-import { AzureResourceSubscription, AzureResourceDatabase } from '../../../azureResource/models';
-import { AzureResourceItemType } from '../../../azureResource/constants';
-import { AzureResourceMessageTreeNode } from '../../../azureResource/tree/messageTreeNode';
-import { AzureResourceDatabaseContainerTreeNode } from '../../../azureResource/tree/databaseContainerTreeNode';
-import { AzureResourceDatabaseTreeNode } from '../../../azureResource/tree/databaseTreeNode';
-
-// Mock services
-const mockServicePool = AzureResourceServicePool.getInstance();
-
-let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
-let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
-let mockCredentialService: TypeMoq.IMock<IAzureResourceCredentialService>;
-let mockDatabaseService: TypeMoq.IMock<IAzureResourceDatabaseService>;
-
-let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
-
-// Mock test data
-const mockAccount: sqlops.Account = {
-	key: {
-		accountId: 'mock_account',
-		providerId: 'mock_provider'
-	},
-	displayInfo: {
-		displayName: 'mock_account@test.com',
-		accountType: 'Microsoft',
-		contextualDisplayName: 'test'
-	},
-	properties: undefined,
-	isStale: false
-};
-
-const mockCredential = TypeMoq.Mock.ofType<ServiceClientCredentials>().object;
-const mockCredentials = [mockCredential];
-
-const mockSubscription: AzureResourceSubscription = {
-	id: 'mock_subscription',
-	name: 'mock subscription'
-};
-
-const mockDatabase1: AzureResourceDatabase = {
-	name: 'mock database 1',
-	serverName: 'mock server 1',
-	serverFullName: 'mock server 1',
-	loginName: 'mock user 1'
-};
-const mockDatabase2: AzureResourceDatabase = {
-	name: 'mock database 2',
-	serverName: 'mock server 2',
-	serverFullName: 'mock server 2',
-	loginName: 'mock user 2'
-};
-const mockDatabases = [mockDatabase1, mockDatabase2];
-
-let mockDatabaseContainerCache: { databases: { [subscriptionId: string]: AzureResourceDatabase[] } };
-
-describe('AzureResourceDatabaseContainerTreeNode.info', function(): void {
-	beforeEach(() => {
-		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
-
-		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
-
-		mockServicePool.contextService = mockContextService.object;
-	});
-
-	it('Should be correct when created.', async function(): Promise<void> {
-		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-
-		const databaseContainerTreeNodeLabel = 'SQL Databases';
-
-		should(databaseContainerTreeNode.nodePathValue).equal('databaseContainer');
-
-		const treeItem = await databaseContainerTreeNode.getTreeItem();
-		should(treeItem.label).equal(databaseContainerTreeNodeLabel);
-		should(treeItem.contextValue).equal(AzureResourceItemType.databaseContainer);
-		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.Collapsed);
-
-		const nodeInfo = databaseContainerTreeNode.getNodeInfo();
-		should(nodeInfo.isLeaf).false();
-		should(nodeInfo.label).equal(databaseContainerTreeNodeLabel);
-		should(nodeInfo.nodeType).equal(AzureResourceItemType.databaseContainer);
-		should(nodeInfo.iconType).equal(AzureResourceItemType.databaseContainer);
-	});
-});
-
-describe('AzureResourceDatabaseContainerTreeNode.getChildren', function(): void {
-	beforeEach(() => {
-		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
-		mockCredentialService = TypeMoq.Mock.ofType<IAzureResourceCredentialService>();
-		mockDatabaseService = TypeMoq.Mock.ofType<IAzureResourceDatabaseService>();
-
-		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
-
-		mockDatabaseContainerCache = { databases: {} };
-
-		mockServicePool.cacheService = mockCacheService.object;
-		mockServicePool.credentialService = mockCredentialService.object;
-		mockServicePool.databaseService = mockDatabaseService.object;
-
-		mockCredentialService.setup((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockCredentials));
-		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockDatabaseContainerCache);
-		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockDatabaseContainerCache.databases[mockSubscription.id] = mockDatabases);
-	});
-
-	it('Should load databases from scratch and update cache when it is clearing cache.', async function(): Promise<void> {
-		mockDatabaseService.setup((o) => o.getDatabases(mockSubscription, mockCredentials)).returns(() => Promise.resolve(mockDatabases));
-
-		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-
-		const children = await databaseContainerTreeNode.getChildren();
-
-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
-		mockDatabaseService.verify((o) => o.getDatabases(mockSubscription, mockCredentials), 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());
-
-		should(databaseContainerTreeNode.isClearingCache).false();
-
-		should(children).Array();
-		should(children.length).equal(mockDatabases.length);
-
-		should(Object.keys(mockDatabaseContainerCache.databases)).deepEqual([mockSubscription.id]);
-		should(mockDatabaseContainerCache.databases[mockSubscription.id]).deepEqual(mockDatabases);
-
-		for (let ix = 0; ix < mockDatabases.length; ix++) {
-			const child = children[ix];
-			const database = mockDatabases[ix];
-
-			should(child).instanceof(AzureResourceDatabaseTreeNode);
-			should(child.nodePathValue).equal(`database_${database.name}`);
-		}
-	});
-
-	it('Should load databases from cache when it is not clearing cache.', async function(): Promise<void> {
-		mockDatabaseService.setup((o) => o.getDatabases(mockSubscription, mockCredentials)).returns(() => Promise.resolve(mockDatabases));
-
-		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-
-		await databaseContainerTreeNode.getChildren();
-		const children = await databaseContainerTreeNode.getChildren();
-
-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.exactly(1));
-		mockDatabaseService.verify((o) => o.getDatabases(mockSubscription, mockCredentials), TypeMoq.Times.exactly(1));
-		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(2));
-		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.exactly(1));
-
-		should(children.length).equal(mockDatabaseContainerCache.databases[mockSubscription.id].length);
-
-		for (let ix = 0; ix < mockDatabaseContainerCache.databases[mockSubscription.id].length; ix++) {
-			should(children[ix].nodePathValue).equal(`database_${mockDatabaseContainerCache.databases[mockSubscription.id][ix].name}`);
-		}
-	});
-
-	it('Should handle when there is no databases.', async function(): Promise<void> {
-		mockDatabaseService.setup((o) => o.getDatabases(mockSubscription, mockCredentials)).returns(() => Promise.resolve(undefined));
-
-		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-
-		const children = await databaseContainerTreeNode.getChildren();
-
-		should(children).Array();
-		should(children.length).equal(1);
-		should(children[0]).instanceof(AzureResourceMessageTreeNode);
-		should(children[0].nodePathValue).startWith('message_');
-		should(children[0].getNodeInfo().label).equal('No SQL Databases found.');
-	});
-
-	it('Should handle errors.', async function(): Promise<void> {
-		const mockError = 'Test error';
-		mockDatabaseService.setup((o) => o.getDatabases(mockSubscription, mockCredentials)).returns(() => { throw new Error(mockError); });
-
-		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-		const children = await databaseContainerTreeNode.getChildren();
-
-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
-		mockDatabaseService.verify((o) => o.getDatabases(mockSubscription, mockCredentials), TypeMoq.Times.once());
-		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.never());
-		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.never());
-
-		should(children).Array();
-		should(children.length).equal(1);
-		should(children[0]).instanceof(AzureResourceMessageTreeNode);
-		should(children[0].nodePathValue).startWith('message_');
-		should(children[0].getNodeInfo().label).equal(`Error: ${mockError}`);
-	});
-});
-
-describe('AzureResourceDatabaseContainerTreeNode.clearCache', function() : void {
-	beforeEach(() => {
-		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
-	});
-
-	it('Should clear cache.', async function(): Promise<void> {
-		const databaseContainerTreeNode = new AzureResourceDatabaseContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-		databaseContainerTreeNode.clearCache();
-		should(databaseContainerTreeNode.isClearingCache).true();
-	});
-});

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

@@ -1,219 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 should from 'should';
-import * as TypeMoq from 'typemoq';
-import * as sqlops from 'sqlops';
-import * as vscode from 'vscode';
-import 'mocha';
-import { ServiceClientCredentials } from 'ms-rest';
-
-import { AzureResourceServicePool } from '../../../azureResource/servicePool';
-import {
-	IAzureResourceCacheService,
-	IAzureResourceContextService,
-	IAzureResourceCredentialService,
-	IAzureResourceDatabaseServerService
-} from '../../../azureResource/interfaces';
-import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
-import { AzureResourceSubscription, AzureResourceDatabaseServer } from '../../../azureResource/models';
-import { AzureResourceItemType } from '../../../azureResource/constants';
-import { AzureResourceMessageTreeNode } from '../../../azureResource/tree/messageTreeNode';
-import { AzureResourceDatabaseServerContainerTreeNode } from '../../../azureResource/tree/databaseServerContainerTreeNode';
-import { AzureResourceDatabaseServerTreeNode } from '../../../azureResource/tree/databaseServerTreeNode';
-
-// Mock services
-const mockServicePool = AzureResourceServicePool.getInstance();
-
-let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
-let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
-let mockCredentialService: TypeMoq.IMock<IAzureResourceCredentialService>;
-let mockDatabaseServerService: TypeMoq.IMock<IAzureResourceDatabaseServerService>;
-
-let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
-
-// Mock test data
-const mockAccount: sqlops.Account = {
-	key: {
-		accountId: 'mock_account',
-		providerId: 'mock_provider'
-	},
-	displayInfo: {
-		displayName: 'mock_account@test.com',
-		accountType: 'Microsoft',
-		contextualDisplayName: 'test'
-	},
-	properties: undefined,
-	isStale: false
-};
-
-const mockCredential = TypeMoq.Mock.ofType<ServiceClientCredentials>().object;
-const mockCredentials = [mockCredential];
-
-const mockSubscription: AzureResourceSubscription = {
-	id: 'mock_subscription',
-	name: 'mock subscription'
-};
-
-const mockDatabaseServer1: AzureResourceDatabaseServer = {
-	name: 'mock server 1',
-	fullName: 'mock server 1',
-	loginName: 'mock user 1',
-	defaultDatabaseName: 'master'
-};
-const mockDatabaseServer2: AzureResourceDatabaseServer = {
-	name: 'mock server 2',
-	fullName: 'mock server 2',
-	loginName: 'mock user 2',
-	defaultDatabaseName: 'master'
-};
-const mockDatabaseServers = [mockDatabaseServer1, mockDatabaseServer2];
-
-let mockDatabaseServerContainerCache: { databaseServers: { [subscriptionId: string]: AzureResourceDatabaseServer[] } };
-
-describe('AzureResourceDatabaseServerContainerTreeNode.info', function(): void {
-	beforeEach(() => {
-		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
-
-		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
-
-		mockServicePool.contextService = mockContextService.object;
-	});
-
-	it('Should be correct when created.', async function(): Promise<void> {
-		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-
-		const databaseServerContainerTreeNodeLabel = 'SQL Servers';
-
-		should(databaseServerContainerTreeNode.nodePathValue).equal('databaseServerContainer');
-
-		const treeItem = await databaseServerContainerTreeNode.getTreeItem();
-		should(treeItem.label).equal(databaseServerContainerTreeNodeLabel);
-		should(treeItem.contextValue).equal(AzureResourceItemType.databaseServerContainer);
-		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.Collapsed);
-
-		const nodeInfo = databaseServerContainerTreeNode.getNodeInfo();
-		should(nodeInfo.isLeaf).false();
-		should(nodeInfo.label).equal(databaseServerContainerTreeNodeLabel);
-		should(nodeInfo.nodeType).equal(AzureResourceItemType.databaseServerContainer);
-		should(nodeInfo.iconType).equal(AzureResourceItemType.databaseServerContainer);
-	});
-});
-
-describe('AzureResourceDatabaseServerContainerTreeNode.getChildren', function(): void {
-	beforeEach(() => {
-		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
-		mockCredentialService = TypeMoq.Mock.ofType<IAzureResourceCredentialService>();
-		mockDatabaseServerService = TypeMoq.Mock.ofType<IAzureResourceDatabaseServerService>();
-
-		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
-
-		mockDatabaseServerContainerCache = { databaseServers: {} };
-
-		mockServicePool.cacheService = mockCacheService.object;
-		mockServicePool.credentialService = mockCredentialService.object;
-		mockServicePool.databaseServerService = mockDatabaseServerService.object;
-
-		mockCredentialService.setup((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement)).returns(() => Promise.resolve(mockCredentials));
-		mockCacheService.setup((o) => o.get(TypeMoq.It.isAnyString())).returns(() => mockDatabaseServerContainerCache);
-		mockCacheService.setup((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny())).returns(() => mockDatabaseServerContainerCache.databaseServers[mockSubscription.id] = mockDatabaseServers);
-	});
-
-	it('Should load database servers from scratch and update cache when it is clearing cache.', async function(): Promise<void> {
-		mockDatabaseServerService.setup((o) => o.getDatabaseServers(mockSubscription, mockCredentials)).returns(() => Promise.resolve(mockDatabaseServers));
-
-		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-
-		const children = await databaseServerContainerTreeNode.getChildren();
-
-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
-		mockDatabaseServerService.verify((o) => o.getDatabaseServers(mockSubscription, mockCredentials), 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());
-
-		should(databaseServerContainerTreeNode.isClearingCache).false();
-
-		should(children).Array();
-		should(children.length).equal(mockDatabaseServers.length);
-
-		should(Object.keys(mockDatabaseServerContainerCache.databaseServers)).deepEqual([mockSubscription.id]);
-		should(mockDatabaseServerContainerCache.databaseServers[mockSubscription.id]).deepEqual(mockDatabaseServers);
-
-		for (let ix = 0; ix < mockDatabaseServers.length; ix++) {
-			const child = children[ix];
-			const databaseServer = mockDatabaseServers[ix];
-
-			should(child).instanceof(AzureResourceDatabaseServerTreeNode);
-			should(child.nodePathValue).equal(`databaseServer_${databaseServer.name}`);
-		}
-	});
-
-	it('Should load database servers from cache when it is not clearing cache.', async function(): Promise<void> {
-		mockDatabaseServerService.setup((o) => o.getDatabaseServers(mockSubscription, mockCredentials)).returns(() => Promise.resolve(mockDatabaseServers));
-
-		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-
-		await databaseServerContainerTreeNode.getChildren();
-		const children = await databaseServerContainerTreeNode.getChildren();
-
-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.exactly(1));
-		mockDatabaseServerService.verify((o) => o.getDatabaseServers(mockSubscription, mockCredentials), TypeMoq.Times.exactly(1));
-		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.exactly(2));
-		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.exactly(1));
-
-		should(children.length).equal(mockDatabaseServerContainerCache.databaseServers[mockSubscription.id].length);
-
-		for (let ix = 0; ix < mockDatabaseServerContainerCache.databaseServers[mockSubscription.id].length; ix++) {
-			should(children[ix].nodePathValue).equal(`databaseServer_${mockDatabaseServerContainerCache.databaseServers[mockSubscription.id][ix].name}`);
-		}
-	});
-
-	it('Should handle when there is no database servers.', async function(): Promise<void> {
-		mockDatabaseServerService.setup((o) => o.getDatabaseServers(mockSubscription, mockCredentials)).returns(() => Promise.resolve(undefined));
-
-		const databaseContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-
-		const children = await databaseContainerTreeNode.getChildren();
-
-		should(children).Array();
-		should(children.length).equal(1);
-		should(children[0]).instanceof(AzureResourceMessageTreeNode);
-		should(children[0].nodePathValue).startWith('message_');
-		should(children[0].getNodeInfo().label).equal('No SQL Servers found.');
-	});
-
-	it('Should handle errors.', async function(): Promise<void> {
-		const mockError = 'Test error';
-		mockDatabaseServerService.setup((o) => o.getDatabaseServers(mockSubscription, mockCredentials)).returns(() => { throw new Error(mockError); });
-
-		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-		const children = await databaseServerContainerTreeNode.getChildren();
-
-		mockCredentialService.verify((o) => o.getCredentials(mockAccount, sqlops.AzureResource.ResourceManagement), TypeMoq.Times.once());
-		mockDatabaseServerService.verify((o) => o.getDatabaseServers(mockSubscription, mockCredentials), TypeMoq.Times.once());
-		mockCacheService.verify((o) => o.get(TypeMoq.It.isAnyString()), TypeMoq.Times.never());
-		mockCacheService.verify((o) => o.update(TypeMoq.It.isAnyString(), TypeMoq.It.isAny()), TypeMoq.Times.never());
-
-		should(children).Array();
-		should(children.length).equal(1);
-		should(children[0]).instanceof(AzureResourceMessageTreeNode);
-		should(children[0].nodePathValue).startWith('message_');
-		should(children[0].getNodeInfo().label).equal(`Error: ${mockError}`);
-	});
-});
-
-describe('AzureResourceDatabaseServerContainerTreeNode.clearCache', function() : void {
-	beforeEach(() => {
-		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
-	});
-
-	it('Should clear cache.', async function(): Promise<void> {
-		const databaseServerContainerTreeNode = new AzureResourceDatabaseServerContainerTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
-		databaseServerContainerTreeNode.clearCache();
-		should(databaseServerContainerTreeNode.isClearingCache).true();
-	});
-});

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

@@ -1,62 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 should from 'should';
-import * as TypeMoq from 'typemoq';
-import * as vscode from 'vscode';
-import 'mocha';
-
-import { AzureResourceServicePool } from '../../../azureResource/servicePool';
-import { IAzureResourceContextService } from '../../../azureResource/interfaces';
-import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
-import { AzureResourceDatabaseServer } from '../../../azureResource/models';
-import { AzureResourceItemType } from '../../../azureResource/constants';
-import { AzureResourceDatabaseServerTreeNode } from '../../../azureResource/tree/databaseServerTreeNode';
-
-// Mock services
-const mockServicePool = AzureResourceServicePool.getInstance();
-
-let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
-
-let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
-
-// Mock test data
-const mockDatabaseServer: AzureResourceDatabaseServer = {
-	name: 'mock database 1',
-	fullName: 'mock server 1',
-	loginName: 'mock user 1',
-	defaultDatabaseName: 'master'
-};
-
-describe('AzureResourceDatabaseServerTreeNode.info', function(): void {
-	beforeEach(() => {
-		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
-
-		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
-
-		mockServicePool.contextService = mockContextService.object;
-	});
-
-	it('Should be correct when created.', async function(): Promise<void> {
-		const databaseServerTreeNode = new AzureResourceDatabaseServerTreeNode(mockDatabaseServer, mockTreeChangeHandler.object, undefined);
-
-		const databaseServerTreeNodeLabel = mockDatabaseServer.name;
-
-		should(databaseServerTreeNode.nodePathValue).equal(`databaseServer_${mockDatabaseServer.name}`);
-
-		const treeItem = await databaseServerTreeNode.getTreeItem();
-		should(treeItem.label).equal(databaseServerTreeNodeLabel);
-		should(treeItem.contextValue).equal(AzureResourceItemType.databaseServer);
-		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.None);
-
-		const nodeInfo = databaseServerTreeNode.getNodeInfo();
-		should(nodeInfo.isLeaf).true();
-		should(nodeInfo.label).equal(databaseServerTreeNodeLabel);
-		should(nodeInfo.nodeType).equal(AzureResourceItemType.databaseServer);
-		should(nodeInfo.iconType).equal(AzureResourceItemType.databaseServer);
-	});
-});

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

@@ -1,62 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 should from 'should';
-import * as TypeMoq from 'typemoq';
-import * as vscode from 'vscode';
-import 'mocha';
-
-import { AzureResourceServicePool } from '../../../azureResource/servicePool';
-import { IAzureResourceContextService } from '../../../azureResource/interfaces';
-import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
-import { AzureResourceDatabase } from '../../../azureResource/models';
-import { AzureResourceItemType } from '../../../azureResource/constants';
-import { AzureResourceDatabaseTreeNode } from '../../../azureResource/tree/databaseTreeNode';
-
-// Mock services
-const mockServicePool = AzureResourceServicePool.getInstance();
-
-let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
-
-let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
-
-// Mock test data
-const mockDatabase: AzureResourceDatabase = {
-	name: 'mock database 1',
-	serverName: 'mock server 1',
-	serverFullName: 'mock server 1',
-	loginName: 'mock user 1'
-};
-
-describe('AzureResourceDatabaseTreeNode.info', function(): void {
-	beforeEach(() => {
-		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
-
-		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
-
-		mockServicePool.contextService = mockContextService.object;
-	});
-
-	it('Should be correct.', async function(): Promise<void> {
-		const databaseTreeNode = new AzureResourceDatabaseTreeNode(mockDatabase, mockTreeChangeHandler.object, undefined);
-
-		const databaseTreeNodeLabel = `${mockDatabase.name} (${mockDatabase.serverName})`;
-
-		should(databaseTreeNode.nodePathValue).equal(`database_${mockDatabase.name}`);
-
-		const treeItem = await databaseTreeNode.getTreeItem();
-		should(treeItem.label).equal(databaseTreeNodeLabel);
-		should(treeItem.contextValue).equal(AzureResourceItemType.database);
-		should(treeItem.collapsibleState).equal(vscode.TreeItemCollapsibleState.None);
-
-		const nodeInfo = databaseTreeNode.getNodeInfo();
-		should(nodeInfo.isLeaf).true();
-		should(nodeInfo.label).equal(databaseTreeNodeLabel);
-		should(nodeInfo.nodeType).equal(AzureResourceItemType.database);
-		should(nodeInfo.iconType).equal(AzureResourceItemType.database);
-	});
-});

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

@@ -10,20 +10,24 @@ import * as TypeMoq from 'typemoq';
 import * as sqlops from 'sqlops';
 import * as vscode from 'vscode';
 import 'mocha';
+import { AppContext } from '../../../appContext';
+import { ApiWrapper } from '../../../apiWrapper';
 
-import { AzureResourceServicePool } from '../../../azureResource/servicePool';
-import { IAzureResourceContextService } from '../../../azureResource/interfaces';
+import { azureResource } from '../../../azureResource/azure-resource';
 import { IAzureResourceTreeChangeHandler } from '../../../azureResource/tree/treeChangeHandler';
-import { AzureResourceSubscription } from '../../../azureResource/models';
 import { AzureResourceSubscriptionTreeNode } from '../../../azureResource/tree/subscriptionTreeNode';
-import { AzureResourceDatabaseContainerTreeNode } from '../../../azureResource/tree/databaseContainerTreeNode';
-import { AzureResourceDatabaseServerContainerTreeNode } from '../../../azureResource/tree/databaseServerContainerTreeNode';
-import { AzureResourceItemType } from '../../../azureResource/constants';
+import { AzureResourceItemType, AzureResourceServiceNames } from '../../../azureResource/constants';
+import { AzureResourceService } from '../../../azureResource/resourceService';
+import { AzureResourceResourceTreeNode } from '../../../azureResource/resourceTreeNode';
+import { IAzureResourceCacheService } from '../../../azureResource/interfaces';
+import { generateGuid } from '../../../azureResource/utils';
 
 // Mock services
-const mockServicePool = AzureResourceServicePool.getInstance();
+let mockAppContext: AppContext;
 
-let mockContextService: TypeMoq.IMock<IAzureResourceContextService>;
+let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
+let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
+let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
 
 let mockTreeChangeHandler: TypeMoq.IMock<IAzureResourceTreeChangeHandler>;
 
@@ -42,24 +46,60 @@ const mockAccount: sqlops.Account = {
 	isStale: false
 };
 
-const mockSubscription: AzureResourceSubscription = {
+const mockSubscription: azureResource.AzureResourceSubscription = {
 	id: 'mock_subscription',
 	name: 'mock subscription'
 };
 
+const mockTenantId: string = 'mock_tenant';
+
+let mockResourceTreeDataProvider1: TypeMoq.IMock<azureResource.IAzureResourceTreeDataProvider>;
+let mockResourceProvider1: TypeMoq.IMock<azureResource.IAzureResourceProvider>;
+
+let mockResourceTreeDataProvider2: TypeMoq.IMock<azureResource.IAzureResourceTreeDataProvider>;
+let mockResourceProvider2: TypeMoq.IMock<azureResource.IAzureResourceProvider>;
+
+const resourceService: AzureResourceService = AzureResourceService.getInstance();
+
 describe('AzureResourceSubscriptionTreeNode.info', function(): void {
 	beforeEach(() => {
-		mockContextService = TypeMoq.Mock.ofType<IAzureResourceContextService>();
+		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
+		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
+		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
+
+		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object);
+
+		mockAppContext.registerService<IAzureResourceCacheService>(AzureResourceServiceNames.cacheService, mockCacheService.object);
+
+		mockCacheService.setup((o) => o.generateKey(TypeMoq.It.isAnyString())).returns(() => generateGuid());
 
 		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
 
-		mockServicePool.contextService = mockContextService.object;
+		mockResourceTreeDataProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider1.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider1.setup((o) => o.getTreeItem(TypeMoq.It.isAny())).returns(() => Promise.resolve(TypeMoq.It.isAny()));
+		mockResourceProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider1.setup((o) => o.providerId).returns(() => 'mockResourceProvider1');
+		mockResourceProvider1.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider1.object);
+
+		mockResourceTreeDataProvider2 = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider2.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider2.setup((o) => o.getTreeItem(TypeMoq.It.isAny())).returns(() => Promise.resolve(TypeMoq.It.isAny()));
+		mockResourceProvider2 = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider2.setup((o) => o.providerId).returns(() => 'mockResourceProvider2');
+		mockResourceProvider2.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider2.object);
+
+		resourceService.clearResourceProviders();
+		resourceService.registerResourceProvider(mockResourceProvider1.object);
+		resourceService.registerResourceProvider(mockResourceProvider2.object);
+
+		resourceService.areResourceProvidersLoaded = true;
 	});
 
 	it('Should be correct when created.', async function(): Promise<void> {
-		const subscriptionTreeNode = new AzureResourceSubscriptionTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+		const subscriptionTreeNode = new AzureResourceSubscriptionTreeNode(mockAccount, mockSubscription, mockTenantId, mockAppContext, mockTreeChangeHandler.object, undefined);
 
-		should(subscriptionTreeNode.nodePathValue).equal(`subscription_${mockSubscription.id}`);
+		should(subscriptionTreeNode.nodePathValue).equal(`account_${mockAccount.key.accountId}.subscription_${mockSubscription.id}.tenant_${mockTenantId}`);
 
 		const treeItem = await subscriptionTreeNode.getTreeItem();
 		should(treeItem.label).equal(mockSubscription.name);
@@ -76,16 +116,52 @@ describe('AzureResourceSubscriptionTreeNode.info', function(): void {
 
 describe('AzureResourceSubscriptionTreeNode.getChildren', function(): void {
 	beforeEach(() => {
+		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
+		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
+		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
+
+		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object);
+		mockAppContext.registerService<IAzureResourceCacheService>(AzureResourceServiceNames.cacheService, mockCacheService.object);
+
+		mockCacheService.setup((o) => o.generateKey(TypeMoq.It.isAnyString())).returns(() => generateGuid());
+
 		mockTreeChangeHandler = TypeMoq.Mock.ofType<IAzureResourceTreeChangeHandler>();
+
+		mockResourceTreeDataProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider1.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider1.setup((o) => o.getTreeItem(TypeMoq.It.isAny())).returns(() => Promise.resolve(TypeMoq.It.isAny()));
+		mockResourceProvider1 = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider1.setup((o) => o.providerId).returns(() => 'mockResourceProvider1');
+		mockResourceProvider1.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider1.object);
+
+		mockResourceTreeDataProvider2 = TypeMoq.Mock.ofType<azureResource.IAzureResourceTreeDataProvider>();
+		mockResourceTreeDataProvider2.setup((o) => o.getChildren()).returns(() => Promise.resolve([TypeMoq.Mock.ofType<azureResource.IAzureResourceNode>().object]));
+		mockResourceTreeDataProvider2.setup((o) => o.getTreeItem(TypeMoq.It.isAny())).returns(() => Promise.resolve(TypeMoq.It.isAny()));
+		mockResourceProvider2 = TypeMoq.Mock.ofType<azureResource.IAzureResourceProvider>();
+		mockResourceProvider2.setup((o) => o.providerId).returns(() => 'mockResourceProvider2');
+		mockResourceProvider2.setup((o) => o.getTreeDataProvider()).returns(() => mockResourceTreeDataProvider2.object);
+
+		resourceService.clearResourceProviders();
+		resourceService.registerResourceProvider(mockResourceProvider1.object);
+		resourceService.registerResourceProvider(mockResourceProvider2.object);
+
+		resourceService.areResourceProvidersLoaded = true;
 	});
 
-	it('Should load database containers.', async function(): Promise<void> {
-		const subscriptionTreeNode = new AzureResourceSubscriptionTreeNode(mockSubscription, mockAccount, mockTreeChangeHandler.object, undefined);
+	it('Should return resource containers.', async function(): Promise<void> {
+		const subscriptionTreeNode = new AzureResourceSubscriptionTreeNode(mockAccount, mockSubscription, mockTenantId, mockAppContext, mockTreeChangeHandler.object, undefined);
 		const children = await subscriptionTreeNode.getChildren();
 
+		mockResourceTreeDataProvider1.verify((o) => o.getChildren(), TypeMoq.Times.once());
+
+		mockResourceTreeDataProvider2.verify((o) => o.getChildren(), TypeMoq.Times.once());
+
+		const expectedChildren = await resourceService.listResourceProviderIds();
+
 		should(children).Array();
-		should(children.length).equal(2);
-		should(children[0]).instanceof(AzureResourceDatabaseContainerTreeNode);
-		should(children[1]).instanceof(AzureResourceDatabaseServerContainerTreeNode);
+		should(children.length).equal(expectedChildren.length);
+		for (const child of children) {
+			should(child).instanceOf(AzureResourceResourceTreeNode);
+		}
 	});
 });

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

@@ -5,21 +5,28 @@
 
 'use strict';
 
+import * as vscode from 'vscode';
 import * as should from 'should';
 import * as TypeMoq from 'typemoq';
 import * as sqlops from 'sqlops';
 import 'mocha';
+import { AppContext } from '../../../appContext';
+import { ApiWrapper } from '../../../apiWrapper';
 
-import { AzureResourceServicePool } from '../../../azureResource/servicePool';
-import { IAzureResourceAccountService } from '../../../azureResource/interfaces';
+import { IAzureResourceCacheService, IAzureResourceAccountService } from '../../../azureResource/interfaces';
 import { AzureResourceTreeProvider } from '../../../azureResource/tree/treeProvider';
 import { AzureResourceAccountTreeNode } from '../../../azureResource/tree/accountTreeNode';
 import { AzureResourceAccountNotSignedInTreeNode } from '../../../azureResource/tree/accountNotSignedInTreeNode';
-import { AzureResourceMessageTreeNode } from '../../../azureResource/tree/messageTreeNode';
+import { AzureResourceMessageTreeNode } from '../../../azureResource/messageTreeNode';
+import { AzureResourceServiceNames } from '../../../azureResource/constants';
+import { generateGuid } from '../../../azureResource/utils';
 
 // Mock services
-const mockServicePool = AzureResourceServicePool.getInstance();
+let mockAppContext: AppContext;
 
+let mockExtensionContext: TypeMoq.IMock<vscode.ExtensionContext>;
+let mockApiWrapper: TypeMoq.IMock<ApiWrapper>;
+let mockCacheService: TypeMoq.IMock<IAzureResourceCacheService>;
 let mockAccountService: TypeMoq.IMock<IAzureResourceAccountService>;
 
 // Mock test data
@@ -53,15 +60,23 @@ const mockAccounts = [mockAccount1, mockAccount2];
 
 describe('AzureResourceTreeProvider.getChildren', function(): void {
 	beforeEach(() => {
+		mockExtensionContext = TypeMoq.Mock.ofType<vscode.ExtensionContext>();
+		mockApiWrapper = TypeMoq.Mock.ofType<ApiWrapper>();
+		mockCacheService = TypeMoq.Mock.ofType<IAzureResourceCacheService>();
 		mockAccountService = TypeMoq.Mock.ofType<IAzureResourceAccountService>();
 
-		mockServicePool.accountService = mockAccountService.object;
+		mockAppContext = new AppContext(mockExtensionContext.object, mockApiWrapper.object);
+
+		mockAppContext.registerService<IAzureResourceCacheService>(AzureResourceServiceNames.cacheService, mockCacheService.object);
+		mockAppContext.registerService<IAzureResourceAccountService>(AzureResourceServiceNames.accountService, mockAccountService.object);
+
+		mockCacheService.setup((o) => o.generateKey(TypeMoq.It.isAnyString())).returns(() => generateGuid());
 	});
 
 	it('Should load accounts.', async function(): Promise<void> {
 		mockAccountService.setup((o) => o.getAccounts()).returns(() => Promise.resolve(mockAccounts));
 
-		const treeProvider = new AzureResourceTreeProvider();
+		const treeProvider = new AzureResourceTreeProvider(mockAppContext);
 		treeProvider.isSystemInitialized = true;
 
 		const children = await treeProvider.getChildren(undefined);
@@ -83,7 +98,7 @@ describe('AzureResourceTreeProvider.getChildren', function(): void {
 	it('Should handle when there is no accounts.', async function(): Promise<void> {
 		mockAccountService.setup((o) => o.getAccounts()).returns(() => Promise.resolve(undefined));
 
-		const treeProvider = new AzureResourceTreeProvider();
+		const treeProvider = new AzureResourceTreeProvider(mockAppContext);
 		treeProvider.isSystemInitialized = true;
 
 		const children = await treeProvider.getChildren(undefined);
@@ -97,7 +112,7 @@ describe('AzureResourceTreeProvider.getChildren', function(): void {
 		const mockAccountError = 'Test account error';
 		mockAccountService.setup((o) => o.getAccounts()).returns(() => { throw new Error(mockAccountError); });
 
-		const treeProvider = new AzureResourceTreeProvider();
+		const treeProvider = new AzureResourceTreeProvider(mockAppContext);
 		treeProvider.isSystemInitialized = true;
 
 		const children = await treeProvider.getChildren(undefined);

extensions/azurecore/tsconfig.json

@@ -14,7 +14,7 @@
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
 		"moduleResolution": "node",
-		"declaration": true
+		"declaration": false
 	},
 	"exclude": [
 		"node_modules"

extensions/import/README.md

@@ -1,9 +1,49 @@
 # Microsoft SQL Server Import for Azure Data Studio
 
-Microsoft SQL Server Import for Azure Data Studio is a simple way to copy data from a flat file (.csv, .txt, .json) to a SQL Server table. Checkout below the reasons for using the Import Flat File wizard, how to find this wizard, and a simple example.
+Microsoft SQL Server Import for Azure Data Studio includes two wizards: 
+- [Import Flat File Wizard](#import-flat-file-wizard-preview)
+- [Data-tier Application Wizard.](#data-tier-application-wizard-preview)
+
+## Import Flat File Wizard *(preview)*
+**The Import Flat File Wizard** is a simple way to copy data from a flat file (.csv, .txt, .json) to a SQL Server table. Checkout below the reasons for using the Import Flat File wizard, how to find this wizard, and a simple example.
+
+This experience is currently in its initial preview. Please report issues and feature requests [here.](https://github.com/microsoft/azuredatastudio/issues)
 
 <img src="https://user-images.githubusercontent.com/30873802/43433347-c958ed28-942b-11e8-8bbc-f4f2529c3978.png" width="800px" />
 
+ ### Requirements
+ * This wizard requires an active connection to a SQL Server instance to start.
+ * This wizard only works on .txt and .csv files.
+
+ ## How do I start the Flat File Import wizard?
+ * In Azure Data Studio, press **Ctrl**+**I** to start the wizard.
+
+ ### Why would I use the Import Flat File wizard?
+This wizard was created to improve the current import experience leveraging an intelligent framework known as Program Synthesis using Examples ([PROSE](https://microsoft.github.io/prose/)). For a user without specialized domain knowledge, importing data can often be a complex, error prone, and tedious task. This wizard streamlines the import process as simple as selecting an input file and unique table name, and the PROSE framework handles the rest.
+
+ PROSE analyzes data patterns in your input file to infer column names, types, delimiters, and more. This framework learns the structure of the file and does all of the hard work so users don't have to.
+
+ Please note that the PROSE binary components used by this extension are licensed under the [MICROSOFT SQL TOOLS IMPORT FLAT FILE  EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx).
+ 
+## Data-tier Application Wizard *(preview)*
+**The Data-tier Application Wizard** provides an easy to use experience to deploy and extract .dacpac files and import and export .bacpac files. 
+
+This experience is currently in its initial preview. Please report issues and feature requests [here.](https://github.com/microsoft/azuredatastudio/issues)
+
+<img src="https://user-images.githubusercontent.com/30873802/49676289-f2df6880-fa2d-11e8-8bfa-6213b7734075.png" width="800px" />
+
+ ### Requirements
+ * This wizard requires an active connection to a SQL Server instance to start.
+
+ ### How do I start the Data-tier Application wizard?
+ * The main entry point for the wizard is to right click a database in the Object Explorer, and click **Data-tier Application wizard**.
+ * If a user is connected to a SQL Server instance, the user can also start the wizard from the command palette (Ctrl+Shift+P) by searching for **Data-tier Application wizard.**
+
+ ### Why would I use the Data-tier Application wizard?
+ This wizard was created to add the ability to extract and deploy .dacpac files and import and export .bacpac files in Azure Data Studio.
+ 
+To learn more about Data-Tier Applications and working with dacpac and bacpac files, [you can read more here.](https://docs.microsoft.com/en-us/sql/relational-databases/data-tier-applications/data-tier-applications?view=sql-server-2017)
+
 ## License
 
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -12,21 +52,6 @@ Licensed under the [MICROSOFT SQL SERVER IMPORT EXTENSION EULA](https://raw.gith
 
 > Note: Microsoft SQL Server Import for Azure Data Studio extension contains the Microsoft SQL Tools Import Flat File component which is also licensed under the above EULA.
 
- ## Requirements
- * This wizard requires an active connection to a SQL Server instance to start.
- * This wizard only works on .txt and .csv files.
-
- ## How do I start the Flat File Import wizard?
- * The main entry point for the wizard is to right click a database in the Object Explorer, and click **Import wizard**.
- * If a user is connected to a SQL Server instance, the user can also press **Ctrl**+**I** to start the wizard.
-
- ## Why would I use the Flat File Import wizard?
- This wizard was created to improve the current import experience leveraging an intelligent framework known as Program Synthesis using Examples ([PROSE](https://microsoft.github.io/prose/)). For a user without specialized domain knowledge, importing data can often be a complex, error prone, and tedious task. This wizard streamlines the import process as simple as selecting an input file and unique table name, and the PROSE framework handles the rest.
-
- PROSE analyzes data patterns in your input file to infer column names, types, delimiters, and more. This framework learns the structure of the file and does all of the hard work so users don't have to.
-
- Please note that the PROSE binary components used by this extension are licensed under the [MICROSOFT SQL TOOLS IMPORT FLAT FILE  EULA](https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx).
-
 ## Code of Conduct
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

extensions/import/package.json

@@ -67,7 +67,7 @@
     }
   },
   "dependencies": {
-    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.10",
+    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.2.15",
     "opener": "^1.4.3",
     "service-downloader": "github:anthonydresser/service-downloader#0.1.5",
     "vscode-extension-telemetry": "0.0.18",

extensions/import/src/wizard/api/models.ts

@@ -45,4 +45,6 @@ export interface DacFxDataModel extends BaseDataModel {
 	filePath: string;
 	version: string;
 	upgradeExisting: boolean;
+	scriptFilePath: string;
+	generateScriptAndDeploy: boolean;
 }

extensions/import/src/wizard/dataTierApplicationWizard.ts

@@ -8,6 +8,8 @@ import * as nls from 'vscode-nls';
 import * as sqlops from 'sqlops';
 import { SelectOperationPage } from './pages/selectOperationpage';
 import { DeployConfigPage } from './pages/deployConfigPage';
+import { DeployPlanPage } from './pages/deployPlanPage';
+import { DeployActionPage } from './pages/deployActionPage';
 import { DacFxSummaryPage } from './pages/dacFxSummaryPage';
 import { ExportConfigPage } from './pages/exportConfigPage';
 import { ExtractConfigPage } from './pages/extractConfigPage';
@@ -30,7 +32,40 @@ export enum Operation {
 	deploy,
 	extract,
 	import,
-	export
+	export,
+	generateDeployScript
+}
+
+export enum DeployOperationPath {
+	selectOperation,
+	deployOptions,
+	deployPlan,
+	deployAction,
+	summary
+}
+
+export enum DeployNewOperationPath {
+	selectOperation,
+	deployOptions,
+	summary
+}
+
+export enum ExtractOperationPath {
+	selectOperation,
+	options,
+	summary
+}
+
+export enum ImportOperationPath {
+	selectOperation,
+	options,
+	summary
+}
+
+export enum ExportOperationPath {
+	selectOperation,
+	options,
+	summary
 }
 
 export class DataTierApplicationWizard {
@@ -60,6 +95,8 @@ export class DataTierApplicationWizard {
 		this.wizard = sqlops.window.modelviewdialog.createWizard('Data-tier Application Wizard');
 		let selectOperationWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.selectOperationPageName', 'Select an Operation'));
 		let deployConfigWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.deployConfigPageName', 'Select Deploy Dacpac Settings'));
+		let deployPlanWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.deployPlanPage', 'Review the deploy plan'));
+		let deployActionWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.deployActionPageName', 'Select Action'));
 		let summaryWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.summaryPageName', 'Summary'));
 		let extractConfigWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.extractConfigPageName', 'Select Extract Dacpac Settings'));
 		let importConfigWizardPage = sqlops.window.modelviewdialog.createWizardPage(localize('dacFx.importConfigPageName', 'Select Import Bacpac Settings'));
@@ -67,6 +104,8 @@ export class DataTierApplicationWizard {
 
 		this.pages.set('selectOperation', new Page(selectOperationWizardPage));
 		this.pages.set('deployConfig', new Page(deployConfigWizardPage));
+		this.pages.set('deployPlan', new Page(deployPlanWizardPage));
+		this.pages.set('deployAction', new Page(deployActionWizardPage));
 		this.pages.set('extractConfig', new Page(extractConfigWizardPage));
 		this.pages.set('importConfig', new Page(importConfigWizardPage));
 		this.pages.set('exportConfig', new Page(exportConfigWizardPage));
@@ -87,6 +126,18 @@ export class DataTierApplicationWizard {
 			await deployConfigDacFxPage.start();
 		});
 
+		deployPlanWizardPage.registerContent(async (view) => {
+			let deployPlanDacFxPage = new DeployPlanPage(this, deployPlanWizardPage, this.model, view);
+			this.pages.get('deployPlan').dacFxPage = deployPlanDacFxPage;
+			await deployPlanDacFxPage.start();
+		});
+
+		deployActionWizardPage.registerContent(async (view) => {
+			let deployActionDacFxPage = new DeployActionPage(this, deployActionWizardPage, this.model, view);
+			this.pages.get('deployAction').dacFxPage = deployActionDacFxPage;
+			await deployActionDacFxPage.start();
+		});
+
 		extractConfigWizardPage.registerContent(async (view) => {
 			let extractConfigDacFxPage = new ExtractConfigPage(this, extractConfigWizardPage, this.model, view);
 			this.pages.get('extractConfig').dacFxPage = extractConfigDacFxPage;
@@ -113,39 +164,27 @@ export class DataTierApplicationWizard {
 
 		this.wizard.onPageChanged(async (event) => {
 			let idx = event.newPage;
-			let page: Page;
-
-			if (idx === 1) {
-				switch (this.selectedOperation) {
-					case Operation.deploy: {
-						page = this.pages.get('deployConfig');
-						break;
-					}
-					case Operation.extract: {
-						page = this.pages.get('extractConfig');
-						break;
-					}
-					case Operation.import: {
-						page = this.pages.get('importConfig');
-						break;
-					}
-					case Operation.export: {
-						page = this.pages.get('exportConfig');
-						break;
-					}
-				}
-			} else if (idx === 2) {
-				page = this.pages.get('summary');
-			}
+			let page = this.getPage(idx);
 
 			if (page !== undefined) {
 				page.dacFxPage.setupNavigationValidator();
 				page.dacFxPage.onPageEnter();
 			}
+
+			//do onPageLeave for summary page so that GenerateScript button only shows up if upgrading database
+			let idxLast = event.lastPage;
+
+			if (this.isSummaryPage(idxLast)) {
+				let lastPage = this.pages.get('summary');
+				if (lastPage) {
+					lastPage.dacFxPage.onPageLeave();
+				}
+			}
 		});
 
-		this.wizard.pages = [selectOperationWizardPage, deployConfigWizardPage, summaryWizardPage];
+		this.wizard.pages = [selectOperationWizardPage, deployConfigWizardPage, deployPlanWizardPage, deployActionWizardPage, summaryWizardPage];
 		this.wizard.generateScriptButton.hidden = true;
+		this.wizard.generateScriptButton.onClick(async () => await this.generateDeployScript());
 		this.wizard.doneButton.onClick(async () => await this.executeOperation());
 
 		this.wizard.open();
@@ -177,6 +216,15 @@ export class DataTierApplicationWizard {
 				this.selectedOperation = Operation.export;
 				break;
 			}
+			case Operation.generateDeployScript: {
+				this.wizard.doneButton.label = localize('dacFx.generateScriptButton', 'Generate Script');
+				this.selectedOperation = Operation.generateDeployScript;
+				break;
+			}
+		}
+
+		if (operation !== Operation.deploy && operation !== Operation.generateDeployScript) {
+			this.model.upgradeExisting = false;
 		}
 	}
 
@@ -198,11 +246,15 @@ export class DataTierApplicationWizard {
 				await this.export();
 				break;
 			}
+			case Operation.generateDeployScript: {
+				await this.generateDeployScript();
+				break;
+			}
 		}
 	}
 
 	private async deploy() {
-		let service = await DataTierApplicationWizard.getService();
+		let service = await DataTierApplicationWizard.getService(this.model.server.providerName);
 		let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId);
 
 		let result = await service.deployDacpac(this.model.filePath, this.model.database, this.model.upgradeExisting, ownerUri, sqlops.TaskExecutionMode.execute);
@@ -213,7 +265,7 @@ export class DataTierApplicationWizard {
 	}
 
 	private async extract() {
-		let service = await DataTierApplicationWizard.getService();
+		let service = await DataTierApplicationWizard.getService(this.model.server.providerName);
 		let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId);
 
 		let result = await service.extractDacpac(this.model.database, this.model.filePath, this.model.database, this.model.version, ownerUri, sqlops.TaskExecutionMode.execute);
@@ -224,7 +276,7 @@ export class DataTierApplicationWizard {
 	}
 
 	private async export() {
-		let service = await DataTierApplicationWizard.getService();
+		let service = await DataTierApplicationWizard.getService(this.model.server.providerName);
 		let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId);
 
 		let result = await service.exportBacpac(this.model.database, this.model.filePath, ownerUri, sqlops.TaskExecutionMode.execute);
@@ -235,7 +287,7 @@ export class DataTierApplicationWizard {
 	}
 
 	private async import() {
-		let service = await DataTierApplicationWizard.getService();
+		let service = await DataTierApplicationWizard.getService(this.model.server.providerName);
 		let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId);
 
 		let result = await service.importBacpac(this.model.filePath, this.model.database, ownerUri, sqlops.TaskExecutionMode.execute);
@@ -245,9 +297,83 @@ export class DataTierApplicationWizard {
 		}
 	}
 
-	public static async getService(): Promise<sqlops.DacFxServicesProvider> {
-		let currentConnection = await sqlops.connection.getCurrentConnection();
-		let service = sqlops.dataprotocol.getProvider<sqlops.DacFxServicesProvider>(currentConnection.providerName, sqlops.DataProviderType.DacFxServicesProvider);
+	private async generateDeployScript() {
+		if (!this.model.scriptFilePath) {
+			return;
+		}
+
+		let service = await DataTierApplicationWizard.getService(this.model.server.providerName);
+		let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId);
+		this.wizard.message = {
+			text: localize('dacfx.scriptGeneratingMessage', 'You can view the status of script generation in the Task History once the wizard is closed'),
+			level: sqlops.window.modelviewdialog.MessageLevel.Information,
+			description: ''
+		};
+
+		let result = await service.generateDeployScript(this.model.filePath, this.model.database, this.model.scriptFilePath, ownerUri, sqlops.TaskExecutionMode.execute);
+		if (!result || !result.success) {
+			vscode.window.showErrorMessage(
+				localize('alertData.deployErrorMessage', "Deploy failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
+		}
+	}
+
+	private getPage(idx: number): Page {
+		let page: Page;
+
+		if (idx === 1) {
+			switch (this.selectedOperation) {
+				case Operation.deploy: {
+					page = this.pages.get('deployConfig');
+					break;
+				}
+				case Operation.extract: {
+					page = this.pages.get('extractConfig');
+					break;
+				}
+				case Operation.import: {
+					page = this.pages.get('importConfig');
+					break;
+				}
+				case Operation.export: {
+					page = this.pages.get('exportConfig');
+					break;
+				}
+			}
+		} else if (this.isSummaryPage(idx)) {
+			page = this.pages.get('summary');
+		} else if ((this.selectedOperation === Operation.deploy || this.selectedOperation === Operation.generateDeployScript) && idx === DeployOperationPath.deployPlan) {
+			page = this.pages.get('deployPlan');
+		} else if ((this.selectedOperation === Operation.deploy || this.selectedOperation === Operation.generateDeployScript) && idx === DeployOperationPath.deployAction) {
+			page = this.pages.get('deployAction');
+		}
+
+		return page;
+	}
+
+	private isSummaryPage(idx: number): boolean {
+		return this.selectedOperation === Operation.import && idx === ImportOperationPath.summary
+			|| this.selectedOperation === Operation.export && idx === ExportOperationPath.summary
+			|| this.selectedOperation === Operation.extract && idx === ExtractOperationPath.summary
+			|| this.selectedOperation === Operation.deploy && !this.model.upgradeExisting && idx === DeployNewOperationPath.summary
+			|| (this.selectedOperation === Operation.deploy || this.selectedOperation === Operation.generateDeployScript) && idx === DeployOperationPath.summary;
+	}
+
+	public async generateDeployPlan(): Promise<string> {
+		let service = await DataTierApplicationWizard.getService(this.model.server.providerName);
+		let ownerUri = await sqlops.connection.getUriForConnection(this.model.server.connectionId);
+
+		let result = await service.generateDeployPlan(this.model.filePath, this.model.database, ownerUri, sqlops.TaskExecutionMode.execute);
+
+		if (!result || !result.success) {
+			vscode.window.showErrorMessage(
+				localize('alertData.deployPlanErrorMessage', "Generating deploy plan failed '{0}'", result.errorMessage ? result.errorMessage : 'Unknown'));
+		}
+
+		return result.report;
+	}
+
+	private static async getService(providerName: string): Promise<sqlops.DacFxServicesProvider> {
+		let service = sqlops.dataprotocol.getProvider<sqlops.DacFxServicesProvider>(providerName, sqlops.DataProviderType.DacFxServicesProvider);
 		return service;
 	}
 }

extensions/import/src/wizard/pages/dacFxSummaryPage.ts

@@ -49,6 +49,14 @@ export class DacFxSummaryPage extends BasePage {
 	async onPageEnter(): Promise<boolean> {
 		this.populateTable();
 		this.loader.loading = false;
+		if (this.model.upgradeExisting && this.model.generateScriptAndDeploy) {
+			this.instance.wizard.generateScriptButton.hidden = false;
+		}
+		return true;
+	}
+
+	async onPageLeave(): Promise<boolean> {
+		this.instance.wizard.generateScriptButton.hidden = true;
 		return true;
 	}
 
@@ -68,6 +76,10 @@ export class DacFxSummaryPage extends BasePage {
 		let sourceServer = localize('dacfx.sourceServerName', 'Source Server');
 		let sourceDatabase = localize('dacfx.sourceDatabaseName', 'Source Database');
 		let fileLocation = localize('dacfx.fileLocation', 'File Location');
+		let scriptLocation = localize('dacfx.scriptLocation', 'Deployment Script Location');
+		let action = localize('dacfx.action', 'Action');
+		let deploy = localize('dacfx.deploy', 'Deploy');
+		let generateScript = localize('dacfx.generateScript', 'Generate Deployment Script');
 
 		switch (this.instance.selectedOperation) {
 			case Operation.deploy: {
@@ -75,6 +87,13 @@ export class DacFxSummaryPage extends BasePage {
 					[targetServer, this.model.serverName],
 					[fileLocation, this.model.filePath],
 					[targetDatabase, this.model.database]];
+				if (this.model.generateScriptAndDeploy) {
+					data[3] = [scriptLocation, this.model.scriptFilePath];
+					data[4] = [action, generateScript + ', ' + deploy];
+				}
+				else {
+					data[3] = [action, deploy];
+				}
 				break;
 			}
 			case Operation.extract: {
@@ -99,12 +118,29 @@ export class DacFxSummaryPage extends BasePage {
 					[fileLocation, this.model.filePath]];
 				break;
 			}
+			case Operation.generateDeployScript: {
+				data = [
+					[targetServer, this.model.serverName],
+					[fileLocation, this.model.filePath],
+					[targetDatabase, this.model.database],
+					[scriptLocation, this.model.scriptFilePath],
+					[action, generateScript]];
+				break;
+			}
 		}
 
 		this.table.updateProperties({
 			data: data,
-			columns: ['Setting', 'Value'],
-			width: 600,
+			columns: [
+				{
+					value: localize('dacfx.settingColumn', 'Setting'),
+					cssClass: 'align-with-header'
+				},
+				{
+					value: localize('dacfx.valueColumn', 'Value'),
+					cssClass: 'align-with-header'
+				}],
+			width: 700,
 			height: 200
 		});
 	}

extensions/import/src/wizard/pages/deployActionPage.ts

@@ -0,0 +1,181 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 sqlops from 'sqlops';
+import * as nls from 'vscode-nls';
+import * as vscode from 'vscode';
+import * as path from 'path';
+import * as os from 'os';
+import { DacFxDataModel } from '../api/models';
+import { DataTierApplicationWizard, Operation } from '../dataTierApplicationWizard';
+import { DacFxConfigPage } from '../api/dacFxConfigPage';
+
+const localize = nls.loadMessageBundle();
+
+export class DeployActionPage extends DacFxConfigPage {
+
+	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
+	protected readonly instance: DataTierApplicationWizard;
+	protected readonly model: DacFxDataModel;
+	protected readonly view: sqlops.ModelView;
+	private deployRadioButton: sqlops.RadioButtonComponent;
+	private deployScriptRadioButton: sqlops.RadioButtonComponent;
+	private scriptRadioButton: sqlops.RadioButtonComponent;
+	private form: sqlops.FormContainer;
+
+	public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) {
+		super(instance, wizardPage, model, view);
+	}
+
+	async start(): Promise<boolean> {
+		let deployComponent = await this.createDeployRadioButton();
+		let deployScriptComponent = await this.createDeployScriptRadioButton();
+		let scriptComponent = await this.createScriptRadioButton();
+		let fileBrowserComponent = await this.createFileBrowser();
+
+		this.form = this.view.modelBuilder.formContainer()
+			.withFormItems(
+				[
+					deployComponent,
+					scriptComponent,
+					deployScriptComponent,
+					fileBrowserComponent
+				]).component();
+		await this.view.initializeModel(this.form);
+
+		//default have the first radio button checked
+		this.deployRadioButton.checked = true;
+		this.toggleFileBrowser(false);
+
+		return true;
+	}
+
+	async onPageEnter(): Promise<boolean> {
+		// generate script file path in case the database changed since last time the page was entered
+		this.setDefaultScriptFilePath();
+		return true;
+	}
+
+	private async createDeployRadioButton(): Promise<sqlops.FormComponent> {
+		this.deployRadioButton = this.view.modelBuilder.radioButton()
+			.withProperties({
+				name: 'selectedDeployAction',
+				label: localize('dacFx.deployRadioButtonLabel', 'Deploy'),
+			}).component();
+
+		this.deployRadioButton.onDidClick(() => {
+			this.model.generateScriptAndDeploy = false;
+			this.instance.setDoneButton(Operation.deploy);
+			this.toggleFileBrowser(false);
+		});
+
+		return {
+			component: this.deployRadioButton,
+			title: ''
+		};
+	}
+
+	private async createDeployScriptRadioButton(): Promise<sqlops.FormComponent> {
+		this.deployScriptRadioButton = this.view.modelBuilder.radioButton()
+			.withProperties({
+				name: 'selectedDeployAction',
+				label: localize('dacFx.deployScriptRadioButtonLabel', 'Generate Deployment Script and Deploy'),
+			}).component();
+
+		this.deployScriptRadioButton.onDidClick(() => {
+			this.model.generateScriptAndDeploy = true;
+			this.instance.setDoneButton(Operation.deploy);
+			this.toggleFileBrowser(true);
+		});
+
+		return {
+			component: this.deployScriptRadioButton,
+			title: ''
+		};
+	}
+
+	private async createScriptRadioButton(): Promise<sqlops.FormComponent> {
+		this.scriptRadioButton = this.view.modelBuilder.radioButton()
+			.withProperties({
+				name: 'selectedDeployAction',
+				label: localize('dacFx.scriptRadioButtonLabel', 'Generate Deployment Script'),
+			}).component();
+
+		this.scriptRadioButton.onDidClick(() => {
+			this.model.generateScriptAndDeploy = false;
+			this.toggleFileBrowser(true);
+
+			//change button text and operation
+			this.instance.setDoneButton(Operation.generateDeployScript);
+		});
+
+		return {
+			component: this.scriptRadioButton,
+			title: ''
+		};
+	}
+
+	private async createFileBrowser(): Promise<sqlops.FormComponentGroup> {
+		this.createFileBrowserParts();
+
+		//default filepath
+		this.setDefaultScriptFilePath();
+		this.fileButton.onDidClick(async (click) => {
+			let fileUri = await vscode.window.showSaveDialog(
+				{
+					defaultUri: vscode.Uri.file(this.fileTextBox.value),
+					saveLabel: localize('dacfxDeployScript.saveFile', 'Save'),
+					filters: {
+						'SQL Files': ['sql'],
+					}
+				}
+			);
+
+			if (!fileUri) {
+				return;
+			}
+
+			this.fileTextBox.value = fileUri.fsPath;
+			this.model.scriptFilePath = fileUri.fsPath;
+		});
+
+		this.fileTextBox.onTextChanged(async () => {
+			this.model.scriptFilePath = this.fileTextBox.value;
+		});
+
+		return {
+			title: '',
+			components: [
+				{
+					title: localize('dacfx.generatedScriptLocation', 'Deployment Script Location'),
+					component: this.fileTextBox,
+					layout: {
+						horizontal: true,
+						componentWidth: 400
+					},
+					actions: [this.fileButton]
+				},],
+		};
+	}
+
+	private toggleFileBrowser(enable: boolean): void {
+		this.fileTextBox.enabled = enable;
+		this.fileButton.enabled = enable;
+	}
+
+	private setDefaultScriptFilePath(): void {
+		let now = new Date();
+		let datetime = now.getFullYear() + '-' + (now.getMonth() + 1) + '-' + now.getDate() + '-' + now.getHours() + '-' + now.getMinutes();
+		this.fileTextBox.value = path.join(os.homedir(), this.model.database + '_UpgradeDACScript_' + datetime + '.sql');
+		this.model.scriptFilePath = this.fileTextBox.value;
+	}
+
+	public setupNavigationValidator() {
+		this.instance.registerNavigationValidator(() => {
+			return true;
+		});
+	}
+}

extensions/import/src/wizard/pages/deployConfigPage.ts

@@ -10,7 +10,7 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 import * as os from 'os';
 import { DacFxDataModel } from '../api/models';
-import { DataTierApplicationWizard } from '../dataTierApplicationWizard';
+import { DataTierApplicationWizard, DeployOperationPath, Operation } from '../dataTierApplicationWizard';
 import { DacFxConfigPage } from '../api/dacFxConfigPage';
 
 const localize = nls.loadMessageBundle();
@@ -32,7 +32,7 @@ export class DeployConfigPage extends DacFxConfigPage {
 	}
 
 	async start(): Promise<boolean> {
-				let serverComponent = await this.createServerDropdown(true);
+		let serverComponent = await this.createServerDropdown(true);
 		let fileBrowserComponent = await this.createFileBrowser();
 		this.databaseComponent = await this.createDatabaseTextBox();
 		this.databaseComponent.title = localize('dacFx.databaseNameTextBox', 'Database Name');
@@ -122,6 +122,12 @@ export class DeployConfigPage extends DacFxConfigPage {
 			this.formBuilder.removeFormItem(this.databaseComponent);
 			this.formBuilder.addFormItem(this.databaseDropdownComponent, { horizontal: true, componentWidth: 400 });
 			this.model.database = (<sqlops.CategoryValue>this.databaseDropdown.value).name;
+
+			// add deploy plan and generate script pages
+			let deployPlanPage = this.instance.pages.get('deployPlan');
+			this.instance.wizard.addPage(deployPlanPage.wizardPage, DeployOperationPath.deployPlan);
+			let deployActionPage = this.instance.pages.get('deployAction');
+			this.instance.wizard.addPage(deployActionPage.wizardPage, DeployOperationPath.deployAction);
 		});
 
 		newRadioButton.onDidClick(() => {
@@ -129,9 +135,14 @@ export class DeployConfigPage extends DacFxConfigPage {
 			this.formBuilder.removeFormItem(this.databaseDropdownComponent);
 			this.formBuilder.addFormItem(this.databaseComponent, { horizontal: true, componentWidth: 400 });
 			this.model.database = this.databaseTextBox.value;
+			this.instance.setDoneButton(Operation.deploy);
+
+			// remove deploy plan and generate script pages
+			this.instance.wizard.removePage(DeployOperationPath.deployAction);
+			this.instance.wizard.removePage(DeployOperationPath.deployPlan);
 		});
 
-		// Initialize with upgrade existing true
+		//Initialize with upgrade existing true
 		upgradeRadioButton.checked = true;
 		this.model.upgradeExisting = true;
 
@@ -149,10 +160,10 @@ export class DeployConfigPage extends DacFxConfigPage {
 	}
 
 	protected async createDeployDatabaseDropdown(): Promise<sqlops.FormComponent> {
-			this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({
+		this.databaseDropdown = this.view.modelBuilder.dropDown().withProperties({
 			required: true
 		}).component();
-		// Handle database changes
+		//Handle database changes
 		this.databaseDropdown.onValueChanged(async () => {
 			this.model.database = (<sqlops.CategoryValue>this.databaseDropdown.value).name;
 		});
@@ -172,7 +183,8 @@ export class DeployConfigPage extends DacFxConfigPage {
 		}
 		let values = await this.getDatabaseValues();
 
-		if (this.model.database === undefined) {
+		//set the database to the first dropdown value if upgrading, otherwise it should get set to the textbox value
+		if (this.model.upgradeExisting) {
 			this.model.database = values[0].name;
 		}
 

extensions/import/src/wizard/pages/deployPlanPage.ts

@@ -0,0 +1,296 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 sqlops from 'sqlops';
+import * as nls from 'vscode-nls';
+import * as parser from 'htmlparser2';
+import { DacFxDataModel } from '../api/models';
+import { DataTierApplicationWizard } from '../dataTierApplicationWizard';
+import { DacFxConfigPage } from '../api/dacFxConfigPage';
+
+const localize = nls.loadMessageBundle();
+
+export enum deployPlanXml {
+	AlertElement = 'Alert',
+	OperationElement = 'Operation',
+	ItemElement = 'Item',
+	NameAttribute = 'Name',
+	ValueAttribute = 'Value',
+	TypeAttribute = 'Type',
+	IdAttribute = 'Id',
+	DataIssueAttribute = 'DataIssue'
+}
+
+export class TableObject {
+	operation: string;
+	object: string;
+	type: string;
+	dataloss: boolean;
+}
+
+export class DeployPlanResult {
+	columnData: Array<Array<string>>;
+	dataLossAlerts: Set<string>;
+}
+
+export class DeployPlanPage extends DacFxConfigPage {
+	protected readonly wizardPage: sqlops.window.modelviewdialog.WizardPage;
+	protected readonly instance: DataTierApplicationWizard;
+	protected readonly model: DacFxDataModel;
+	protected readonly view: sqlops.ModelView;
+	private formBuilder: sqlops.FormBuilder;
+	private form: sqlops.FormContainer;
+	private table: sqlops.TableComponent;
+	private loader: sqlops.LoadingComponent;
+	private dataLossCheckbox: sqlops.CheckBoxComponent;
+	private dataLossText: sqlops.TextComponent;
+	private dataLossComponentGroup: sqlops.FormComponentGroup;
+	private noDataLossTextComponent: sqlops.FormComponent;
+
+	public constructor(instance: DataTierApplicationWizard, wizardPage: sqlops.window.modelviewdialog.WizardPage, model: DacFxDataModel, view: sqlops.ModelView) {
+		super(instance, wizardPage, model, view);
+	}
+
+	async start(): Promise<boolean> {
+		this.table = this.view.modelBuilder.table().component();
+		this.loader = this.view.modelBuilder.loadingComponent().withItem(this.table).component();
+		this.dataLossComponentGroup = await this.createDataLossComponents();
+		this.noDataLossTextComponent = await this.createNoDataLossText();
+
+		this.formBuilder = this.view.modelBuilder.formContainer()
+			.withFormItems(
+				[
+					{
+						component: this.loader,
+						title: ''
+					},
+					this.dataLossComponentGroup
+				], {
+					horizontal: true,
+				});
+		this.form = this.formBuilder.component();
+		await this.view.initializeModel(this.form);
+
+		return true;
+	}
+
+	async onPageEnter(): Promise<boolean> {
+		// reset checkbox settings
+		this.formBuilder.addFormItem(this.dataLossComponentGroup, { horizontal: true, componentWidth: 400 });
+		this.dataLossCheckbox.checked = false;
+		this.dataLossCheckbox.enabled = false;
+		this.formBuilder.removeFormItem(this.noDataLossTextComponent);
+
+		this.loader.loading = true;
+		this.table.data = [];
+		await this.populateTable();
+		this.loader.loading = false;
+		return true;
+	}
+
+	private async populateTable() {
+		let report = await this.instance.generateDeployPlan();
+		let result = this.parseXml(report);
+
+		this.table.updateProperties({
+			data: this.getColumnData(result),
+			columns: this.getTableColumns(result.dataLossAlerts.size > 0),
+			width: 875,
+			height: 300
+		});
+
+		if (result.dataLossAlerts.size > 0) {
+			// update message to list how many operations could result in data loss
+			this.dataLossText.updateProperties({
+				value: localize('dacfx.dataLossTextWithCount', '{0} of the deploy actions listed may result in data loss. Please ensure you have a backup or snapshot available in the event of an issue with the deployment.', result.dataLossAlerts.size)
+			});
+			this.dataLossCheckbox.enabled = true;
+		} else {
+			// check checkbox to enable Next button and remove checkbox because there won't be any possible data loss
+			this.dataLossCheckbox.checked = true;
+			this.formBuilder.removeFormItem(this.dataLossComponentGroup);
+			this.formBuilder.addFormItem(this.noDataLossTextComponent, { componentWidth: 300, horizontal: true });
+		}
+	}
+
+	private async createDataLossCheckbox(): Promise<sqlops.FormComponent> {
+		this.dataLossCheckbox = this.view.modelBuilder.checkBox()
+			.withValidation(component => component.checked === true)
+			.withProperties({
+				label: localize('dacFx.dataLossCheckbox', 'Proceed despite possible data loss'),
+			}).component();
+
+		return {
+			component: this.dataLossCheckbox,
+			title: '',
+			required: true
+		};
+	}
+
+	private async createNoDataLossText(): Promise<sqlops.FormComponent> {
+		let noDataLossText = this.view.modelBuilder.text()
+			.withProperties({
+				value: localize('dacfx.noDataLossText', 'No data loss will occur from the listed deploy actions.')
+			}).component();
+
+		return {
+			title: '',
+			component: noDataLossText
+		};
+	}
+
+	private async createDataLossComponents(): Promise<sqlops.FormComponentGroup> {
+		let dataLossComponent = await this.createDataLossCheckbox();
+		this.dataLossText = this.view.modelBuilder.text()
+			.withProperties({
+				value: localize('dacfx.dataLossText', 'The deploy actions may result in data loss. Please ensure you have a backup or snapshot available in the event of an issue with the deployment.')
+			}).component();
+
+		return {
+			title: '',
+			components: [
+				{
+					component: this.dataLossText,
+					layout: {
+						componentWidth: 400,
+						horizontal: true
+					},
+					title: ''
+				},
+				dataLossComponent
+			]
+		};
+	}
+
+	private getColumnData(result: DeployPlanResult): Array<Array<string>> {
+		// remove data loss column data if there aren't any alerts
+		let columnData = result.columnData;
+		if (result.dataLossAlerts.size === 0) {
+			columnData.forEach(entry => {
+				entry.shift();
+			});
+		}
+		return columnData;
+	}
+
+	private getTableColumns(dataloss: boolean): sqlops.TableColumn[] {
+		let columns: sqlops.TableColumn[] = [
+			{
+				value: localize('dacfx.operationColumn', 'Operation'),
+				width: 75,
+				cssClass: 'align-with-header',
+				toolTip: localize('dacfx.operationTooltip', 'Operation(Create, Alter, Delete) that will occur during deployment')
+			},
+			{
+				value: localize('dacfx.typeColumn', 'Type'),
+				width: 100,
+				cssClass: 'align-with-header',
+				toolTip: localize('dacfx.typeTooltip', 'Type of object that will be affected by deployment')
+			},
+			{
+				value: localize('dacfx.objectColumn', 'Object'),
+				width: 300,
+				cssClass: 'align-with-header',
+				toolTip: localize('dacfx.objecTooltip', 'Name of object that will be affected by deployment')
+			}];
+
+		if (dataloss) {
+			columns.unshift(
+				{
+					value: localize('dacfx.dataLossColumn', 'Data Loss'),
+					width: 50,
+					cssClass: 'center-align',
+					toolTip: localize('dacfx.dataLossTooltip', 'Operations that may result in data loss are marked with a warning sign')
+				});
+		}
+		return columns;
+	}
+
+	private parseXml(report: string): DeployPlanResult {
+		let operations = new Array<TableObject>();
+		let dataLossAlerts = new Set<string>();
+
+		let currentOperation = '';
+		let dataIssueAlert = false;
+		let currentReportSection: deployPlanXml;
+		let currentTableObj: TableObject;
+		let p = new parser.Parser({
+			onopentagname(name) {
+				if (name === deployPlanXml.AlertElement) {
+					currentReportSection = deployPlanXml.AlertElement;
+				} else if (name === deployPlanXml.OperationElement) {
+					currentReportSection = deployPlanXml.OperationElement;
+				} else if (name === deployPlanXml.ItemElement) {
+					currentTableObj = new TableObject();
+				}
+			},
+			onattribute: function (name, value) {
+				if (currentReportSection === deployPlanXml.AlertElement) {
+					switch (name) {
+						case deployPlanXml.NameAttribute: {
+							// only care about showing data loss alerts
+							if (value === deployPlanXml.DataIssueAttribute) {
+								dataIssueAlert = true;
+							}
+							break;
+						}
+						case deployPlanXml.IdAttribute: {
+							if (dataIssueAlert) {
+								dataLossAlerts.add(value);
+							}
+							break;
+						}
+					}
+				} else if (currentReportSection === deployPlanXml.OperationElement) {
+					switch (name) {
+						case deployPlanXml.NameAttribute: {
+							currentOperation = value;
+							break;
+						}
+						case deployPlanXml.ValueAttribute: {
+							currentTableObj.object = value;
+							break;
+						}
+						case deployPlanXml.TypeAttribute: {
+							currentTableObj.type = value;
+							break;
+						}
+						case deployPlanXml.IdAttribute: {
+							if (dataLossAlerts.has(value)) {
+								currentTableObj.dataloss = true;
+							}
+							break;
+						}
+					}
+				}
+			},
+			onclosetag: function (name) {
+				if (name === deployPlanXml.ItemElement) {
+					currentTableObj.operation = currentOperation;
+					operations.push(currentTableObj);
+				}
+			}
+		}, { xmlMode: true, decodeEntities: true });
+		p.parseChunk(report);
+
+		let data = new Array<Array<string>>();
+		operations.forEach(operation => {
+			let isDataLoss = operation.dataloss ? '⚠️' : '';
+			data.push([isDataLoss, operation.operation, operation.type, operation.object]);
+		});
+
+		return {
+			columnData: data,
+			dataLossAlerts: dataLossAlerts
+		};
+	}
+
+	public setupNavigationValidator() {
+		this.instance.registerNavigationValidator(() => {
+			return true;
+		});
+	}
+}

extensions/import/src/wizard/pages/selectOperationpage.ts

@@ -7,7 +7,7 @@
 import * as sqlops from 'sqlops';
 import * as nls from 'vscode-nls';
 import { DacFxDataModel } from '../api/models';
-import { DataTierApplicationWizard, Operation } from '../dataTierApplicationWizard';
+import { DataTierApplicationWizard, Operation, DeployOperationPath, ExtractOperationPath, ImportOperationPath, ExportOperationPath } from '../dataTierApplicationWizard';
 import { BasePage } from '../api/basePage';
 
 const localize = nls.loadMessageBundle();
@@ -58,11 +58,6 @@ export class SelectOperationPage extends BasePage {
 	}
 
 	async onPageEnter(): Promise<boolean> {
-		let numPages = this.instance.wizard.pages.length;
-		for (let i = numPages - 1; i > 2; --i) {
-			await this.instance.wizard.removePage(i);
-		}
-
 		return true;
 	}
 
@@ -74,12 +69,16 @@ export class SelectOperationPage extends BasePage {
 			}).component();
 
 		this.deployRadioButton.onDidClick(() => {
-			// remove the previous page
-			this.instance.wizard.removePage(1);
+			this.removePages();
 
-			// add deploy page
-			let page = this.instance.pages.get('deployConfig');
-			this.instance.wizard.addPage(page.wizardPage, 1);
+			//add deploy pages
+			let configPage = this.instance.pages.get('deployConfig');
+			this.instance.wizard.addPage(configPage.wizardPage, DeployOperationPath.deployOptions);
+			let deployPlanPage = this.instance.pages.get('deployPlan');
+			this.instance.wizard.addPage(deployPlanPage.wizardPage, DeployOperationPath.deployPlan);
+			let actionPage = this.instance.pages.get('deployAction');
+			this.instance.wizard.addPage(actionPage.wizardPage, DeployOperationPath.deployAction);
+			this.addSummaryPage(DeployOperationPath.summary);
 
 			// change button text and operation
 			this.instance.setDoneButton(Operation.deploy);
@@ -99,12 +98,12 @@ export class SelectOperationPage extends BasePage {
 			}).component();
 
 		this.extractRadioButton.onDidClick(() => {
-			// remove the previous pages
-			this.instance.wizard.removePage(1);
+			this.removePages();
 
 			// add the extract page
 			let page = this.instance.pages.get('extractConfig');
-			this.instance.wizard.addPage(page.wizardPage, 1);
+			this.instance.wizard.addPage(page.wizardPage, ExtractOperationPath.options);
+			this.addSummaryPage(ExtractOperationPath.summary);
 
 			// change button text and operation
 			this.instance.setDoneButton(Operation.extract);
@@ -124,12 +123,12 @@ export class SelectOperationPage extends BasePage {
 			}).component();
 
 		this.importRadioButton.onDidClick(() => {
-			// remove the  previous page
-			this.instance.wizard.removePage(1);
+			this.removePages();
 
 			// add the import page
 			let page = this.instance.pages.get('importConfig');
-			this.instance.wizard.addPage(page.wizardPage, 1);
+			this.instance.wizard.addPage(page.wizardPage, ImportOperationPath.options);
+			this.addSummaryPage(ImportOperationPath.summary);
 
 			// change button text and operation
 			this.instance.setDoneButton(Operation.import);
@@ -149,12 +148,12 @@ export class SelectOperationPage extends BasePage {
 			}).component();
 
 		this.exportRadioButton.onDidClick(() => {
-			// remove the 2 previous pages
-			this.instance.wizard.removePage(1);
+			this.removePages();
 
 			// add the export pages
 			let page = this.instance.pages.get('exportConfig');
-			this.instance.wizard.addPage(page.wizardPage, 1);
+			this.instance.wizard.addPage(page.wizardPage, ExportOperationPath.options);
+			this.addSummaryPage(ExportOperationPath.summary);
 
 			// change button text and operation
 			this.instance.setDoneButton(Operation.export);
@@ -166,6 +165,18 @@ export class SelectOperationPage extends BasePage {
 		};
 	}
 
+	private removePages() {
+		let numPages = this.instance.wizard.pages.length;
+		for (let i = numPages - 1; i > 0; --i) {
+			this.instance.wizard.removePage(i);
+		}
+	}
+
+	private addSummaryPage(index: number) {
+		let summaryPage = this.instance.pages.get('summary');
+		this.instance.wizard.addPage(summaryPage.wizardPage, index);
+	}
+
 	public setupNavigationValidator() {
 		this.instance.registerNavigationValidator(() => {
 			return true;

extensions/import/tsconfig.json

@@ -11,7 +11,7 @@
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
         "moduleResolution": "node",
-        "declaration": true
+        "declaration": false
     },
     "exclude": [
         "node_modules"

extensions/import/yarn.lock

@@ -75,9 +75,9 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.10":
-  version "0.2.10"
-  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/4de3f7caf0eba54159911b977ddb4f5d7c0a9ca8"
+"dataprotocol-client@github:Microsoft/sqlops-dataprotocolclient#0.2.15":
+  version "0.2.15"
+  resolved "https://codeload.github.com/Microsoft/sqlops-dataprotocolclient/tar.gz/a2cd2db109de882f0959f7b6421c86afa585f460"
   dependencies:
     vscode-languageclient "3.5.1"
 

extensions/integration-tests/.vscode/launch.json

@@ -0,0 +1,17 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+{
+	"version": "0.1.0",
+	"configurations": [
+		{
+			"name": "Launch Tests",
+			"type": "extensionHost",
+			"request": "launch",
+			"runtimeExecutable": "${execPath}",
+			"args": ["${workspaceFolder}/../../", "${workspaceFolder}/test", "--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out" ],
+			"stopOnEntry": false,
+			"sourceMaps": true,
+			"outDir": "${workspaceFolder}/out",
+			"preLaunchTask": "npm"
+		}
+	]
+}

extensions/integration-tests/.vscode/tasks.json

@@ -0,0 +1,31 @@
+// Available variables which can be used inside of strings.
+// ${workspaceFolder}: the root folder of the team
+// ${file}: the current opened file
+// ${relativeFile}: the current opened file relative to cwd
+// ${fileBasename}: the current opened file's basename
+// ${fileDirname}: the current opened file's dirname
+// ${fileExtname}: the current opened file's extension
+// ${cwd}: the current working directory of the spawned process
+
+// A task runner that calls a custom npm script that compiles the extension.
+{
+	"version": "0.1.0",
+
+	// we want to run npm
+	"command": "npm",
+
+	// the command is a shell script
+	"isShellCommand": true,
+
+	// show the output window only if unrecognized errors occur.
+	"showOutput": "silent",
+
+	// we run the custom script "compile" as defined in package.json
+	"args": ["run", "compile", "--loglevel", "silent"],
+
+	// The tsc compiler is started in watching mode
+	"isWatching": true,
+
+	// use the standard tsc in watch mode problem matcher to find compile problems in the output.
+	"problemMatcher": "$tsc-watch"
+}

extensions/integration-tests/extensionInstallers/readme.md

@@ -0,0 +1 @@
+copy the extension installers to this folder

extensions/integration-tests/package.json

@@ -0,0 +1,58 @@
+{
+  "name": "integration-tests",
+  "description": "Integration Tests",
+  "version": "0.0.1",
+  "publisher": "Microsoft",
+  "private": true,
+  "engines": {
+    "vscode": "*",
+    "sqlops": "*"
+  },
+  "activationEvents": [
+    "*"
+  ],
+  "main": "./out/main",
+  "extensionDependencies": [
+    "Microsoft.agent",
+    "Microsoft.import",
+    "Microsoft.profiler",
+    "Microsoft.mssql",
+    "Microsoft.notebook"
+  ],
+  "contributes": {
+    "configuration": {
+      "type": "object",
+      "title": "ADS Integration Test Configuration",
+      "properties": {
+        "test.testSetupCompleted": {
+          "type": "boolean",
+          "default": false,
+          "description": ""
+        }
+      }
+    },
+    "commands": [{
+        "command": "test.setupIntegrationTest",
+        "title": "Setup Integration Test",
+        "category": "Test"
+      },
+      {
+        "command": "test.waitForExtensionsToLoad",
+        "title": "Wait For Extensions To Load",
+        "category": "Test"
+      }
+    ]
+  },
+  "scripts": {
+    "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:vscode-colorize-tests ./tsconfig.json",
+    "postinstall": "node ./node_modules/vscode/bin/install"
+  },
+  "devDependencies": {
+    "@types/node": "7.0.43",
+    "@types/chai": "3.4.34",
+    "mocha-junit-reporter": "^1.17.0",
+    "mocha-multi-reporters": "^1.1.7",
+    "vscode": "1.1.5",
+    "chai": "3.5.0"
+  }
+}

extensions/integration-tests/readme.md

@@ -0,0 +1,32 @@
+This integration-tests suite is based on the extension testing feature provided by VS Code, We can use this for:
+a.	Commands for setting up the environment for feature testing.
+b.	Adding test cases that do not need UI interaction or the test scenarios not supported by the UI automation framework (e.g. object explorer context menu – not html based)
+
+extensionInstallers folder: copy the VISX installers for the extensions we would like to run the tests with.
+src folder: this is where the test file for features should be added, name the file like this: feature.test.ts. e.g. objectExplorer.test.ts
+
+UI automation testing:
+the ADS UI automation test cases should be added under $root/test/smoke/src/sql folder. Each feature should create its own folder and add 2 files, one for accessing the feature and the other for the test cases. For example: objectExplorer.ts and objectExplorer.test.ts. 
+
+Setup step:
+1.	Launch ADS
+2.	Install extensions from /extensions/integration-tests/extensionInstallers by calling the test command in the integration-tests extension
+3.	Set configuration values. E.g. Enable preview features by calling the test command in the integration-tests extension
+
+For now this has only been tested for Windows platform
+
+How to run the test:
+1.	In the build pipeline: 
+The integration tests and UI automation tests have been added to ADS windows pipeline to run the test and report the results, you can find the test result under the test tab.
+
+2.	Local environment:
+Integration tests:
+test-integration.bat or test-integration.sh under scripts folder
+
+UI automation tests:
+navigate to test/smoke folder and run: node test/index.js
+You can also run UI automation from VSCode by selecting the launch option: Launch Smoke Test.
+
+ADS will be launched using new temp folders: extension folder and data folder so that your local dev environment won't be changed.
+
+

extensions/integration-tests/src/index.ts

@@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+import { context } from './testContext';
+
+const path = require('path');
+const testRunner = require('vscode/lib/testrunner');
+
+const suite = 'Integration Tests';
+
+const options: any = {
+	ui: 'tdd',
+	useColors: true,
+	timeout: 600000
+};
+
+if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
+	options.reporter = 'mocha-multi-reporters';
+	options.reporterOptions = {
+		reporterEnabled: 'spec, mocha-junit-reporter',
+		mochaJunitReporterReporterOptions: {
+			testsuitesTitle: `${suite} ${process.platform}`,
+			mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
+		}
+	};
+}
+
+if (!vscode.workspace.getConfiguration('test')['testSetupCompleted']) {
+	context.RunTest = false;
+}
+
+testRunner.configure(options);
+
+export = testRunner;

extensions/integration-tests/src/main.ts

@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 vscode from 'vscode';
+import * as sqlops from 'sqlops';
+import { normalize, join } from 'path';
+import * as fs from 'fs';
+
+const TEST_SETUP_COMPLETED_TEXT: string = 'Test Setup Completed';
+const EXTENSION_LOADED_TEXT: string = 'Test Extension Loaded';
+const ALL_EXTENSION_LOADED_TEXT: string = 'All Extensions Loaded';
+
+var statusBarItemTimer: NodeJS.Timer;
+
+export function activate(context: vscode.ExtensionContext) {
+	var statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
+	vscode.commands.registerCommand('test.setupIntegrationTest', async () => {
+		let extensionInstallersFolder = normalize(join(__dirname, '../extensionInstallers'));
+		let installers = fs.readdirSync(extensionInstallersFolder);
+		for (let i = 0; i < installers.length; i++) {
+			if (installers[i].endsWith('.vsix')) {
+				let installerFullPath = join(extensionInstallersFolder, installers[i]);
+				await sqlops.extensions.install(installerFullPath);
+			}
+		}
+		await setConfiguration('workbench.enablePreviewFeatures', true);
+		await setConfiguration('workbench.showConnectDialogOnStartup', false);
+		await setConfiguration('test.testSetupCompleted', true);
+		showStatusBarItem(statusBarItem, TEST_SETUP_COMPLETED_TEXT);
+	});
+
+	vscode.commands.registerCommand('test.waitForExtensionsToLoad', async () => {
+		let expectedExtensions = ['Microsoft.agent', 'Microsoft.import', 'Microsoft.mssql', 'Microsoft.profiler'];
+		do {
+			let extensions = vscode.extensions.all.filter(ext => { return expectedExtensions.indexOf(ext.id) !== -1; });
+
+			let isReady = true;
+			for (let i = 0; i < extensions.length; i++) {
+				let extension = extensions[i];
+				isReady = isReady && extension.isActive;
+				if (!isReady) {
+					break;
+				}
+			}
+
+			if (isReady) {
+				showStatusBarItem(statusBarItem, ALL_EXTENSION_LOADED_TEXT);
+				break;
+			} else {
+				await new Promise(resolve => { setTimeout(resolve, 1000); });
+			}
+		}
+		while (true);
+	});
+	showStatusBarItem(statusBarItem, EXTENSION_LOADED_TEXT);
+}
+
+function showStatusBarItem(statusBarItem: vscode.StatusBarItem, text: string) {
+	statusBarItem.text = text;
+	statusBarItem.tooltip = text;
+	statusBarItem.show();
+	clearTimeout(statusBarItemTimer);
+	statusBarItemTimer = setTimeout(function () {
+		statusBarItem.hide();
+	}, 5000);
+}
+
+// this method is called when your extension is deactivated
+export function deactivate(): void {
+
+}
+
+async function setConfiguration(name: string, value: any) {
+	await vscode.workspace.getConfiguration().update(name, value, true);
+}

extensions/integration-tests/src/objectExplorer.test.ts

@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 'mocha';
+import * as sqlops from 'sqlops';
+import { context } from './testContext';
+import { getDefaultTestingServer } from './testConfig';
+import { connectToServer } from './utils';
+import assert = require('assert');
+
+if (context.RunTest) {
+	suite('Object Explorer integration test suite', () => {
+		test('context menu test', async function () {
+			await connectToServer(await getDefaultTestingServer());
+			let nodes = <sqlops.objectexplorer.ObjectExplorerNode[]>await sqlops.objectexplorer.getActiveConnectionNodes();
+			assert(nodes.length === 1, `expecting 1 active connection, actual: ${nodes.length}`);
+			let actions = await sqlops.objectexplorer.getNodeActions(nodes[0].connectionId, nodes[0].nodePath);
+			const expectedActions = ['Manage', 'New Query', 'Disconnect', 'Delete Connection', 'Refresh', 'Launch Profiler'];
+
+			const expectedString = expectedActions.join(',');
+			const actualString = actions.join(',');
+			assert(expectedActions.length === actions.length && expectedString === actualString, `Expected actions: "${expectedString}", Actual actions: "${actualString}"`);
+		});
+	});
+}

extensions/integration-tests/src/setup.test.ts

@@ -0,0 +1,21 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 'mocha';
+import * as vscode from 'vscode';
+import { context } from './testContext';
+
+if (!context.RunTest) {
+	suite('integration test setup', () => {
+		test('test setup', async function () {
+			//Prepare the environment and make it ready for testing
+			await vscode.commands.executeCommand('test.setupIntegrationTest');
+			//Reload the window, this is required for some changes made by the 'test.setupIntegrationTest' to work
+			await vscode.commands.executeCommand('workbench.action.reloadWindow');
+		});
+	});
+}

extensions/integration-tests/src/testConfig.ts

@@ -0,0 +1,92 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/*
+	TODO: Due to a runtime error, I duplicated this file at these 2 locations:
+	$/extensions/integration-test/src/testConfig.ts
+	$/test/smoke/src/sql/testConfig.ts
+	for now, make sure to keep both files in sync.
+*/
+
+interface ITestServerProfile {
+	serverName: string;
+	userName: string;
+	password: string;
+	authenticationType: AuthenticationType;
+	database: string;
+	provider: ConnectionProvider;
+	version: string;
+}
+
+interface INameDisplayNamePair {
+	name: string;
+	displayName: string;
+}
+
+export enum AuthenticationType {
+	Windows,
+	SqlLogin
+}
+
+export enum ConnectionProvider {
+	SQLServer
+}
+
+var connectionProviderMapping = {};
+var authenticationTypeMapping = {};
+connectionProviderMapping[ConnectionProvider.SQLServer] = { name: 'MSSQL', displayName: 'Microsoft SQL Server' };
+
+authenticationTypeMapping[AuthenticationType.SqlLogin] = { name: 'SqlLogin', displayName: 'SQL Login' };
+authenticationTypeMapping[AuthenticationType.Windows] = { name: 'Integrated', displayName: 'Windows Authentication' };
+
+export class TestServerProfile {
+	constructor(private _profile: ITestServerProfile) { }
+	public get serverName(): string { return this._profile.serverName; }
+	public get userName(): string { return this._profile.userName; }
+	public get password(): string { return this._profile.password; }
+	public get database(): string { return this._profile.database; }
+	public get version(): string { return this._profile.version; }
+	public get provider(): ConnectionProvider { return this._profile.provider; }
+	public get providerName(): string { return getEnumMappingEntry(connectionProviderMapping, this.provider).name; }
+	public get providerDisplayName(): string { return getEnumMappingEntry(connectionProviderMapping, this.provider).displayName; }
+	public get authenticationType(): AuthenticationType { return this._profile.authenticationType; }
+	public get authenticationTypeName(): string { return getEnumMappingEntry(authenticationTypeMapping, this.authenticationType).name; }
+	public get authenticationTypeDisplayName(): string { return getEnumMappingEntry(authenticationTypeMapping, this.authenticationType).displayName; }
+}
+
+var TestingServers: TestServerProfile[] = [
+	new TestServerProfile(
+		{
+			serverName: 'SQLTOOLS2017-3',
+			userName: '',
+			password: '',
+			authenticationType: AuthenticationType.Windows,
+			database: 'master',
+			provider: ConnectionProvider.SQLServer,
+			version: '2017'
+		})
+];
+
+function getEnumMappingEntry(mapping: any, enumValue: any): INameDisplayNamePair {
+	let entry = mapping[enumValue];
+	if (entry) {
+		return entry;
+	} else {
+		throw `Unknown enum type: ${enumValue.toString()}`;
+	}
+}
+
+export async function getDefaultTestingServer(): Promise<TestServerProfile> {
+	let servers = await getTestingServers();
+	return servers[0];
+}
+
+export async function getTestingServers(): Promise<TestServerProfile[]> {
+	let promise = new Promise<TestServerProfile[]>(resolve => {
+		resolve(TestingServers);
+	});
+	await promise;
+	return promise;
+}

extensions/integration-tests/src/testContext.ts

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export var context = {
+	RunTest: true
+};

extensions/integration-tests/src/typings/ref.d.ts

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+/// <reference path='../../../../src/sql/sqlops.d.ts'/>
+/// <reference path='../../../../src/sql/sqlops.proposed.d.ts'/>
+/// <reference path='../../../../src/sql/sqlops.test.d.ts'/>
+/// <reference types='@types/node'/>

extensions/integration-tests/src/utils.ts

@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import assert = require('assert');
+import * as sqlops from 'sqlops';
+import * as vscode from 'vscode';
+import { TestServerProfile } from './testConfig';
+
+export async function connectToServer(server: TestServerProfile) {
+	let connectionProfile: sqlops.IConnectionProfile = {
+		serverName: server.serverName,
+		databaseName: server.database,
+		authenticationType: server.authenticationTypeName,
+		providerName: server.providerName,
+		connectionName: '',
+		userName: server.userName,
+		password: server.password,
+		savePassword: false,
+		groupFullName: undefined,
+		saveProfile: true,
+		id: undefined,
+		groupId: undefined,
+		options: {}
+	};
+	await ensureConnectionViewOpened();
+	let result = <sqlops.ConnectionResult>await sqlops.connection.connect(connectionProfile);
+	assert(result.connected, `Failed to connect to "${connectionProfile.serverName}", error code: ${result.errorCode}, error message: ${result.errorMessage}`);
+
+	//workaround
+	//wait for OE to load
+	await new Promise(c => setTimeout(c, 3000));
+}
+
+export async function ensureConnectionViewOpened() {
+	await vscode.commands.executeCommand('workbench.view.connections');
+}