From 3ce6f9e78c763bbb7b58483366764a4ad57fdc2f Mon Sep 17 00:00:00 2001
From: Aasim Khan <aasimkhan30@gmail.com>
Date: Tue, 20 Jul 2021 09:56:52 -0700
Subject: [PATCH] adding cpu count and ram to server info (#16109)

---
 extensions/liveshare/src/providers/connectionProvider.ts  | 2 ++
 extensions/mssql/config.json                              | 2 +-
 extensions/notebook/src/test/common/utils.test.ts         | 4 +++-
 extensions/notebook/src/test/model/sessionManager.test.ts | 2 ++
 src/sql/azdata.d.ts                                       | 8 ++++++++
 .../electron-browser/propertiesWidget.component.test.ts   | 2 ++
 .../test/browser/connectionManagementService.test.ts      | 4 +++-
 7 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/extensions/liveshare/src/providers/connectionProvider.ts b/extensions/liveshare/src/providers/connectionProvider.ts
index f819beb716..58dc78c167 100644
--- a/extensions/liveshare/src/providers/connectionProvider.ts
+++ b/extensions/liveshare/src/providers/connectionProvider.ts
@@ -128,6 +128,8 @@ export class ConnectionProvider {
 						isCloud: false,
 						azureVersion: 1,
 						osVersion: '1',
+						cpuCount: 1,
+						physicalMemoryInMb: 1,
 						options: connInfo.options
 					}
 				};
diff --git a/extensions/mssql/config.json b/extensions/mssql/config.json
index 6b58cd2fab..24566a5afe 100644
--- a/extensions/mssql/config.json
+++ b/extensions/mssql/config.json
@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "3.0.0-release.110",
+	"version": "3.0.0-release.111",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net5.0.zip",
 		"Windows_64": "win-x64-net5.0.zip",
diff --git a/extensions/notebook/src/test/common/utils.test.ts b/extensions/notebook/src/test/common/utils.test.ts
index a438aa41be..65f2a3d2c3 100644
--- a/extensions/notebook/src/test/common/utils.test.ts
+++ b/extensions/notebook/src/test/common/utils.test.ts
@@ -317,7 +317,9 @@ describe('Utils Tests', function () {
 			isCloud: false,
 			azureVersion: -1,
 			osVersion: '',
-			options: {}
+			options: {},
+			cpuCount: -1,
+			physicalMemoryInMb: -1
 		};
 		it('empty endpoints does not error', () => {
 			const serverInfo = Object.assign({}, baseServerInfo);
diff --git a/extensions/notebook/src/test/model/sessionManager.test.ts b/extensions/notebook/src/test/model/sessionManager.test.ts
index 0310b669d4..6cf4212b89 100644
--- a/extensions/notebook/src/test/model/sessionManager.test.ts
+++ b/extensions/notebook/src/test/model/sessionManager.test.ts
@@ -289,6 +289,8 @@ describe('Jupyter Session', function (): void {
 			isCloud: false,
 			azureVersion: 0,
 			osVersion: '',
+			cpuCount: 0,
+			physicalMemoryInMb: -1,
 			options: {
 				isBigDataCluster: true
 			}
diff --git a/src/sql/azdata.d.ts b/src/sql/azdata.d.ts
index cdf345f468..7a7e0c6d90 100644
--- a/src/sql/azdata.d.ts
+++ b/src/sql/azdata.d.ts
@@ -503,6 +503,14 @@ declare module 'azdata' {
 		 * The Operating System version string of the machine running the instance.
 		 */
 		osVersion: string;
+		/**
+		 * The CPU count of the host running the server.
+		 */
+		cpuCount: number;
+		/**
+		 * The physical memory of the host running the server.
+		 */
+		physicalMemoryInMb: number;
 		/**
 		 * options for all new server properties.
 		 */
diff --git a/src/sql/workbench/contrib/dashboard/test/electron-browser/propertiesWidget.component.test.ts b/src/sql/workbench/contrib/dashboard/test/electron-browser/propertiesWidget.component.test.ts
index 22a21b947b..54780399a8 100644
--- a/src/sql/workbench/contrib/dashboard/test/electron-browser/propertiesWidget.component.test.ts
+++ b/src/sql/workbench/contrib/dashboard/test/electron-browser/propertiesWidget.component.test.ts
@@ -60,6 +60,8 @@ suite('Dashboard Properties Widget Tests', () => {
 			serverEdition: undefined,
 			azureVersion: undefined,
 			osVersion: undefined,
+			cpuCount: undefined,
+			physicalMemoryInMb: undefined,
 			options: {},
 		};
 
diff --git a/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts b/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts
index 63b8a1c2b2..2558b3aeff 100644
--- a/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts
+++ b/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts
@@ -1332,7 +1332,9 @@ suite('SQL ConnectionManagementService tests', () => {
 			azureVersion: 0,
 			osVersion: 'test_version',
 			options: { isBigDataCluster: 'test' },
-			isCloud: true
+			isCloud: true,
+			cpuCount: 0,
+			physicalMemoryInMb: 0
 		};
 		let uri: string = 'Editor Uri';
 		let options: IConnectionCompletionOptions = {