Deprecate Azure German Cloud (#353)

* Deprecate Azure German Cloud

* update test case

Author: dingmeng-xue

src/Authentication.Abstractions.Test/AzureEnvironmentTests.cs

@@ -59,10 +59,9 @@ public void TestArmResponseNoAzureCloud()
             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(3, 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.AzureChinaCloud].Type);
             Assert.Equal(AzureEnvironment.TypeDiscovered, armEnvironments[EnvironmentName.AzureUSGovernment].Type);
         }
 
@@ -72,10 +71,9 @@ 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(4, 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);
         }
 
@@ -86,7 +84,7 @@ public void TestFallbackWhenArmCloudMetadataInitFails()
             var armEnvironments = AzureEnvironment.InitializeBuiltInEnvironments(null, httpOperations: TestOperationsFactory.Create().GetHttpOperations());
 
             // Check all built-in environments are loaded because discover is failed
-            Assert.Equal(4, armEnvironments.Count);
+            Assert.Equal(3, armEnvironments.Count);
             foreach (var env in armEnvironments.Values)
             {
                 Assert.Equal(AzureEnvironment.TypeBuiltIn, env.Type);
@@ -100,7 +98,7 @@ public void TestDisableArmCloudMetadataInit()
             var armEnvironments = AzureEnvironment.InitializeBuiltInEnvironments(null, httpOperations: TestOperationsFactory.Create().GetHttpOperations());
 
             // Check all built-in environments are loaded because discover is disabled
-            Assert.Equal(4, armEnvironments.Count);
+            Assert.Equal(3, armEnvironments.Count);
             foreach (var env in armEnvironments.Values)
             {
                 Assert.Equal(AzureEnvironment.TypeBuiltIn, env.Type);

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

@@ -28,30 +28,31 @@
     "gallery": "https://gallery.usgovcloudapi.net"
   },
   {
-    "portal": "https://portal.microsoftazure.de",
+    "portal": "https://portal.azure.cn",
     "authentication": {
-      "loginEndpoint": "https://login.microsoftonline.de",
+      "loginEndpoint": "https://login.chinacloudapi.cn",
       "audiences": [
-        "https://management.core.cloudapi.de",
-        "https://management.microsoftazure.de"
+        "https://management.core.chinacloudapi.cn",
+        "https://management.chinacloudapi.cn"
       ],
       "tenant": "common",
       "identityProvider": "AAD"
     },
-    "media": "https://rest.media.cloudapi.de",
-    "graphAudience": "https://graph.cloudapi.de",
-    "graph": "https://graph.cloudapi.de",
-    "name": "AzureGermanCloud",
+    "media": "https://rest.media.chinacloudapi.cn",
+    "graphAudience": "https://graph.chinacloudapi.cn",
+    "graph": "https://graph.chinacloudapi.cn",
+    "name": "AzureChinaCloud",
     "suffixes": {
-      "sqlServerHostname": "database.cloudapi.de",
-      "keyVaultDns": "vault.microsoftazure.de",
-      "storage": "core.cloudapi.de",
+      "acrLoginServer": "azurecr.cn",
+      "sqlServerHostname": "database.chinacloudapi.cn",
+      "keyVaultDns": "vault.azure.cn",
+      "storage": "core.chinacloudapi.cn",
       "azureFrontDoorEndpointSuffix": ""
     },
-    "batch": "https://batch.cloudapi.de",
-    "resourceManager": "https://management.microsoftazure.de",
+    "batch": "https://batch.chinacloudapi.cn",
+    "resourceManager": "https://management.chinacloudapi.cn",
     "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"
+    "sqlManagement": "https://management.core.chinacloudapi.cn:8443",
+    "gallery": "https://gallery.chinacloudapi.cn"
   }
 ]

src/Authentication.Abstractions/AzureEnvironment.cs

@@ -156,31 +156,6 @@ internal static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironme
                 AdTenant = "Common"
             };
 
