From c879d77b6236d65d7fe7ea0dd3fef4d9ba4a1ee4 Mon Sep 17 00:00:00 2001 From: Amir Omidi Date: Fri, 19 Jun 2020 13:40:27 -0700 Subject: [PATCH] Add USNat cloud settings (#11015) authored-by: chgagnon --- extensions/azurecore/package.disabled.json | 7 ++- extensions/azurecore/package.json | 5 ++ extensions/azurecore/package.nls.json | 1 + .../src/account-provider/providerSettings.ts | 51 ++++++++++++++++++- 4 files changed, 62 insertions(+), 2 deletions(-) diff --git a/extensions/azurecore/package.disabled.json b/extensions/azurecore/package.disabled.json index 29b1642638..aa13fe34ab 100644 --- a/extensions/azurecore/package.disabled.json +++ b/extensions/azurecore/package.disabled.json @@ -4,6 +4,11 @@ "default": false, "description": "%config.enableUsGovCloudDescription%" }, + "accounts.azure.enableUsNatCloud": { + "type": "boolean", + "default": false, + "description": "%config.enableUsNatCloudDescription%" + }, "accounts.azure.enableChinaCloud": { "type": "boolean", "default": false, @@ -14,4 +19,4 @@ "default": false, "description": "%config.enableGermanyCloudDescription%" } -} \ No newline at end of file +} diff --git a/extensions/azurecore/package.json b/extensions/azurecore/package.json index b6e4e66756..8a0118043f 100644 --- a/extensions/azurecore/package.json +++ b/extensions/azurecore/package.json @@ -45,6 +45,11 @@ "default": false, "description": "%config.enableUsGovCloudDescription%" }, + "accounts.azure.cloud.enableUsNatCloud": { + "type": "boolean", + "default": false, + "description": "%config.enableUsNatCloudDescription%" + }, "accounts.azure.cloud.enableGermanyCloud": { "type": "boolean", "default": false, diff --git a/extensions/azurecore/package.nls.json b/extensions/azurecore/package.nls.json index f7cc00e140..291ff7181f 100644 --- a/extensions/azurecore/package.nls.json +++ b/extensions/azurecore/package.nls.json @@ -21,6 +21,7 @@ "config.azureAccountConfigurationSection": "Azure Account Configuration", "config.enablePublicCloudDescription": "Should Azure public cloud integration be enabled", "config.enableUsGovCloudDescription": "Should US Government Azure cloud (Fairfax) integration be enabled", + "config.enableUsNatCloudDescription": "Should US National Azure cloud integration be enabled", "config.enableChinaCloudDescription": "Should Azure China integration be enabled", "config.enableGermanyCloudDescription": "Should Azure Germany integration be enabled", "config.azureAuthMethodConfigurationSection": "Azure Authentication Method", diff --git a/extensions/azurecore/src/account-provider/providerSettings.ts b/extensions/azurecore/src/account-provider/providerSettings.ts index b892266a47..441ac71647 100644 --- a/extensions/azurecore/src/account-provider/providerSettings.ts +++ b/extensions/azurecore/src/account-provider/providerSettings.ts @@ -108,6 +108,55 @@ const usGovAzureSettings: ProviderSettings = { } }; +const usNatAzureSettings: ProviderSettings = { + configKey: 'enableUsNatCloud', + metadata: { + displayName: localize('usNatCloudDisplayName', "Azure (US National)"), + id: 'azure_usNatCloud', + settings: { + host: 'https://login.microsoftonline.eaglex.ic.gov/', + clientId: 'a69788c6-1d43-44ed-9ca3-b83e194da255', + signInResourceId: 'https://management.core.eaglex.ic.gov/', + microsoftResource: { + id: 'marm', + endpoint: 'https://management.azure.eaglex.ic.gov/', + azureResourceId: AzureResource.MicrosoftResourceManagement + }, + graphResource: { + id: 'graph', + endpoint: 'https://graph.eaglex.ic.gov', + azureResourceId: AzureResource.Graph + }, + armResource: { + id: 'arm', + endpoint: 'https://management.core.eaglex.ic.gov/', + azureResourceId: AzureResource.ResourceManagement + }, + sqlResource: { + id: 'sql', + endpoint: 'https://database.cloudapi.eaglex.ic.gov/', + azureResourceId: AzureResource.Sql + }, + ossRdbmsResource: { + id: 'ossrdbms', + endpoint: 'https://ossrdbms-aad.database.cloudapi.eaglex.ic.gov', + azureResourceId: AzureResource.OssRdbms + }, + azureKeyVaultResource: { + id: 'vault', + endpoint: 'https://vault.cloudapi.eaglex.ic.gov', + azureResourceId: AzureResource.AzureKeyVault + }, + redirectUri: 'https://vscode-redirect.azurewebsites.net/', + scopes: [ + 'openid', 'email', 'profile', 'offline_access', + 'https://management.core.eaglex.ic.gov/user_impersonation' + ], + portalEndpoint: 'https://portal.azure.eaglex.ic.gov/' + } + } +}; + const germanyAzureSettings: ProviderSettings = { configKey: 'enableGermanyCloud', @@ -161,5 +210,5 @@ const chinaAzureSettings: ProviderSettings = { } } }; -const allSettings = [publicAzureSettings, usGovAzureSettings, germanyAzureSettings, chinaAzureSettings]; +const allSettings = [publicAzureSettings, usGovAzureSettings, usNatAzureSettings, germanyAzureSettings, chinaAzureSettings]; export default allSettings;