From 86b3eaee5a9dbfd8c1cbe010243c2b8c0ce4f075 Mon Sep 17 00:00:00 2001
From: Christopher Suh <chsuh@microsoft.com>
Date: Mon, 18 Sep 2023 15:01:24 -0700
Subject: [PATCH] Remove deprecated azure graph endpoints (#24460)

* remove deprecated azure graph endpoints

* cleanup enums

* cleanup ProviderSettingsJson: remove graphResource

* change enums back
---
 .../src/account-provider/auths/azureAuth.ts       |  3 +--
 .../azurecore/src/account-provider/interfaces.ts  |  2 --
 .../src/account-provider/providerSettings.ts      | 15 ---------------
 extensions/azurecore/src/azurecore.d.ts           |  5 -----
 extensions/azurecore/src/utils.ts                 |  5 -----
 src/sql/azdata.d.ts                               |  5 +----
 src/sql/workbench/api/common/sqlExtHostTypes.ts   |  2 +-
 7 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/extensions/azurecore/src/account-provider/auths/azureAuth.ts b/extensions/azurecore/src/account-provider/auths/azureAuth.ts
index 8cc77238c2..6d40c49699 100644
--- a/extensions/azurecore/src/account-provider/auths/azureAuth.ts
+++ b/extensions/azurecore/src/account-provider/auths/azureAuth.ts
@@ -68,8 +68,7 @@ export abstract class AzureAuth implements vscode.Disposable {
 		this.redirectUri = this.metadata.settings.redirectUri;
 		this.clientId = this.metadata.settings.clientId;
 		this.resources = [
-			this.metadata.settings.armResource,
-			this.metadata.settings.graphResource,
+			this.metadata.settings.armResource
 		];
 		if (this.metadata.settings.sqlResource) {
 			this.resources.push(this.metadata.settings.sqlResource);
diff --git a/extensions/azurecore/src/account-provider/interfaces.ts b/extensions/azurecore/src/account-provider/interfaces.ts
index b028a7dc59..21c5e45983 100644
--- a/extensions/azurecore/src/account-provider/interfaces.ts
+++ b/extensions/azurecore/src/account-provider/interfaces.ts
@@ -7,7 +7,6 @@ import * as azurecore from 'azurecore';
 
 export const enum SettingIds {
 	marm = 'marm',
-	graph = 'graph',
 	msgraph = 'msgraph',
 	arm = 'arm',
 	sql = 'sql',
@@ -49,7 +48,6 @@ export type ProviderSettingsJson = {
 				host: string,
 				clientId: string,
 				microsoftResource: string,
-				graphResource: string,
 				msGraphResource?: string,
 				armResource: string,
 				sqlResource: string,
diff --git a/extensions/azurecore/src/account-provider/providerSettings.ts b/extensions/azurecore/src/account-provider/providerSettings.ts
index e7dca9adc4..141f5e618b 100644
--- a/extensions/azurecore/src/account-provider/providerSettings.ts
+++ b/extensions/azurecore/src/account-provider/providerSettings.ts
@@ -23,11 +23,6 @@ const publicAzureSettings: ProviderSettings = {
 				endpoint: 'https://management.core.windows.net/',
 				azureResourceId: AzureResource.MicrosoftResourceManagement
 			},
-			graphResource: {
-				id: SettingIds.graph,
-				endpoint: 'https://graph.windows.net/',
-				azureResourceId: AzureResource.Graph
-			},
 			msGraphResource: {
 				id: SettingIds.msgraph,
 				endpoint: 'https://graph.microsoft.com/',
@@ -103,11 +98,6 @@ const usGovAzureSettings: ProviderSettings = {
 				endpoint: 'https://management.core.usgovcloudapi.net/',
 				azureResourceId: AzureResource.MicrosoftResourceManagement
 			},
-			graphResource: {
-				id: SettingIds.graph,
-				endpoint: 'https://graph.windows.net/',
-				azureResourceId: AzureResource.Graph
-			},
 			msGraphResource: {
 				id: SettingIds.msgraph,
 				endpoint: 'https://graph.microsoft.us/',
@@ -177,11 +167,6 @@ const chinaAzureSettings: ProviderSettings = {
 				endpoint: 'https://management.core.chinacloudapi.cn/',
 				azureResourceId: AzureResource.MicrosoftResourceManagement
 			},
-			graphResource: {
-				id: SettingIds.graph,
-				endpoint: 'https://graph.chinacloudapi.cn',
-				azureResourceId: AzureResource.Graph
-			},
 			msGraphResource: {
 				id: SettingIds.msgraph,
 				endpoint: 'https://microsoftgraph.chinacloudapi.cn',
diff --git a/extensions/azurecore/src/azurecore.d.ts b/extensions/azurecore/src/azurecore.d.ts
index 5646c72164..ee7cddae7e 100644
--- a/extensions/azurecore/src/azurecore.d.ts
+++ b/extensions/azurecore/src/azurecore.d.ts
@@ -93,11 +93,6 @@ declare module 'azurecore' {
 		 */
 		microsoftResource: Resource
 
-		/**
-		 * Information that describes the AAD graph resource
-		 */
-		graphResource: Resource;
-
 		/**
 		 * Information that describes the MS graph resource
 		 */
diff --git a/extensions/azurecore/src/utils.ts b/extensions/azurecore/src/utils.ts
index a88c9c7a27..8a564df27e 100644
--- a/extensions/azurecore/src/utils.ts
+++ b/extensions/azurecore/src/utils.ts
@@ -217,11 +217,6 @@ function buildCustomCloudProviderSettings(customProvider: ProviderSettingsJson):
 					endpoint: customProvider.settings.metadata.endpoints.armResource,
 					azureResourceId: AzureResource.ResourceManagement
 				},
-				graphResource: {
-					id: SettingIds.graph,
-					endpoint: customProvider.settings.metadata.endpoints.graphResource,
-					azureResourceId: AzureResource.Graph
-				},
 				azureStorageResource: {
 					id: SettingIds.storage,
 					endpoint: customProvider.settings.metadata.endpoints.azureStorageResource.endpoint,
diff --git a/src/sql/azdata.d.ts b/src/sql/azdata.d.ts
index b4a5967fc3..d096906d93 100644
--- a/src/sql/azdata.d.ts
+++ b/src/sql/azdata.d.ts
@@ -2524,10 +2524,7 @@ declare module 'azdata' {
 		 * Azure Key Vault
 		 */
 		AzureKeyVault = 3,
-		/**
-		 * Azure AD Graph
-		 */
-		Graph = 4,
+		// 4 (formerly Azure Graph) is no longer used.
 		/**
 		 * Microsoft Resource Management
 		 */
diff --git a/src/sql/workbench/api/common/sqlExtHostTypes.ts b/src/sql/workbench/api/common/sqlExtHostTypes.ts
index 5f3a12ae4c..74c0407758 100644
--- a/src/sql/workbench/api/common/sqlExtHostTypes.ts
+++ b/src/sql/workbench/api/common/sqlExtHostTypes.ts
@@ -476,7 +476,7 @@ export enum AzureResource {
 	Sql = 1,
 	OssRdbms = 2,
 	AzureKeyVault = 3,
-	Graph = 4,
+	// 4 (formerly Azure Graph) is no longer used.
 	MicrosoftResourceManagement = 5,
 	AzureDevOps = 6,
 	MsGraph = 7,