new postgres model (#12305)

Co-authored-by: Brian Bergeron <brberger@microsoft.com>

extensions/arc/src/ui/dashboards/controller/controllerDashboardOverviewPage.ts

@@ -7,7 +7,7 @@ import { ResourceType } from 'arc';
 import * as azdata from 'azdata';
 import * as azurecore from 'azurecore';
 import * as vscode from 'vscode';
-import { getConnectionModeDisplayText, getResourceTypeIcon, parseInstanceName, resourceTypeToDisplayName } from '../../../common/utils';
+import { getConnectionModeDisplayText, getResourceTypeIcon, resourceTypeToDisplayName } from '../../../common/utils';
 import { cssStyles, Endpoints, IconPathHelper, iconSize } from '../../../constants';
 import * as loc from '../../../localizedConstants';
 import { ControllerModel } from '../../../models/controllerModel';
@@ -233,7 +233,7 @@ export class ControllerDashboardOverviewPage extends DashboardPage {
 							url: ''
 						}).component();
 					(<azdata.HyperlinkComponent>nameComponent).onDidClick(async () => {
-						await this._controllerModel.treeDataProvider.openResourceDashboard(this._controllerModel, r.instanceType || '', parseInstanceName(r.instanceName));
+						await this._controllerModel.treeDataProvider.openResourceDashboard(this._controllerModel, r.instanceType || '', r.instanceName);
 					});
 				}
 

extensions/arc/src/ui/dashboards/postgres/postgresConnectionStringsPage.ts