-            var azureGermany = new AzureEnvironment
-            {
-                Name = EnvironmentName.AzureGermanCloud,
-                Type = TypeBuiltIn,
-                PublishSettingsFileUrl = AzureEnvironmentConstants.GermanPublishSettingsFileUrl,
-                ServiceManagementUrl = AzureEnvironmentConstants.GermanServiceEndpoint,
-                ResourceManagerUrl = AzureEnvironmentConstants.GermanResourceManagerEndpoint,
-                ManagementPortalUrl = AzureEnvironmentConstants.GermanManagementPortalUrl,
-                ActiveDirectoryAuthority = AzureEnvironmentConstants.GermanActiveDirectoryEndpoint,
-                ActiveDirectoryServiceEndpointResourceId = AzureEnvironmentConstants.GermanServiceEndpoint,
-                StorageEndpointSuffix = AzureEnvironmentConstants.GermanStorageEndpointSuffix,
-                GalleryUrl = AzureEnvironmentConstants.GalleryEndpoint,
-                SqlDatabaseDnsSuffix = AzureEnvironmentConstants.GermanSqlDatabaseDnsSuffix,
-                GraphUrl = AzureEnvironmentConstants.GermanGraphEndpoint,
-                TrafficManagerDnsSuffix = AzureEnvironmentConstants.GermanTrafficManagerDnsSuffix,
-                AzureKeyVaultDnsSuffix = AzureEnvironmentConstants.GermanKeyVaultDnsSuffix,
-                AzureKeyVaultServiceEndpointResourceId = AzureEnvironmentConstants.GermanAzureKeyVaultServiceEndpointResourceId,
-                AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = null,
-                AzureDataLakeStoreFileSystemEndpointSuffix = null,
-                DataLakeEndpointResourceId = null,
-                GraphEndpointResourceId = AzureEnvironmentConstants.GermanGraphEndpoint,
-                BatchEndpointResourceId = AzureEnvironmentConstants.GermanBatchEndpointResourceId,
-                AdTenant = "Common"
-            };
-
             if (!armAzureEnvironments.ContainsKey(EnvironmentName.AzureCloud))
             {
                 armAzureEnvironments[EnvironmentName.AzureCloud] = azureCloud;
@@ -193,10 +168,6 @@ internal static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironme
             {
                 armAzureEnvironments[EnvironmentName.AzureUSGovernment] = azureUSGovernment;
             }
-            if (!armAzureEnvironments.ContainsKey(EnvironmentName.AzureGermanCloud))
-            {
-                armAzureEnvironments[EnvironmentName.AzureGermanCloud] = azureGermany;
-            }
 
             SetExtendedProperties(armAzureEnvironments);
 
@@ -285,16 +256,6 @@ private static void SetExtendedProperties(IDictionary<string, AzureEnvironment>
                 azureEnvironments[EnvironmentName.AzureUSGovernment].SetProperty(ExtendedEndpoint.MicrosoftGraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentMicrosoftGraphEndpointResourceId);
                 azureEnvironments[EnvironmentName.AzureUSGovernment].SetProperty(ExtendedEndpoint.MicrosoftGraphUrl, AzureEnvironmentConstants.USGovernmentMicrosoftGraphUrl);
             }
-
-            if (azureEnvironments.ContainsKey(EnvironmentName.AzureGermanCloud))
-            {
-                azureEnvironments[EnvironmentName.AzureGermanCloud].SetProperty(ExtendedEndpoint.AnalysisServicesEndpointSuffix, AzureEnvironmentConstants.GermanAnalysisServicesEndpointSuffix);
-                azureEnvironments[EnvironmentName.AzureGermanCloud].SetProperty(ExtendedEndpoint.AnalysisServicesEndpointResourceId, AzureEnvironmentConstants.GermanAnalysisServicesEndpointResourceId);
-                azureEnvironments[EnvironmentName.AzureGermanCloud].SetProperty(ExtendedEndpoint.ManagedHsmServiceEndpointResourceId, AzureEnvironmentConstants.GermanAzureManagedHsmServiceEndpointResourceId);
-                azureEnvironments[EnvironmentName.AzureGermanCloud].SetProperty(ExtendedEndpoint.ManagedHsmServiceEndpointSuffix, AzureEnvironmentConstants.GermanManagedHsmDnsSuffix);
-                azureEnvironments[EnvironmentName.AzureGermanCloud].SetProperty(ExtendedEndpoint.MicrosoftGraphEndpointResourceId, AzureEnvironmentConstants.GermanMicrosoftGraphEndpointResourceId);
-                azureEnvironments[EnvironmentName.AzureGermanCloud].SetProperty(ExtendedEndpoint.MicrosoftGraphUrl, AzureEnvironmentConstants.GermanMicrosoftGraphUrl);
-            }
         }
 
         /// <summary>
@@ -369,8 +330,6 @@ private static string GetPublishSettingsFileUrl(string cloudName)
                     return AzureEnvironmentConstants.ChinaPublishSettingsFileUrl;
                 case EnvironmentName.AzureUSGovernment:
                     return AzureEnvironmentConstants.USGovernmentPublishSettingsFileUrl;
-                case EnvironmentName.AzureGermanCloud:
-                    return AzureEnvironmentConstants.GermanPublishSettingsFileUrl;
                 default:
                     return string.Empty;
             }
@@ -392,8 +351,6 @@ private static string GetKeyVaultServiceEndpointResourceId(string cloudName)
                     return AzureEnvironmentConstants.ChinaKeyVaultServiceEndpointResourceId;
                 case EnvironmentName.AzureUSGovernment:
                     return AzureEnvironmentConstants.USGovernmentKeyVaultServiceEndpointResourceId;
-                case EnvironmentName.AzureGermanCloud:
-                    return AzureEnvironmentConstants.GermanAzureKeyVaultServiceEndpointResourceId;
                 default:
                     return string.Empty;
             }
@@ -415,8 +372,6 @@ private static string GetTrafficManagerDnsSuffix(string cloudName)
                     return AzureEnvironmentConstants.ChinaTrafficManagerDnsSuffix;
                 case EnvironmentName.AzureUSGovernment:
                     return AzureEnvironmentConstants.USGovernmentTrafficManagerDnsSuffix;
-                case EnvironmentName.AzureGermanCloud:
-                    return AzureEnvironmentConstants.GermanTrafficManagerDnsSuffix;
                 default:
                     return string.Empty;
             }