From 0a5565de9c9f040bd9db20cd4b2d9ecbe2e22554 Mon Sep 17 00:00:00 2001 From: isra-fel <11371776+isra-fel@users.noreply.github.com> Date: Mon, 24 Aug 2026 13:05:11 +1000 Subject: [PATCH] Remove retired AzureGermanCloud from built-in cloud list The Azure German cloud (Microsoft Cloud Germany) was decommissioned. Its built-in `AzureGermanCloud` entry in Azure CLI is no longer usable and can be confused with other sovereign clouds. Remove the cloud definition and its enum entry from azure-cli-core, and update the affected unit test. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- src/azure-cli-core/azure/cli/core/cloud.py | 28 +------------------ .../azure/cli/core/tests/test_cloud.py | 4 +-- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/src/azure-cli-core/azure/cli/core/cloud.py b/src/azure-cli-core/azure/cli/core/cloud.py index 158998685c5..76d67124aed 100644 --- a/src/azure-cli-core/azure/cli/core/cloud.py +++ b/src/azure-cli-core/azure/cli/core/cloud.py @@ -354,7 +354,6 @@ class CloudNameEnum: # pylint: disable=too-few-public-methods AzureCloud = 'AzureCloud' AzureChinaCloud = 'AzureChinaCloud' AzureUSGovernment = 'AzureUSGovernment' - AzureGermanCloud = 'AzureGermanCloud' AzureBleuCloud = 'AzureBleuCloud' @@ -465,31 +464,6 @@ class CloudNameEnum: # pylint: disable=too-few-public-methods acr_login_server_endpoint='.azurecr.us', synapse_analytics_endpoint='.dev.azuresynapse.usgovcloudapi.net')) -AZURE_GERMAN_CLOUD = Cloud( - CloudNameEnum.AzureGermanCloud, - endpoints=CloudEndpoints( - management='https://management.core.cloudapi.de/', - resource_manager='https://management.microsoftazure.de', - sql_management='https://management.core.cloudapi.de:8443/', - batch_resource_id='https://batch.cloudapi.de/', - gallery='https://gallery.cloudapi.de/', - active_directory='https://login.microsoftonline.de', - active_directory_resource_id='https://management.core.cloudapi.de/', - active_directory_graph_resource_id='https://graph.cloudapi.de/', - microsoft_graph_resource_id='https://graph.microsoft.de', - vm_image_alias_doc='https://azcliprod.blob.core.windows.net/cli/vm/aliases.json', - media_resource_id='https://rest.media.cloudapi.de', - ossrdbms_resource_id='https://ossrdbms-aad.database.cloudapi.de', - portal='https://portal.microsoftazure.de'), - suffixes=CloudSuffixes( - storage_endpoint='core.cloudapi.de', - keyvault_dns='.vault.microsoftazure.de', - mhsm_dns='.managedhsm.microsoftazure.de', - sql_server_hostname='.database.cloudapi.de', - mysql_server_endpoint='.mysql.database.cloudapi.de', - postgresql_server_endpoint='.postgres.database.cloudapi.de', - mariadb_server_endpoint='.mariadb.database.cloudapi.de')) - AZURE_BLEU_CLOUD = Cloud( CloudNameEnum.AzureBleuCloud, endpoints=CloudEndpoints( @@ -519,7 +493,7 @@ class CloudNameEnum: # pylint: disable=too-few-public-methods mariadb_server_endpoint='.mariadb.database.sovcloud-api.fr', synapse_analytics_endpoint='.dev.azuresynapse.sovcloud-api.fr')) -HARD_CODED_CLOUD_LIST = [AZURE_PUBLIC_CLOUD, AZURE_CHINA_CLOUD, AZURE_US_GOV_CLOUD, AZURE_GERMAN_CLOUD, AZURE_BLEU_CLOUD] +HARD_CODED_CLOUD_LIST = [AZURE_PUBLIC_CLOUD, AZURE_CHINA_CLOUD, AZURE_US_GOV_CLOUD, AZURE_BLEU_CLOUD] def retrieve_arm_cloud_metadata(): diff --git a/src/azure-cli-core/azure/cli/core/tests/test_cloud.py b/src/azure-cli-core/azure/cli/core/tests/test_cloud.py index 4394d18f6a7..5455eddd535 100644 --- a/src/azure-cli-core/azure/cli/core/tests/test_cloud.py +++ b/src/azure-cli-core/azure/cli/core/tests/test_cloud.py @@ -223,8 +223,8 @@ def test_cloud_is_registered(self): @mock.patch('azure.cli.core.cloud._set_active_subscription', autospec=True) def test_switch_active_cloud(self, subscription_setter): cli = mock.MagicMock() - switch_active_cloud(cli, 'AzureGermanCloud') - self.assertEqual(cli.cloud.name, 'AzureGermanCloud') + switch_active_cloud(cli, 'AzureUSGovernment') + self.assertEqual(cli.cloud.name, 'AzureUSGovernment') switch_active_cloud(cli, 'AzureChinaCloud') self.assertEqual(cli.cloud.name, 'AzureChinaCloud')