ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

China / Germany Cloud Fix (#15746)

Browse Source 
* Added missing resources to chinaAzureSettings and germanyAzureSettings in providerSettings

* Update providerSettings.ts

* Fixed typo in mooncake armResource

* Fixed host for China Cloud in ProviderSettings
This commit is contained in:
Justin M
2021-07-27 10:24:15 -07:00
committed by GitHub
parent f01e9e2fc0
commit f8da3cc32a
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/azurecore/src/account-provider/providerSettings.ts
View File

@@ -220,7 +220,12 @@ const germanyAzureSettings: ProviderSettings = {
endpoint: 'https://vault.microsoftazure.de', endpoint: 'https://vault.microsoftazure.de',
azureResourceId: AzureResource.AzureKeyVault azureResourceId: AzureResource.AzureKeyVault
}, },
redirectUri: 'https://vscode-redirect.azurewebsites.net/' redirectUri: 'https://vscode-redirect.azurewebsites.net/',
scopes: [
'openid', 'email', 'profile', 'offline_access',
'https://management.microsoftazure.de/user_impersonation'
],
portalEndpoint: 'https://portal.microsoftazure.de/'
} }
} }
}; };
@@ -231,8 +236,13 @@ const chinaAzureSettings: ProviderSettings = {
displayName: localize('chinaCloudDisplayName', "Azure (China)"), displayName: localize('chinaCloudDisplayName', "Azure (China)"),
id: 'azure_chinaCloud', id: 'azure_chinaCloud',
settings: { settings: {
host: 'https://login.chinacloudapi.cn/', host: 'https://login.partner.microsoftonline.cn/',
clientId: 'a69788c6-1d43-44ed-9ca3-b83e194da255', clientId: 'a69788c6-1d43-44ed-9ca3-b83e194da255',
microsoftResource: {
id: SettingIds.marm,
endpoint: 'https://management.core.chinacloudapi.cn/',
azureResourceId: AzureResource.MicrosoftResourceManagement
},
graphResource: { graphResource: {
id: SettingIds.graph, id: SettingIds.graph,
endpoint: 'https://graph.chinacloudapi.cn', endpoint: 'https://graph.chinacloudapi.cn',
@@ -245,9 +255,14 @@ const chinaAzureSettings: ProviderSettings = {
}, },
armResource: { armResource: {
id: SettingIds.arm, id: SettingIds.arm,
endpoint: 'https://managemement.chinacloudapi.net', endpoint: 'https://management.chinacloudapi.cn',
azureResourceId: AzureResource.ResourceManagement azureResourceId: AzureResource.ResourceManagement
}, },
sqlResource: {
id: SettingIds.sql,
endpoint: 'https://database.chinacloudapi.cn/',
azureResourceId: AzureResource.Sql
},
azureKeyVaultResource: { azureKeyVaultResource: {
id: SettingIds.vault, id: SettingIds.vault,
endpoint: 'https://vault.azure.cn', endpoint: 'https://vault.azure.cn',
@@ -258,8 +273,12 @@ const chinaAzureSettings: ProviderSettings = {
endpoint: 'https://api.loganalytics.azure.cn', endpoint: 'https://api.loganalytics.azure.cn',
azureResourceId: AzureResource.AzureLogAnalytics, azureResourceId: AzureResource.AzureLogAnalytics,
}, },
redirectUri: 'https://vscode-redirect.azurewebsites.net/' redirectUri: 'https://vscode-redirect.azurewebsites.net/',
scopes: [
'openid', 'email', 'profile', 'offline_access',
'https://management.chinacloudapi.cn/user_impersonation'
],
portalEndpoint: 'https://portal.azure.cn/'
} }
} }
}; };