@@ -18,7 +18,7 @@ export class PostgresConnectionStringsPage extends DashboardPage {
 	constructor(protected modelView: azdata.ModelView, private _postgresModel: PostgresModel) {
 		super(modelView);
 
-		this.disposables.push(this._postgresModel.onServiceUpdated(
+		this.disposables.push(this._postgresModel.onConfigUpdated(
 			() => this.eventuallyRunOnInitialized(() => this.handleServiceUpdated())));
 	}
 
@@ -65,7 +65,7 @@ export class PostgresConnectionStringsPage extends DashboardPage {
 		this.loading = this.modelView.modelBuilder.loadingComponent()
 			.withItem(this.keyValueContainer.container)
 			.withProperties<azdata.LoadingComponentProperties>({
-				loading: !this._postgresModel.serviceLastUpdated
+				loading: !this._postgresModel.configLastUpdated
 			}).component();
 
 		content.addItem(this.loading);
@@ -98,7 +98,7 @@ export class PostgresConnectionStringsPage extends DashboardPage {
 	}
 
 	private getConnectionStrings(): KeyValue[] {
-		const endpoint: { ip?: string, port?: number } = this._postgresModel.endpoint;
+		const endpoint: { ip: string, port: string } = this._postgresModel.endpoint;
 
 		return [
 			new InputKeyValue(this.modelView.modelBuilder, 'ADO.NET', `Server=${endpoint.ip};Database=postgres;Port=${endpoint.port};User Id=postgres;Password={your_password_here};Ssl Mode=Require;`),

extensions/arc/src/ui/dashboards/postgres/postgresDashboard.ts

@@ -14,11 +14,10 @@ import { PostgresPropertiesPage } from './postgresPropertiesPage';
 import { Dashboard } from '../../components/dashboard';
 import { PostgresDiagnoseAndSolveProblemsPage } from './postgresDiagnoseAndSolveProblemsPage';
 import { PostgresSupportRequestPage } from './postgresSupportRequestPage';
-import { PostgresResourceHealthPage } from './postgresResourceHealthPage';
 
 export class PostgresDashboard extends Dashboard {
 	constructor(private _context: vscode.ExtensionContext, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
-		super(loc.postgresDashboard(_postgresModel.name));
+		super(loc.postgresDashboard(_postgresModel.info.name));
 	}
 
 	public async showDashboard(): Promise<void> {
@@ -33,7 +32,6 @@ export class PostgresDashboard extends Dashboard {
 		const overviewPage = new PostgresOverviewPage(modelView, this._controllerModel, this._postgresModel);
 		const connectionStringsPage = new PostgresConnectionStringsPage(modelView, this._postgresModel);
 		const propertiesPage = new PostgresPropertiesPage(modelView, this._controllerModel, this._postgresModel);
-		const resourceHealthPage = new PostgresResourceHealthPage(modelView, this._postgresModel);
 		const diagnoseAndSolveProblemsPage = new PostgresDiagnoseAndSolveProblemsPage(modelView, this._context, this._postgresModel);
 		const supportRequestPage = new PostgresSupportRequestPage(modelView);
 
@@ -49,7 +47,6 @@ export class PostgresDashboard extends Dashboard {
 			{
 				title: loc.supportAndTroubleshooting,
 				tabs: [
-					resourceHealthPage.tab,
 					diagnoseAndSolveProblemsPage.tab,
 					supportRequestPage.tab
 				]

extensions/arc/src/ui/dashboards/postgres/postgresDiagnoseAndSolveProblemsPage.ts

@@ -50,8 +50,9 @@ export class PostgresDiagnoseAndSolveProblemsPage extends DashboardPage {
 
 		this.disposables.push(
 			troubleshootButton.onDidClick(() => {
-				process.env['POSTGRES_SERVER_NAMESPACE'] = this._postgresModel.namespace;
-				process.env['POSTGRES_SERVER_NAME'] = this._postgresModel.name;
+				process.env['POSTGRES_SERVER_NAMESPACE'] = this._postgresModel.config?.metadata.namespace;
+				process.env['POSTGRES_SERVER_NAME'] = this._postgresModel.info.name;
+				// TODO set env POSTGRES_SERVER_VERSION
 				vscode.commands.executeCommand('bookTreeView.openBook', this._context.asAbsolutePath('notebooks/arcDataServices'), true, 'postgres/tsg100-troubleshoot-postgres');
 			}));
 

extensions/arc/src/ui/dashboards/postgres/postgresOverviewPage.ts

@@ -17,12 +17,10 @@ export class PostgresOverviewPage extends DashboardPage {
 	private propertiesLoading?: azdata.LoadingComponent;
 	private kibanaLoading?: azdata.LoadingComponent;
 	private grafanaLoading?: azdata.LoadingComponent;
-	private nodesTableLoading?: azdata.LoadingComponent;
 
 	private properties?: azdata.PropertiesContainerComponent;
 	private kibanaLink?: azdata.HyperlinkComponent;
 	private grafanaLink?: azdata.HyperlinkComponent;
-	private nodesTable?: azdata.DeclarativeTableComponent;
 
 	constructor(protected modelView: azdata.ModelView, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
 		super(modelView);
@@ -30,8 +28,7 @@ export class PostgresOverviewPage extends DashboardPage {
 		this.disposables.push(
 			this._controllerModel.onEndpointsUpdated(() => this.eventuallyRunOnInitialized(() => this.handleEndpointsUpdated())),
 			this._controllerModel.onRegistrationsUpdated(() => this.eventuallyRunOnInitialized(() => this.handleRegistrationsUpdated())),
-			this._postgresModel.onServiceUpdated(() => this.eventuallyRunOnInitialized(() => this.handleServiceUpdated())),
-			this._postgresModel.onPodsUpdated(() => this.eventuallyRunOnInitialized(() => this.handlePodsUpdated())));
+			this._postgresModel.onConfigUpdated(() => this.eventuallyRunOnInitialized(() => this.handleConfigUpdated())));
 	}
 
 	protected get title(): string {
@@ -60,7 +57,7 @@ export class PostgresOverviewPage extends DashboardPage {
 		this.propertiesLoading = this.modelView.modelBuilder.loadingComponent()
 			.withItem(this.properties)
 			.withProperties<azdata.LoadingComponentProperties>({
-				loading: !this._controllerModel.registrationsLastUpdated && !this._postgresModel.serviceLastUpdated && !this._postgresModel.podsLastUpdated
+				loading: !this._controllerModel.registrationsLastUpdated && !this._postgresModel.configLastUpdated
 			}).component();
 
 		content.addItem(this.propertiesLoading, { CSSStyles: cssStyles.text });
@@ -134,60 +131,8 @@ export class PostgresOverviewPage extends DashboardPage {
 				[loc.kibanaDashboard, this.kibanaLoading, loc.kibanaDashboardDescription],
 				[loc.grafanaDashboard, this.grafanaLoading, loc.grafanaDashboardDescription]]
 		}).component();
+
 		content.addItem(endpointsTable);
-
-		// Server group nodes
-		content.addItem(this.modelView.modelBuilder.text().withProperties<azdata.TextComponentProperties>({
-			value: loc.serverGroupNodes,
-			CSSStyles: titleCSS
-		}).component());
-
-		this.nodesTable = this.modelView.modelBuilder.declarativeTable().withProperties<azdata.DeclarativeTableProperties>({
-			width: '100%',
-			columns: [
-				{
-					displayName: loc.name,
-					valueType: azdata.DeclarativeDataType.string,
-					isReadOnly: true,
-					width: '30%',
-					headerCssStyles: cssStyles.tableHeader,
-					rowCssStyles: cssStyles.tableRow
-				},
-				{
-					displayName: loc.type,
-					valueType: azdata.DeclarativeDataType.string,
-					isReadOnly: true,
-					width: '15%',
-					headerCssStyles: cssStyles.tableHeader,
-					rowCssStyles: cssStyles.tableRow
-				},
-				{
-					displayName: loc.status,
-					valueType: azdata.DeclarativeDataType.string,
-					isReadOnly: true,
-					width: '20%',
-					headerCssStyles: cssStyles.tableHeader,
-					rowCssStyles: cssStyles.tableRow
-				},
-				{
-					displayName: loc.fullyQualifiedDomain,
-					valueType: azdata.DeclarativeDataType.string,
-					isReadOnly: true,
-					width: '35%',
-					headerCssStyles: cssStyles.tableHeader,
-					rowCssStyles: cssStyles.tableRow
-				}
-			],
-			data: this.getNodes()
-		}).component();
-
-		this.nodesTableLoading = this.modelView.modelBuilder.loadingComponent()
-			.withItem(this.nodesTable)
-			.withProperties<azdata.LoadingComponentProperties>({
-				loading: !this._postgresModel.serviceLastUpdated && !this._postgresModel.podsLastUpdated
-			}).component();
-
-		content.addItem(this.nodesTableLoading, { CSSStyles: { 'margin-bottom': '20px' } });
 		this.initialized = true;
 		return root;
 	}
@@ -205,11 +150,7 @@ export class PostgresOverviewPage extends DashboardPage {
 				try {
 					const password = await promptAndConfirmPassword(input => !input ? loc.enterANonEmptyPassword : '');
 					if (password) {
-						await this._postgresModel.update(s => {
-							// TODO chgagnon
-							// s.arc = s.arc ?? new DuskyObjectModelsDatabaseServiceArcPayload();
-							s.arc.servicePassword = password;
-						});
+						// TODO: azdata arc postgres server edit --admin-password
 						vscode.window.showInformationMessage(loc.passwordReset);
 					}
 				} catch (error) {
@@ -237,7 +178,7 @@ export class PostgresOverviewPage extends DashboardPage {
 					}
 					*/
 				} catch (error) {
-					vscode.window.showErrorMessage(loc.resourceDeletionFailed(this._postgresModel.fullName, error));
+					vscode.window.showErrorMessage(loc.resourceDeletionFailed(this._postgresModel.info.name, error));
 				} finally {
 					deleteButton.enabled = true;
 				}
@@ -256,7 +197,6 @@ export class PostgresOverviewPage extends DashboardPage {
 					this.propertiesLoading!.loading = true;
 					this.kibanaLoading!.loading = true;
 					this.grafanaLoading!.loading = true;
-					this.nodesTableLoading!.loading = true;
 
 					await Promise.all([
 						this._postgresModel.refresh(),
@@ -317,36 +257,18 @@ export class PostgresOverviewPage extends DashboardPage {
 	}
 
 	private getKibanaLink(): string {
-		const kibanaQuery = `kubernetes_namespace:"${this._postgresModel.namespace}" and custom_resource_name:"${this._postgresModel.name}"`;
+		const namespace = this._postgresModel.config?.metadata.namespace;
+		const kibanaQuery = `kubernetes_namespace:"${namespace}" and custom_resource_name:"${this._postgresModel.info.name}"`;
 		return `${this._controllerModel.getEndpoint(Endpoints.logsui)?.endpoint}/app/kibana#/discover?_a=(query:(language:kuery,query:'${kibanaQuery}'))`;
 
 	}
 
 	private getGrafanaLink(): string {
-		const grafanaQuery = `var-Namespace=${this._postgresModel.namespace}&var-Name=${this._postgresModel.name}`;
+		const namespace = this._postgresModel.config?.metadata.namespace;
+		const grafanaQuery = `var-Namespace=${namespace}&var-Name=${this._postgresModel.info.name}`;
 		return `${this._controllerModel.getEndpoint(Endpoints.metricsui)?.endpoint}/d/postgres-metrics?${grafanaQuery}`;
 	}
 
-	private getNodes(): string[][] {
-		/* TODO chgagnon
-		const endpoint: { ip?: string, port?: number } = this._postgresModel.endpoint;
-		return this._postgresModel.pods?.map((pod: V1Pod) => {
-			const name = pod.metadata?.name ?? '';
-			const role: PodRole | undefined = PostgresModel.getPodRole(pod);
-			const service = pod.metadata?.annotations?.['arcdata.microsoft.com/serviceHost'];
-			const internalDns = service ? `${name}.${service}` : '';
-
-			return [
-				name,
-				PostgresModel.getPodRoleName(role),
-				PostgresModel.getPodStatus(pod),
-				role === PodRole.Router ? `${endpoint.ip}:${endpoint.port}` : internalDns
-			];
-		}) ?? [];
-		*/
-		return [];
-	}
-
 	private handleEndpointsUpdated() {
 		this.kibanaLink!.label = this.getKibanaLink();
 		this.kibanaLink!.url = this.getKibanaLink();
@@ -362,19 +284,8 @@ export class PostgresOverviewPage extends DashboardPage {
 		this.propertiesLoading!.loading = false;
 	}
 
-	private handleServiceUpdated() {
+	private handleConfigUpdated() {
 		this.properties!.propertyItems = this.getProperties();
 		this.propertiesLoading!.loading = false;
-
-		this.nodesTable!.data = this.getNodes();
-		this.nodesTableLoading!.loading = false;
-	}
-
-	private handlePodsUpdated() {
-		this.properties!.propertyItems = this.getProperties();
-		this.propertiesLoading!.loading = false;
-
-		this.nodesTable!.data = this.getNodes();
-		this.nodesTableLoading!.loading = false;
 	}
 }

extensions/arc/src/ui/dashboards/postgres/postgresPropertiesPage.ts

@@ -19,7 +19,7 @@ export class PostgresPropertiesPage extends DashboardPage {
 	constructor(protected modelView: azdata.ModelView, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
 		super(modelView);
 
-		this.disposables.push(this._postgresModel.onServiceUpdated(
+		this.disposables.push(this._postgresModel.onConfigUpdated(
 			() => this.eventuallyRunOnInitialized(() => this.handleServiceUpdated())));
 
 		this.disposables.push(this._controllerModel.onRegistrationsUpdated(
@@ -54,7 +54,7 @@ export class PostgresPropertiesPage extends DashboardPage {
 		this.loading = this.modelView.modelBuilder.loadingComponent()
 			.withItem(this.keyValueContainer.container)
 			.withProperties<azdata.LoadingComponentProperties>({
-				loading: !this._postgresModel.serviceLastUpdated && !this._controllerModel.registrationsLastUpdated
+				loading: !this._postgresModel.configLastUpdated && !this._controllerModel.registrationsLastUpdated
 			}).component();
 
 		content.addItem(this.loading);

extensions/arc/src/ui/dashboards/postgres/postgresResourceHealthPage.ts

@@ -1,225 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  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 * as azdata from 'azdata';
-import * as loc from '../../../localizedConstants';
-import { IconPathHelper, cssStyles } from '../../../constants';
-import { DashboardPage } from '../../components/dashboardPage';
-import { PostgresModel } from '../../../models/postgresModel';
-import { fromNow } from '../../../common/date';
-
-export class PostgresResourceHealthPage extends DashboardPage {
-	private interval: NodeJS.Timeout;
-	private podsUpdated?: azdata.TextComponent;
-	private podsLoading?: azdata.LoadingComponent;
-	private conditionsLoading?: azdata.LoadingComponent;
-	private podsTable?: azdata.DeclarativeTableComponent;
-	private conditionsTable?: azdata.DeclarativeTableComponent;
-
-	constructor(protected modelView: azdata.ModelView, private _postgresModel: PostgresModel) {
-		super(modelView);
-
-		this.disposables.push(
-			modelView.onClosed(() => {
-				try { clearInterval(this.interval); }
-				catch { }
-			}));
-
-		this.disposables.push(this._postgresModel.onServiceUpdated(
-			() => this.eventuallyRunOnInitialized(() => this.handleServiceUpdated())));
-
-		// Keep the last updated timestamps up to date with the current time
-		this.interval = setInterval(() => this.handleServiceUpdated(), 60 * 1000);
-	}
-
-	protected get title(): string {
-		return loc.resourceHealth;
-	}
-
-	protected get id(): string {
-		return 'postgres-resource-health';
-	}
-
-	protected get icon(): { dark: string; light: string; } {
-		return IconPathHelper.health;
-	}
-
-	protected get container(): azdata.Component {
-		const root = this.modelView.modelBuilder.divContainer().component();
-		const content = this.modelView.modelBuilder.divContainer().component();
-		root.addItem(content, { CSSStyles: { 'margin': '20px' } });
-
-		content.addItem(this.modelView.modelBuilder.text().withProperties<azdata.TextComponentProperties>({
-			value: loc.resourceHealth,
-			CSSStyles: { ...cssStyles.title, 'margin-bottom': '30px' }
-		}).component());
-
-		content.addItem(this.modelView.modelBuilder.text().withProperties<azdata.TextComponentProperties>({
-			value: loc.podOverview,
-			CSSStyles: { ...cssStyles.title, 'margin-block-end': '0' }
-		}).component());
-
-		this.podsUpdated = this.modelView.modelBuilder.text().withProperties<azdata.TextComponentProperties>({
-			value: this.getPodsLastUpdated(),
-			CSSStyles: { ...cssStyles.text, 'font-size': '12px', 'margin-block-start': '0' }
-		}).component();
-
-		content.addItem(this.podsUpdated);
-
-		// Pod overview
-		this.podsTable = this.modelView.modelBuilder.declarativeTable().withProperties<azdata.DeclarativeTableProperties>({
-			columns: [
-				{
-					displayName: '',
-					valueType: azdata.DeclarativeDataType.string,
-					width: '35%',
-					isReadOnly: true,
-					headerCssStyles: cssStyles.tableHeader,
-					rowCssStyles: { ...cssStyles.tableRow, 'font-size': '20px', 'font-weight': 'bold', 'padding': '7px' }
-				},
-				{
-					displayName: '',
-					valueType: azdata.DeclarativeDataType.string,
-					width: '65%',
-					isReadOnly: true,
-					headerCssStyles: cssStyles.tableHeader,
-					rowCssStyles: { ...cssStyles.tableRow, 'padding': '7px' }
-				}
-			],
-			data: this.getPodsTable()
-		}).component();
-
-		this.podsLoading = this.modelView.modelBuilder.loadingComponent()
-			.withItem(this.podsTable)
-			.withProperties<azdata.LoadingComponentProperties>({
-				loading: !this._postgresModel.serviceLastUpdated
-			}).component();
-
-		content.addItem(this.podsLoading, { CSSStyles: { 'margin-bottom': '30px' } });
-
-		// Conditions table
-		this.conditionsTable = this.modelView.modelBuilder.declarativeTable().withProperties<azdata.DeclarativeTableProperties>({
-			width: '100%',
-			columns: [
-				{
-					displayName: loc.condition,
-					valueType: azdata.DeclarativeDataType.string,
-					width: '15%',
-					isReadOnly: true,
-					headerCssStyles: cssStyles.tableHeader,
-					rowCssStyles: cssStyles.tableRow
-				},
-				{
-					displayName: '',
-					valueType: azdata.DeclarativeDataType.component,
-					width: '1%',
-					isReadOnly: true,
-					headerCssStyles: cssStyles.tableHeader,
-					rowCssStyles: cssStyles.tableRow
-				},
-				{
-					displayName: loc.details,
-					valueType: azdata.DeclarativeDataType.string,
-					width: '64%',
-					isReadOnly: true,
-					headerCssStyles: cssStyles.tableHeader,
-					rowCssStyles: cssStyles.tableRow
-				},
-				{
-					displayName: loc.lastUpdated,
-					valueType: azdata.DeclarativeDataType.string,
-					width: '20%',
-					isReadOnly: true,
-					headerCssStyles: cssStyles.tableHeader,
-					rowCssStyles: { ...cssStyles.tableRow, 'white-space': 'nowrap' }
-				}
-			],
-			data: this.getConditionsTable()
-		}).component();
-
-		this.conditionsLoading = this.modelView.modelBuilder.loadingComponent()
-			.withItem(this.conditionsTable)
-			.withProperties<azdata.LoadingComponentProperties>({
-				loading: !this._postgresModel.serviceLastUpdated
-			}).component();
-
-		content.addItem(this.conditionsLoading);
-		this.initialized = true;
-		return root;
-	}
-
-	protected get toolbarContainer(): azdata.ToolbarContainer {
-		const refreshButton = this.modelView.modelBuilder.button().withProperties<azdata.ButtonProperties>({
-			label: loc.refresh,
-			iconPath: IconPathHelper.refresh
-		}).component();
-
-		this.disposables.push(
-			refreshButton.onDidClick(async () => {
-				refreshButton.enabled = false;
-				try {
-					this.podsLoading!.loading = true;
-					this.conditionsLoading!.loading = true;
-					await this._postgresModel.refresh();
-				} catch (error) {
-					vscode.window.showErrorMessage(loc.refreshFailed(error));
-				} finally {
-					refreshButton.enabled = true;
-				}
-			}));
-
-		return this.modelView.modelBuilder.toolbarContainer().withToolbarItems([
-			{ component: refreshButton }
-		]).component();
-	}
-
-	private getPodsLastUpdated(): string {
-		return this._postgresModel.serviceLastUpdated
-			? loc.updated(fromNow(this._postgresModel.serviceLastUpdated!, true)) : '';
-	}
-
-	private getPodsTable(): (string | number)[][] {
-		return [
-			[this._postgresModel.service?.status?.podsRunning ?? 0, loc.running],
-			[this._postgresModel.service?.status?.podsPending ?? 0, loc.pending],
-			[this._postgresModel.service?.status?.podsFailed ?? 0, loc.failed],
-			[this._postgresModel.service?.status?.podsUnknown ?? 0, loc.unknown]
-		];
-	}
-
-	private getConditionsTable(): (string | azdata.ImageComponent)[][] {
-		/* TODO chgagnon
-		return this._postgresModel.service?.status?.conditions?.map(c => {
-			const healthy = c.type === 'Ready' ? c.status === 'True' : c.status === 'False';
-
-			const image = this.modelView.modelBuilder.image().withProperties<azdata.ImageComponentProperties>({
-				iconPath: healthy ? IconPathHelper.success : IconPathHelper.fail,
-				iconHeight: '20px',
-				iconWidth: '20px',
-				width: '20px',
-				height: '20px'
-			}).component();
-
-			return [
-				c.type ?? '',
-				image,
-				c.message ?? '',
-				c.lastTransitionTime ? fromNow(c.lastTransitionTime!, true) : ''
-			];
-		}) ?? [];
-		*/
-		return [];
-	}
-
-	private handleServiceUpdated() {
-		this.podsUpdated!.value = this.getPodsLastUpdated();
-		this.podsTable!.data = this.getPodsTable();
-		this.podsLoading!.loading = false;
-
-		this.conditionsTable!.data = this.getConditionsTable();
-		this.conditionsLoading!.loading = false;
-	}
-}

extensions/arc/src/ui/tree/controllerTreeNode.ts

@@ -5,7 +5,7 @@
 
 import { ResourceInfo, ResourceType } from 'arc';
 import * as vscode from 'vscode';
-import { parseInstanceName, UserCancelledError } from '../../common/utils';
+import { UserCancelledError } from '../../common/utils';
 import * as loc from '../../localizedConstants';
 import { ControllerModel, Registration } from '../../models/controllerModel';
 import { MiaaModel } from '../../models/miaaModel';
@@ -83,7 +83,7 @@ export class ControllerTreeNode extends TreeNode {
 			}
 
 			const resourceInfo: ResourceInfo = {
-				name: parseInstanceName(registration.instanceName),
+				name: registration.instanceName,
 				resourceType: registration.instanceType ?? ''
 			};
 
@@ -100,7 +100,7 @@ export class ControllerTreeNode extends TreeNode {
 
 				switch (registration.instanceType) {
 					case ResourceType.postgresInstances:
-						const postgresModel = new PostgresModel(resourceInfo, registration);
+						const postgresModel = new PostgresModel(this.model, resourceInfo, registration);
 						node = new PostgresTreeNode(postgresModel, this.model, this._context);
 						break;
 					case ResourceType.sqlManagedInstances:

extensions/arc/src/ui/tree/postgresTreeNode.ts

@@ -16,7 +16,7 @@ import { ResourceTreeNode } from './resourceTreeNode';
 export class PostgresTreeNode extends ResourceTreeNode {
 
 	constructor(private _model: PostgresModel, private _controllerModel: ControllerModel, private _context: vscode.ExtensionContext) {
-		super(_model.name, vscode.TreeItemCollapsibleState.None, ResourceType.postgresInstances, _model);
+		super(_model.info.name, vscode.TreeItemCollapsibleState.None, ResourceType.postgresInstances, _model);
 	}
 
 	public async openDashboard(): Promise<void> {