Enable support for PGSQL Flexible Servers (#23300)

extensions/azurecore/src/azureDataGridProvider.ts

@@ -21,6 +21,7 @@ const typesClause = [
 	azureResource.AzureResourceType.sqlSynapseSqlPool,
 	azureResource.AzureResourceType.sqlManagedInstance,
 	azureResource.AzureResourceType.postgresServer,
+	azureResource.AzureResourceType.postgresFlexibleServer,
 	azureResource.AzureResourceType.azureArcService,
 	azureResource.AzureResourceType.azureArcSqlManagedInstance,
 	azureResource.AzureResourceType.azureArcPostgresServer

extensions/azurecore/src/azureResource/constants.ts

@@ -42,6 +42,7 @@ export enum AzureResourcePrefixes {
 	kusto = 'Kusto_',
 	mySqlFlexibleServer = 'mySqlFlexibleServer_',
 	postgresServerArc = 'postgresServerArc_',
+	postgresFlexibleServer = 'postgresFlexibleServer_',
 	postgresServer = 'postgresServer_',
 	sqlInstance = 'sqlInstance_',
 	sqlInstanceArc = 'sqlInstanceArc_',

extensions/azurecore/src/azureResource/providers/mysqlFlexibleServer/mysqlFlexibleServerTreeDataProvider.ts

@@ -16,7 +16,7 @@ import { Account, ExtensionNodeType, TreeItem, connection } from 'azdata';
 
 export class MysqlFlexibleServerTreeDataProvider extends ResourceTreeDataProviderBase<GraphData, DbServerGraphData> {
 	private static readonly CONTAINER_ID = 'azure.resource.providers.databaseServer.treeDataProvider.mysqlFlexibleServerContainer';
-	private static readonly CONTAINER_LABEL = localize('azure.resource.providers.databaseServer.treeDataProvider.mysqlFlexibleServerContainerLabel', "Azure Database for MySQL Flexible server");
+	private static readonly CONTAINER_LABEL = localize('azure.resource.providers.databaseServer.treeDataProvider.mysqlFlexibleServerContainerLabel', "Azure Database for MySQL flexible servers");
 
 	public constructor(
 		databaseServerService: azureResource.IAzureResourceService,

extensions/azurecore/src/azureResource/providers/postgresFlexibleServer/postgresFlexibleServerService.ts

@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+import { ResourceServiceBase } from '../resourceTreeDataProviderBase';
+import { azureResource } from 'azurecore';
+import { postgresFlexibleServerQuery } from '../queryStringConstants';
+import { DbServerGraphData } from '../../interfaces';
+import { POSTGRES_FLEXIBLE_SERVER_PROVIDER_ID } from '../../../constants';
+
+export class PostgresFlexibleServerService extends ResourceServiceBase<DbServerGraphData> {
+
+	public override queryFilter: string = postgresFlexibleServerQuery;
+
+	public override convertServerResource(resource: DbServerGraphData): azureResource.AzureResourceDatabaseServer | undefined {
+		return {
+			id: resource.id,
+			name: resource.name,
+			provider: POSTGRES_FLEXIBLE_SERVER_PROVIDER_ID,
+			fullName: resource.properties.fullyQualifiedDomainName,
+			loginName: resource.properties.administratorLogin,
+			defaultDatabaseName: 'postgres',
+			subscription: {
+				id: resource.subscriptionId,
+				name: resource.subscriptionName || ''
+			},
+			tenant: resource.tenantId,
+			resourceGroup: resource.resourceGroup
+		};
+	}
+}

extensions/azurecore/src/azureResource/providers/postgresFlexibleServer/postgresFlexibleServerTreeDataProvider.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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ExtensionNodeType, TreeItem, connection } from 'azdata';
+import { TreeItemCollapsibleState, ExtensionContext } from 'vscode';
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
+
+import { AzureResourceItemType, AzureResourcePrefixes, pgsqlProvider } from '../../constants';
+import { generateGuid } from '../../utils';
+import { GraphData, DbServerGraphData } from '../../interfaces';
+import { ResourceTreeDataProviderBase } from '../resourceTreeDataProviderBase';
+import { AzureAccount, azureResource } from 'azurecore';
+
+export class PostgresFlexibleServerTreeDataProvider extends ResourceTreeDataProviderBase<GraphData, DbServerGraphData> {
+	private static readonly containerId = 'azure.resource.providers.databaseServer.treeDataProvider.postgresFlexibleServerContainer';
+	private static readonly containerLabel = localize('azure.resource.providers.databaseServer.treeDataProvider.postgresFlexibleServerContainerLabel', "Azure Database for PostgreSQL flexible servers");
+
+	public constructor(
+		databaseServerService: azureResource.IAzureResourceService,
+		private _extensionContext: ExtensionContext
+	) {
+		super(databaseServerService);
+	}
+
+	public getTreeItemForResource(databaseServer: azureResource.AzureResourceDatabaseServer, account: AzureAccount): TreeItem {
+		return {
+			id: `${AzureResourcePrefixes.postgresFlexibleServer}${account.key.accountId}${databaseServer.id ?? databaseServer.name}`,
+			label: this.browseConnectionMode ? `${databaseServer.name} (${PostgresFlexibleServerTreeDataProvider.containerLabel}, ${databaseServer.subscription.name})` : databaseServer.name,
+			iconPath: {
+				dark: this._extensionContext.asAbsolutePath('resources/dark/sql_server_inverse.svg'),
+				light: this._extensionContext.asAbsolutePath('resources/light/sql_server.svg')
+			},
+			collapsibleState: this.browseConnectionMode ? TreeItemCollapsibleState.None : TreeItemCollapsibleState.Collapsed,
+			contextValue: AzureResourceItemType.databaseServer,
+			payload: {
+				id: generateGuid(),
+				connectionName: undefined,
+				serverName: databaseServer.fullName,
+				databaseName: databaseServer.defaultDatabaseName,
+				userName: `${databaseServer.loginName}@${databaseServer.fullName}`,
+				password: '',
+				authenticationType: connection.AuthenticationType.SqlLogin,
+				savePassword: true,
+				groupFullName: '',
+				groupId: '',
+				providerName: pgsqlProvider,
+				saveProfile: false,
+				options: {
+					// Set default for SSL or will get error complaining about it not being set correctly
+					'sslmode': 'require'
+				},
+				azureAccount: account.key.accountId,
+				azureTenantId: databaseServer.tenant,
+				azureResourceId: databaseServer.id,
+				azurePortalEndpoint: account.properties.providerSettings.settings.portalEndpoint
+			},
+			childProvider: pgsqlProvider,
+			type: ExtensionNodeType.Server
+		};
+	}
+
+	public async getRootChildren(): Promise<TreeItem[]> {
+		return [{
+			id: PostgresFlexibleServerTreeDataProvider.containerId,
+			label: PostgresFlexibleServerTreeDataProvider.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
+		}];
+	}
+}

extensions/azurecore/src/azureResource/providers/postgresServer/postgresServerTreeDataProvider.ts

@@ -16,7 +16,7 @@ import { AzureAccount, azureResource } from 'azurecore';
 
 export class PostgresServerTreeDataProvider extends ResourceTreeDataProviderBase<GraphData, DbServerGraphData> {
 	private static readonly containerId = 'azure.resource.providers.databaseServer.treeDataProvider.postgresServerContainer';
-	private static readonly containerLabel = localize('azure.resource.providers.databaseServer.treeDataProvider.postgresServerContainerLabel', "Azure Database for PostgreSQL server");
+	private static readonly containerLabel = localize('azure.resource.providers.databaseServer.treeDataProvider.postgresServerContainerLabel', "Azure Database for PostgreSQL servers");
 
 	public constructor(
 		databaseServerService: azureResource.IAzureResourceService,

extensions/azurecore/src/azureResource/providers/queryStringConstants.ts

@@ -48,6 +48,11 @@ export const resourceGroupQuery = `ResourceContainers | where type=="${azureReso
  */
 export const postgresServerQuery = `type == "${azureResource.AzureResourceType.postgresServer}"`;
 
+/**
+ * Lists all postgreSQL flexible servers
+ */
+export const postgresFlexibleServerQuery = `type == "${azureResource.AzureResourceType.postgresFlexibleServer}"`;
+
 /**
  * Lists all Azure Arc PostgreSQL servers
  */

extensions/azurecore/src/azureResource/providers/universal/universalService.ts

@@ -13,8 +13,8 @@ import * as nls from 'vscode-nls';
 import { AzureResourcePrefixes, ResourceCategory, analyticsKind, mongoDbKind } from '../../constants';
 import {
 	COSMOSDB_MONGO_PROVIDER_ID, DATABASE_PROVIDER_ID, DATABASE_SERVER_PROVIDER_ID, KUSTO_PROVIDER_ID, AZURE_MONITOR_PROVIDER_ID,
-	MYSQL_FLEXIBLE_SERVER_PROVIDER_ID, POSTGRES_SERVER_PROVIDER_ID, POSTGRES_ARC_SERVER_PROVIDER_ID, SQLINSTANCE_PROVIDER_ID,
-	SQLINSTANCE_ARC_PROVIDER_ID, SYNAPSE_SQL_POOL_PROVIDER_ID, SYNAPSE_WORKSPACE_PROVIDER_ID
+	MYSQL_FLEXIBLE_SERVER_PROVIDER_ID, POSTGRES_FLEXIBLE_SERVER_PROVIDER_ID, POSTGRES_SERVER_PROVIDER_ID, POSTGRES_ARC_SERVER_PROVIDER_ID,
+	SQLINSTANCE_PROVIDER_ID, SQLINSTANCE_ARC_PROVIDER_ID, SYNAPSE_SQL_POOL_PROVIDER_ID, SYNAPSE_WORKSPACE_PROVIDER_ID
 } from '../../../constants';
 import { Logger } from '../../../utils/Logger';
 
@@ -91,6 +91,8 @@ export class AzureResourceUniversalService implements azureResource.IAzureResour
 			return [this.getRegisteredTreeDataProviderInstance(AZURE_MONITOR_PROVIDER_ID), ResourceCategory.Server];
 		} else if (type === azureResource.AzureResourceType.mysqlFlexibleServer) {
 			return [this.getRegisteredTreeDataProviderInstance(MYSQL_FLEXIBLE_SERVER_PROVIDER_ID), ResourceCategory.Server];
+		} else if (type === azureResource.AzureResourceType.postgresFlexibleServer) {
+			return [this.getRegisteredTreeDataProviderInstance(POSTGRES_FLEXIBLE_SERVER_PROVIDER_ID), ResourceCategory.Server];
 		} else if (type === azureResource.AzureResourceType.postgresServer) {
 			return [this.getRegisteredTreeDataProviderInstance(POSTGRES_SERVER_PROVIDER_ID), ResourceCategory.Server];
 		} else if (type === azureResource.AzureResourceType.azureArcPostgresServer) {
@@ -121,6 +123,8 @@ export class AzureResourceUniversalService implements azureResource.IAzureResour
 			return this.getRegisteredTreeDataProviderInstance(AZURE_MONITOR_PROVIDER_ID);
 		} else if (id.startsWith(AzureResourcePrefixes.mySqlFlexibleServer)) {
 			return this.getRegisteredTreeDataProviderInstance(MYSQL_FLEXIBLE_SERVER_PROVIDER_ID);
+		} else if (id.startsWith(AzureResourcePrefixes.postgresFlexibleServer)) {
+			return this.getRegisteredTreeDataProviderInstance(POSTGRES_FLEXIBLE_SERVER_PROVIDER_ID);
 		} else if (id.startsWith(AzureResourcePrefixes.postgresServer)) {
 			return this.getRegisteredTreeDataProviderInstance(POSTGRES_SERVER_PROVIDER_ID);
 		} else if (id.startsWith(AzureResourcePrefixes.postgresServerArc)) {

extensions/azurecore/src/azureResource/utils.ts

@@ -48,6 +48,8 @@ import { AzureResourceSynapseService } from './providers/synapseSqlPool/synapseS
 import { AzureResourceSynapseSqlPoolTreeDataProvider } from './providers/synapseSqlPool/synapseSqlPoolTreeDataProvider';
 import { AzureResourceSynapseWorkspaceService } from './providers/synapseWorkspace/synapseWorkspaceService';
 import { AzureResourceSynapseWorkspaceTreeDataProvider } from './providers/synapseWorkspace/synapseWorkspaceTreeDataProvider';
+import { PostgresFlexibleServerTreeDataProvider } from './providers/postgresFlexibleServer/postgresFlexibleServerTreeDataProvider';
+import { PostgresFlexibleServerService } from './providers/postgresFlexibleServer/postgresFlexibleServerService';
 
 const localize = nls.loadMessageBundle();
 
@@ -268,6 +270,7 @@ export function getAllResourceProviders(extensionContext: vscode.ExtensionContex
 		new ResourceProvider(Constants.DATABASE_SERVER_PROVIDER_ID, new AzureResourceDatabaseServerTreeDataProvider(new AzureResourceDatabaseServerService(), extensionContext)),
 		new ResourceProvider(Constants.KUSTO_PROVIDER_ID, new KustoTreeDataProvider(new KustoResourceService(), extensionContext)),
 		new ResourceProvider(Constants.MYSQL_FLEXIBLE_SERVER_PROVIDER_ID, new MysqlFlexibleServerTreeDataProvider(new MysqlFlexibleServerService(), extensionContext)),
+		new ResourceProvider(Constants.POSTGRES_FLEXIBLE_SERVER_PROVIDER_ID, new PostgresFlexibleServerTreeDataProvider(new PostgresFlexibleServerService(), extensionContext)),
 		new ResourceProvider(Constants.POSTGRES_SERVER_PROVIDER_ID, new PostgresServerTreeDataProvider(new PostgresServerService(), extensionContext)),
 		new ResourceProvider(Constants.SQLINSTANCE_PROVIDER_ID, new SqlInstanceTreeDataProvider(new SqlInstanceResourceService(), extensionContext)),
 		new ResourceProvider(Constants.SYNAPSE_SQL_POOL_PROVIDER_ID, new AzureResourceSynapseSqlPoolTreeDataProvider(new AzureResourceSynapseService(), extensionContext)),

extensions/azurecore/src/azurecore.d.ts

@@ -378,6 +378,7 @@ declare module 'azurecore' {
 			kustoClusters = 'microsoft.kusto/clusters',
 			azureArcPostgresServer = 'microsoft.azuredata/postgresinstances',
 			postgresServer = 'microsoft.dbforpostgresql/servers',
+			postgresFlexibleServer = 'microsoft.dbforpostgresql/flexibleservers',
 			azureArcService = 'microsoft.azuredata/datacontrollers',
 			storageAccount = 'microsoft.storage/storageaccounts',
 			logAnalytics = 'microsoft.operationalinsights/workspaces',

extensions/azurecore/src/constants.ts

@@ -143,6 +143,7 @@ export const DATABASE_SERVER_PROVIDER_ID = 'azure.resource.providers.databaseSer
 export const KUSTO_PROVIDER_ID = 'azure.resource.providers.azureDataExplorer';
 export const MYSQL_FLEXIBLE_SERVER_PROVIDER_ID = 'azure.resource.providers.mysqlFlexibleServer';
 export const POSTGRES_ARC_SERVER_PROVIDER_ID = 'azure.resource.providers.postgresArcServer';
+export const POSTGRES_FLEXIBLE_SERVER_PROVIDER_ID = 'azure.resource.providers.postgresFlexibleServer';
 export const POSTGRES_SERVER_PROVIDER_ID = 'azure.resource.providers.postgresServer';
 export const SQLINSTANCE_PROVIDER_ID = 'azure.resource.providers.sqlInstance';
 export const SQLINSTANCE_ARC_PROVIDER_ID = 'azure.resource.providers.sqlInstanceArc';

extensions/azurecore/src/localizedConstants.ts

@@ -74,7 +74,8 @@ export const dismiss = localize('azurecore.dismiss', 'Dismiss');
 // Azure Resource Types
 export const sqlServer = localize('azurecore.sqlServer', "SQL server");
 export const sqlDatabase = localize('azurecore.sqlDatabase', "SQL database");
-export const postgresServer = localize('azurecore.postgresServer', "Azure Database for PostgreSQL server");
+export const postgresServer = localize('azurecore.postgresServer', "Azure Database for PostgreSQL servers");
+export const postgresFlexibleServer = localize('azurecore.postgresFlexibleServer', "Azure Database for PostgreSQL flexible servers");
 export const sqlManagedInstance = localize('azurecore.sqlManagedInstance', "SQL managed instance");
 export const azureArcsqlManagedInstance = localize('azurecore.azureArcsqlManagedInstance', "SQL managed instance - Azure Arc");
 export const azureArcService = localize('azurecore.azureArcService', "Data Service - Azure Arc");

extensions/azurecore/src/utils.ts

@@ -127,6 +127,8 @@ export function getResourceTypeDisplayName(type: string): string {
 			return loc.sqlManagedInstance;
 		case azureResource.AzureResourceType.postgresServer:
 			return loc.postgresServer;
+		case azureResource.AzureResourceType.postgresFlexibleServer:
+			return loc.postgresFlexibleServer;
 		case azureResource.AzureResourceType.azureArcSqlManagedInstance:
 			return loc.azureArcsqlManagedInstance;
 		case azureResource.AzureResourceType.azureArcService: