Open cluster dashboard from SQL Dashboard (#7783)

* Open cluster dashboard

* Remove old translated strings and update var name

* Add exported auth type

* Add newline

* PR feedback

extensions/big-data-cluster/src/bigDataCluster/dialog/bdcDashboardModel.ts

@@ -3,8 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
 import { ClusterController } from '../controller/clusterControllerApi';
@@ -12,6 +10,8 @@ import { EndpointModel, BdcStatusModel } from '../controller/apiGenerated';
 import { showErrorMessage, Endpoint } from '../utils';
 import { AuthType } from '../constants';
 
+export type BdcDashboardOptions = { url: string, auth: AuthType, username: string, password: string };
+
 export class BdcDashboardModel {
 
 	private _clusterController: ClusterController;
@@ -24,8 +24,8 @@ export class BdcDashboardModel {
 	public onDidUpdateEndpoints = this._onDidUpdateEndpoints.event;
 	public onDidUpdateBdcStatus = this._onDidUpdateBdcStatus.event;
 
-	constructor(url: string, auth: AuthType, username: string, private password: string, ignoreSslVerification = true) {
+	constructor(private options: BdcDashboardOptions, ignoreSslVerification = true) {
-		this._clusterController = new ClusterController(url, auth, username, password, ignoreSslVerification);
+		this._clusterController = new ClusterController(options.url, options.auth, options.username, options.password, ignoreSslVerification);
 		this.refresh();
 	}
 
@@ -81,7 +81,7 @@ export class BdcDashboardModel {
 			serverName: sqlServerMasterEndpoint.endpoint,
 			databaseName: undefined,
 			userName: 'sa',
-			password: this.password,
+			password: this.options.password,
 			authenticationType: '',
 			savePassword: true,
 			groupFullName: undefined,

extensions/big-data-cluster/src/extension.ts

@@ -14,7 +14,7 @@ import { TreeNode } from './bigDataCluster/tree/treeNode';
 import { AddControllerDialogModel, AddControllerDialog } from './bigDataCluster/dialog/addControllerDialog';
 import { ControllerNode } from './bigDataCluster/tree/controllerTreeNode';
 import { BdcDashboard } from './bigDataCluster/dialog/bdcDashboard';
-import { BdcDashboardModel } from './bigDataCluster/dialog/bdcDashboardModel';
+import { BdcDashboardModel, BdcDashboardOptions } from './bigDataCluster/dialog/bdcDashboardModel';
 import { MountHdfsDialogModel as MountHdfsModel, MountHdfsProperties, MountHdfsDialog, DeleteMountDialog, DeleteMountModel, RefreshMountDialog, RefreshMountModel } from './bigDataCluster/dialog/mountHdfsDialog';
 import { getControllerEndpoint } from './bigDataCluster/utils';
 
@@ -62,9 +62,9 @@ function registerCommands(context: vscode.ExtensionContext, treeDataProvider: Co
 		treeDataProvider.notifyNodeChanged(node);
 	});
 
-	vscode.commands.registerCommand(ManageControllerCommand, async (node: ControllerNode) => {
+	vscode.commands.registerCommand(ManageControllerCommand, async (info: ControllerNode | BdcDashboardOptions) => {
-		const title: string = `${localize('bdc.dashboard.title', "Big Data Cluster Dashboard -")} ${ControllerNode.toIpAndPort(node.url)}`;
+		const title: string = `${localize('bdc.dashboard.title', "Big Data Cluster Dashboard -")} ${ControllerNode.toIpAndPort(info.url)}`;
-		const dashboard: BdcDashboard = new BdcDashboard(title, new BdcDashboardModel(node.url, node.auth, node.username, node.password));
+		const dashboard: BdcDashboard = new BdcDashboard(title, new BdcDashboardModel(info));
 		dashboard.showDashboard();
 	});
 

extensions/mssql/package.json

@@ -77,8 +77,8 @@
         }
       },
       {
-        "command": "mssqlCluster.task.openClusterStatusNotebook",
+        "command": "mssqlCluster.task.openClusterDashboard",
-        "title": "%title.openClusterStatusNotebook%",
+        "title": "%title.openClusterDashboard%",
         "icon": {
           "dark": "resources/dark/cluster_status_inverse.svg",
           "light": "resources/light/cluster_status.svg"
@@ -251,7 +251,7 @@
           "when": "false"
         },
         {
-          "command": "mssqlCluster.task.openClusterStatusNotebook",
+          "command": "mssqlCluster.task.openClusterDashboard",
           "when": "false"
         }
       ],
@@ -417,7 +417,7 @@
                   "mssqlCluster.task.newNotebook",
                   "mssqlCluster.task.openNotebook",
                   "mssqlCluster.livy.task.submitSparkJob",
-                  "mssqlCluster.task.openClusterStatusNotebook"
+                  "mssqlCluster.task.openClusterDashboard"
                 ]
               }
             },

extensions/mssql/package.nls.json

@@ -26,7 +26,7 @@
 	"title.tasks": "Tasks",
 	"title.installPackages": "Install Packages",
 	"title.configurePython": "Configure Python for Notebooks",
-	"title.openClusterStatusNotebook": "Cluster Status",
+	"title.openClusterDashboard": "Cluster\nDashboard",
 
 	"title.searchServers": "Search: Servers",
 	"title.clearSearchServerResult": "Search: Clear Search Server Results",

extensions/mssql/src/constants.ts

@@ -64,7 +64,7 @@ export enum MssqlClusterItemsSubType {
 // SPARK JOB SUBMISSION //////////////////////////////////////////////////////////
 export const mssqlClusterNewNotebookTask = 'mssqlCluster.task.newNotebook';
 export const mssqlClusterOpenNotebookTask = 'mssqlCluster.task.openNotebook';
-export const mssqlopenClusterStatusNotebook = 'mssqlCluster.task.openClusterStatusNotebook';
+export const mssqlOpenClusterDashboard = 'mssqlCluster.task.openClusterDashboard';
 export const mssqlClusterLivySubmitSparkJobCommand = 'mssqlCluster.livy.cmd.submitSparkJob';
 export const mssqlClusterLivySubmitSparkJobFromFileCommand = 'mssqlCluster.livy.cmd.submitFileToSparkJob';
 export const mssqlClusterLivySubmitSparkJobTask = 'mssqlCluster.livy.task.submitSparkJob';

extensions/mssql/src/main.ts

@@ -22,11 +22,11 @@ import { OpenSparkYarnHistoryTask } from './sparkFeature/historyTask';
 import { MssqlObjectExplorerNodeProvider, mssqlOutputChannel } from './objectExplorerNodeProvider/objectExplorerNodeProvider';
 import { registerSearchServerCommand } from './objectExplorerNodeProvider/command';
 import { MssqlIconProvider } from './iconProvider';
-import { registerServiceEndpoints } from './dashboard/serviceEndpoints';
+import { registerServiceEndpoints, Endpoint } from './dashboard/serviceEndpoints';
 import { getBookExtensionContributions } from './dashboard/bookExtensions';
 import { registerBooksWidget } from './dashboard/bookWidget';
 import { createMssqlApi } from './mssqlApiFactory';
-
+import { AuthType } from './util/auth';
 import { SqlToolsServer } from './sqlToolsServer';
 import { promises as fs } from 'fs';
 import { IconPathHelper } from './iconHelper';
@@ -131,8 +131,8 @@ function activateNotebookTask(appContext: AppContext): void {
 	apiWrapper.registerTaskHandler(Constants.mssqlClusterOpenNotebookTask, (profile: azdata.IConnectionProfile) => {
 		return handleOpenNotebookTask(profile);
 	});
-	apiWrapper.registerTaskHandler(Constants.mssqlopenClusterStatusNotebook, (profile: azdata.IConnectionProfile) => {
+	apiWrapper.registerTaskHandler(Constants.mssqlOpenClusterDashboard, (profile: azdata.IConnectionProfile) => {
-		return handleOpenClusterStatusNotebookTask(profile, appContext);
+		return handleOpenClusterDashboardTask(profile, appContext);
 	});
 }
 
@@ -203,24 +203,21 @@ async function handleOpenNotebookTask(profile: azdata.IConnectionProfile): Promi
 	}
 }
 
-async function handleOpenClusterStatusNotebookTask(profile: azdata.IConnectionProfile, appContext: AppContext): Promise<void> {
+async function handleOpenClusterDashboardTask(profile: azdata.IConnectionProfile, appContext: AppContext): Promise<void> {
-	const notebookRelativePath: string = 'notebooks/tsg/cluster-status.ipynb';
+	const serverInfo = await azdata.connection.getServerInfo(profile.id);
-	const notebookFullPath: string = path.join(appContext.extensionContext.extensionPath, notebookRelativePath);
+	const controller = Utils.getClusterEndpoints(serverInfo).find(e => e.serviceName === Endpoint.controller);
-	if (!(await Utils.exists(notebookFullPath))) {
+	if (!controller) {
-		vscode.window.showErrorMessage(localize("fileNotFound", "Unable to find the file specified"));
+		appContext.apiWrapper.showErrorMessage(localize('noController', "Could not find the controller endpoint for this instance"));
-	} else {
+		return;
-		const title: string = Utils.findNextUntitledEditorName(notebookFullPath);
-		const untitledFileName: vscode.Uri = vscode.Uri.parse(`untitled:${title}`);
-		vscode.workspace.openTextDocument(notebookFullPath).then((document) => {
-			let initialContent = document.getText();
-			azdata.nb.showNotebookDocument(untitledFileName, {
-				connectionProfile: profile,
-				preview: true,
-				initialContent: initialContent,
-				initialDirtyState: false
-			});
-		});
 	}
+
+	appContext.apiWrapper.executeCommand('bigDataClusters.command.manageController',
+		{
+			url: controller.endpoint,
+			auth: profile.authenticationType === 'Integrated' ? AuthType.Integrated : AuthType.Basic,
+			username: 'admin', // Default to admin as a best-guess, we'll prompt for re-entering credentials if that fails
+			password: profile.password
+		});
 }
 
 // this method is called when your extension is deactivated

extensions/mssql/src/util/auth.ts

@@ -5,6 +5,11 @@
 
 import * as kerberos from 'kerberos';
 
+export enum AuthType {
+	Integrated = 'integrated',
+	Basic = 'basic'
+}
+
 export async function authenticateKerberos(hostname: string): Promise<string> {
 	const service = 'HTTP' + (process.platform === 'win32' ? '/' : '@') + hostname;
 	const mechOID = kerberos.GSS_MECH_OID_KRB5;

resources/xlf/de/mssql.de.xlf

@@ -94,10 +94,6 @@
         <source xml:lang="en">Configure Python for Notebooks</source>
         <target state="translated">Python für Notebooks konfigurieren</target>
       </trans-unit>
-      <trans-unit id="title.openClusterStatusNotebook">
-        <source xml:lang="en">Cluster Status</source>
-        <target state="translated">Clusterstatus</target>
-      </trans-unit>
       <trans-unit id="title.searchServers">
         <source xml:lang="en">Search: Servers</source>
         <target state="translated">Suche: Server</target>

resources/xlf/en/mssql.xlf

@@ -73,9 +73,6 @@
     <trans-unit id="title.configurePython">
       <source xml:lang="en">Configure Python for Notebooks</source>
     </trans-unit>
-    <trans-unit id="title.openClusterStatusNotebook">
-      <source xml:lang="en">Cluster Status</source>
-    </trans-unit>
     <trans-unit id="title.searchServers">
       <source xml:lang="en">Search: Servers</source>
     </trans-unit>

resources/xlf/es/mssql.es.xlf

@@ -94,10 +94,6 @@
         <source xml:lang="en">Configure Python for Notebooks</source>
         <target state="translated">Configurar Python para Notebooks</target>
       </trans-unit>
-      <trans-unit id="title.openClusterStatusNotebook">
-        <source xml:lang="en">Cluster Status</source>
-        <target state="translated">Estado del clúster</target>
-      </trans-unit>
       <trans-unit id="title.searchServers">
         <source xml:lang="en">Search: Servers</source>
         <target state="translated">Buscar: Servidores</target>

resources/xlf/fr/mssql.fr.xlf

@@ -94,10 +94,6 @@
         <source xml:lang="en">Configure Python for Notebooks</source>
         <target state="translated">Configurer Python pour Notebooks</target>
       </trans-unit>
-      <trans-unit id="title.openClusterStatusNotebook">
-        <source xml:lang="en">Cluster Status</source>
-        <target state="translated">État du cluster</target>
-      </trans-unit>
       <trans-unit id="title.searchServers">
         <source xml:lang="en">Search: Servers</source>
         <target state="translated">Recherche : Serveurs</target>

resources/xlf/it/mssql.it.xlf

@@ -94,10 +94,6 @@
         <source xml:lang="en">Configure Python for Notebooks</source>
         <target state="translated">Configura Python per Notebooks</target>
       </trans-unit>
-      <trans-unit id="title.openClusterStatusNotebook">
-        <source xml:lang="en">Cluster Status</source>
-        <target state="translated">Stato cluster</target>
-      </trans-unit>
       <trans-unit id="title.searchServers">
         <source xml:lang="en">Search: Servers</source>
         <target state="translated">Ricerca: Server</target>

resources/xlf/ja/mssql.ja.xlf

@@ -94,10 +94,6 @@
         <source xml:lang="en">Configure Python for Notebooks</source>
         <target state="translated">ノートブック用 Python の構成</target>
       </trans-unit>
-      <trans-unit id="title.openClusterStatusNotebook">
-        <source xml:lang="en">Cluster Status</source>
-        <target state="translated">クラスター状態</target>
-      </trans-unit>
       <trans-unit id="title.searchServers">
         <source xml:lang="en">Search: Servers</source>
         <target state="translated">検索: サーバー</target>

resources/xlf/ko/mssql.ko.xlf

@@ -94,10 +94,6 @@
         <source xml:lang="en">Configure Python for Notebooks</source>
         <target state="translated">노트북용 Python 구성</target>
       </trans-unit>
-      <trans-unit id="title.openClusterStatusNotebook">
-        <source xml:lang="en">Cluster Status</source>
-        <target state="translated">클러스터 상태</target>
-      </trans-unit>
       <trans-unit id="title.searchServers">
         <source xml:lang="en">Search: Servers</source>
         <target state="translated">검색: 서버</target>

resources/xlf/pt-br/mssql.pt-BR.xlf

@@ -94,10 +94,6 @@
         <source xml:lang="en">Configure Python for Notebooks</source>
         <target state="translated">Configurar o Python para notebooks</target>
       </trans-unit>
-      <trans-unit id="title.openClusterStatusNotebook">
-        <source xml:lang="en">Cluster Status</source>
-        <target state="translated">Status do cluster</target>
-      </trans-unit>
       <trans-unit id="title.searchServers">
         <source xml:lang="en">Search: Servers</source>
         <target state="translated">Pesquisa: servidores</target>

resources/xlf/ru/mssql.ru.xlf

@@ -94,10 +94,6 @@
         <source xml:lang="en">Configure Python for Notebooks</source>
         <target state="translated">Настройка Python для Записных книжек</target>
       </trans-unit>
-      <trans-unit id="title.openClusterStatusNotebook">
-        <source xml:lang="en">Cluster Status</source>
-        <target state="translated">Состояние кластера</target>
-      </trans-unit>
       <trans-unit id="title.searchServers">
         <source xml:lang="en">Search: Servers</source>
         <target state="translated">Поиск: Серверы</target>

resources/xlf/zh-hans/mssql.zh-Hans.xlf

@@ -94,10 +94,6 @@
         <source xml:lang="en">Configure Python for Notebooks</source>
         <target state="translated">为笔记本配置 Python</target>
       </trans-unit>
-      <trans-unit id="title.openClusterStatusNotebook">
-        <source xml:lang="en">Cluster Status</source>
-        <target state="translated">群集状态</target>
-      </trans-unit>
       <trans-unit id="title.searchServers">
         <source xml:lang="en">Search: Servers</source>
         <target state="translated">搜索: 服务器</target>

resources/xlf/zh-hant/mssql.zh-Hant.xlf

@@ -94,10 +94,6 @@
         <source xml:lang="en">Configure Python for Notebooks</source>
         <target state="translated">為 Notebooks 設定 Python</target>
       </trans-unit>
-      <trans-unit id="title.openClusterStatusNotebook">
-        <source xml:lang="en">Cluster Status</source>
-        <target state="translated">叢集狀態</target>
-      </trans-unit>
       <trans-unit id="title.searchServers">
         <source xml:lang="en">Search: Servers</source>
         <target state="translated">搜尋: 伺服器</target>