Remove deprecated azure graph endpoints (#24460)

* remove deprecated azure graph endpoints

* cleanup enums

* cleanup ProviderSettingsJson: remove graphResource

* change enums back
This commit is contained in:
Christopher Suh
2023-09-18 15:01:24 -07:00
committed by GitHub
parent f938b436b6
commit 86b3eaee5a
7 changed files with 3 additions and 34 deletions

View File

@@ -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);

View File

@@ -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,

View File

@@ -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',

View File

@@ -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
*/

View File

@@ -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,