From 60147c1a8655f8cf16ac581af294cbb783ef86a4 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Tue, 17 Jan 2023 11:42:26 -0800
Subject: [PATCH] Fixes/cleanup for datavirtualization (#21608)

* Fixes/cleanup for datavirtualization

* Update owners
---
 .github/CODEOWNERS                            |  1 +
 extensions/datavirtualization/config.json     | 11 +---------
 .../src/services/serviceClient.ts             |  6 +++---
 .../src/wizards/wizardCommands.ts             | 21 ++-----------------
 4 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 088411705a..f08ceca63c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,6 +7,7 @@
 /extensions/azcli/ @Charles-Gagnon @swells @candiceye
 /extensions/azurecore/ @cssuh @cheenamalhotra
 /extensions/dacpac/ @kisantia
+/extensions/datavirtualization @Charles-Gagnon
 /extensions/notebook @azure-data-studio-notebook-devs
 /extensions/query-history/ @Charles-Gagnon
 /extensions/resource-deployment/ @Charles-Gagnon
diff --git a/extensions/datavirtualization/config.json b/extensions/datavirtualization/config.json
index 59db5f6a1c..fcca3abcab 100644
--- a/extensions/datavirtualization/config.json
+++ b/extensions/datavirtualization/config.json
@@ -5,16 +5,7 @@
 		"Windows_64": "win-x64.zip",
 		"Windows_86": "win-x86.zip",
 		"OSX": "osx-x64.tar.gz",
-		"Linux_64": "linux-x64.tar.gz",
-		"CentOS_7": "linux-x64.tar.gz",
-		"Debian_8": "linux-x64.tar.gz",
-		"Fedora_23": "linux-x64.tar.gz",
-		"OpenSUSE_13_2": "linux-x64.tar.gz",
-		"RHEL_7": "linux-x64.tar.gz",
-		"SLES_12_2": "linux-x64.tar.gz",
-		"Ubuntu_14": "linux-x64.tar.gz",
-		"Ubuntu_16": "linux-x64.tar.gz",
-		"Ubuntu_18": "linux-x64.tar.gz"
+		"Linux": "linux-x64.tar.gz"
 	},
 	"installDirectory": "scaleoutdataservice/{#platform#}/{#version#}",
 	"executableFiles": [
diff --git a/extensions/datavirtualization/src/services/serviceClient.ts b/extensions/datavirtualization/src/services/serviceClient.ts
index 0a3d65f0e0..e00729452c 100644
--- a/extensions/datavirtualization/src/services/serviceClient.ts
+++ b/extensions/datavirtualization/src/services/serviceClient.ts
@@ -47,7 +47,7 @@ export class ServiceClient {
 				const processStart = Date.now();
 				client.onReady().then(() => {
 					const processEnd = Date.now();
-					this.statusView.text = localize('serviceStarted', 'Service Started');
+					this.statusView.text = localize('serviceStarted', '{0} started', Constants.serviceName);
 					setTimeout(() => {
 						this.statusView.hide();
 					}, 1500);
@@ -59,13 +59,13 @@ export class ServiceClient {
 					});
 				});
 				this.statusView.show();
-				this.statusView.text = localize('serviceStarting', 'Starting service');
+				this.statusView.text = localize('serviceStarting', 'Starting {0}...', Constants.serviceName);
 				let disposable = client.start();
 				context.subscriptions.push(disposable);
 				resolve();
 			}, e => {
 				Telemetry.sendTelemetryEvent('ServiceInitializingFailed');
-				this.apiWrapper.showErrorMessage(localize('serviceStartFailed', 'Failed to start Scale Out Data service:{0}', e));
+				this.apiWrapper.showErrorMessage(localize('serviceStartFailed', 'Failed to start {0}: {1}', Constants.serviceName, e));
 				// Just resolve to avoid unhandled promise. We show the error to the user.
 				resolve();
 			});
diff --git a/extensions/datavirtualization/src/wizards/wizardCommands.ts b/extensions/datavirtualization/src/wizards/wizardCommands.ts
index b5b5bb998b..6fda3875e0 100644
--- a/extensions/datavirtualization/src/wizards/wizardCommands.ts
+++ b/extensions/datavirtualization/src/wizards/wizardCommands.ts
@@ -96,24 +96,7 @@ export class OpenMssqlHdfsTableFromFileWizardCommand extends Command {
 }
 
 function convertIConnectionProfile(profile: azdata.IConnectionProfile): azdata.connection.ConnectionProfile {
-	let connection: azdata.connection.ConnectionProfile;
-	if (profile) {
-		connection = {
-			providerId: profile.providerName,
-			connectionId: profile.id,
-			connectionName: profile.connectionName,
-			serverName: profile.serverName,
-			databaseName: profile.databaseName,
-			userName: profile.userName,
-			password: profile.password,
-			authenticationType: profile.authenticationType,
-			savePassword: profile.savePassword,
-			groupFullName: profile.groupFullName,
-			groupId: profile.groupId,
-			saveProfile: profile.saveProfile,
-			azureTenantId: profile.azureTenantId,
-			options: {}
-		};
-	}
+	const connection = azdata.connection.ConnectionProfile.createFrom(profile.options);
+	connection.providerId = profile.providerName;
 	return connection;
 }