Merge built-in environments and discovered environemnts (#203)

* Merge built-in environments and discovered environemnts

* Add test cases according to feedback

Author: dingmeng-xue

src/Authentication.Abstractions.Test/AzureEnvironmentTests.cs

@@ -52,6 +52,33 @@ public void TestArmCloudMetadata20190501Init()
             }
         }
 
+        [Fact]
+        public void TestArmResponseNoAzureCloud()
+        {
+            Environment.SetEnvironmentVariable(ArmMetadataEnvVariable, @"TestData\ArmResponseNoAzureCloud.json");
+            var armEnvironments = AzureEnvironment.InitializeBuiltInEnvironments(null, httpOperations: TestOperationsFactory.Create().GetHttpOperations());
+
+            // Check AzureCloud is added to public environment list even discovery endpoint doesn't return AzureCloud.
+            Assert.Equal(4, armEnvironments.Count);
+            Assert.Equal(AzureEnvironment.TypeBuiltIn, armEnvironments[EnvironmentName.AzureCloud].Type);
+            Assert.Equal(AzureEnvironment.TypeBuiltIn, armEnvironments[EnvironmentName.AzureChinaCloud].Type);
+            Assert.Equal(AzureEnvironment.TypeDiscovered, armEnvironments[EnvironmentName.AzureGermanCloud].Type);
+            Assert.Equal(AzureEnvironment.TypeDiscovered, armEnvironments[EnvironmentName.AzureUSGovernment].Type);
+        }
+
+        [Fact]
+        public void TestArmResponseOneEntry()
+        {
+            Environment.SetEnvironmentVariable(ArmMetadataEnvVariable, @"TestData\ArmResponseOneEntry.json");
+            var armEnvironments = AzureEnvironment.InitializeBuiltInEnvironments(null, httpOperations: TestOperationsFactory.Create().GetHttpOperations());
+
+            Assert.Equal(5, armEnvironments.Count);
+            Assert.Equal(AzureEnvironment.TypeBuiltIn, armEnvironments[EnvironmentName.AzureCloud].Type);
+            Assert.Equal(AzureEnvironment.TypeBuiltIn, armEnvironments[EnvironmentName.AzureChinaCloud].Type);
+            Assert.Equal(AzureEnvironment.TypeBuiltIn, armEnvironments[EnvironmentName.AzureGermanCloud].Type);
+            Assert.Equal(AzureEnvironment.TypeBuiltIn, armEnvironments[EnvironmentName.AzureUSGovernment].Type);
+        }
+
         [Fact]
         public void TestFallbackWhenArmCloudMetadataInitFails()
         {

src/Authentication.Abstractions.Test/TestData/ArmResponseNoAzureCloud.json

@@ -0,0 +1,57 @@
+[
+  {
+    "portal": "https://portal.azure.us",
+    "authentication": {
+      "loginEndpoint": "https://login.microsoftonline.us",
+      "audiences": [
+        "https://management.core.usgovcloudapi.net",
+        "https://management.usgovcloudapi.net"
+      ],
+      "tenant": "common",
+      "identityProvider": "AAD"
+    },
+    "media": "https://rest.media.usgovcloudapi.net",
+    "graphAudience": "https://graph.windows.net",
+    "graph": "https://graph.windows.net",
+    "name": "AzureUSGovernment",
+    "suffixes": {
+      "acrLoginServer": "azurecr.us",
+      "sqlServerHostname": "database.usgovcloudapi.net",
+      "keyVaultDns": "vault.usgovcloudapi.net",
+      "storage": "core.usgovcloudapi.net",
+      "azureFrontDoorEndpointSuffix": ""
+    },
+    "batch": "https://batch.core.usgovcloudapi.net",
+    "resourceManager": "https://management.usgovcloudapi.net",
+    "vmImageAliasDoc": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json",
+    "sqlManagement": "https://management.core.usgovcloudapi.net:8443",
+    "gallery": "https://gallery.usgovcloudapi.net"
+  },
+  {
+    "portal": "https://portal.microsoftazure.de",
+    "authentication": {
+      "loginEndpoint": "https://login.microsoftonline.de",
+      "audiences": [
+        "https://management.core.cloudapi.de",
+        "https://management.microsoftazure.de"
+      ],
+      "tenant": "common",
+      "identityProvider": "AAD"
+    },
+    "media": "https://rest.media.cloudapi.de",
+    "graphAudience": "https://graph.cloudapi.de",
+    "graph": "https://graph.cloudapi.de",
+    "name": "AzureGermanCloud",
+    "suffixes": {
+      "sqlServerHostname": "database.cloudapi.de",
+      "keyVaultDns": "vault.microsoftazure.de",
+      "storage": "core.cloudapi.de",
+      "azureFrontDoorEndpointSuffix": ""
+    },
+    "batch": "https://batch.cloudapi.de",
+    "resourceManager": "https://management.microsoftazure.de",
+    "vmImageAliasDoc": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json",
+    "sqlManagement": "https://management.core.cloudapi.de:8443",
+    "gallery": "https://gallery.cloudapi.de"
+  }
+]

src/Authentication.Abstractions.Test/TestData/ArmResponseOneEntry.json

@@ -0,0 +1,30 @@
+[
+  {
+    "portal": "https://portal.azure.us",
+    "authentication": {
+      "loginEndpoint": "https://login.microsoftonline.us",
+      "audiences": [
+        "https://management.core.usgovcloudapi.net",
+        "https://management.usgovcloudapi.net"
+      ],
+      "tenant": "common",
+      "identityProvider": "AAD"
+    },
+    "media": "https://rest.media.usgovcloudapi.net",
+    "graphAudience": "https://graph.windows.net",
+    "graph": "https://graph.windows.net",
+    "name": "MockedOne",
+    "suffixes": {
+      "acrLoginServer": "azurecr.us",
+      "sqlServerHostname": "database.usgovcloudapi.net",
+      "keyVaultDns": "vault.usgovcloudapi.net",
+      "storage": "core.usgovcloudapi.net",
+      "azureFrontDoorEndpointSuffix": ""
+    },
+    "batch": "https://batch.core.usgovcloudapi.net",
+    "resourceManager": "https://management.usgovcloudapi.net",
+    "vmImageAliasDoc": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json",
+    "sqlManagement": "https://management.core.usgovcloudapi.net:8443",
+    "gallery": "https://gallery.usgovcloudapi.net"
+  }
+]