From 42a4cc7119060b26795a6af7e7cb898f8e354c12 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Mon, 30 Sep 2024 15:26:16 -0700 Subject: [PATCH 1/5] deprecate azure_germany --- sdk/identity/azure-identity/CHANGELOG.md | 2 ++ sdk/identity/azure-identity/azure/identity/_constants.py | 1 - .../azure-identity/azure/identity/_credentials/vscode.py | 2 -- .../azure-identity/azure/identity/_internal/interactive.py | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md index 4a424ce46c0d..944298bc286e 100644 --- a/sdk/identity/azure-identity/CHANGELOG.md +++ b/sdk/identity/azure-identity/CHANGELOG.md @@ -12,6 +12,8 @@ ### Other Changes +- Deprecated `AzureAuthorityHosts.AZURE_GERMANY` + ## 1.18.0 (2024-09-19) ### Features Added diff --git a/sdk/identity/azure-identity/azure/identity/_constants.py b/sdk/identity/azure-identity/azure/identity/_constants.py index a272179ceed6..ca76979a3ce9 100644 --- a/sdk/identity/azure-identity/azure/identity/_constants.py +++ b/sdk/identity/azure-identity/azure/identity/_constants.py @@ -15,7 +15,6 @@ class AzureAuthorityHosts: AZURE_CHINA = "login.chinacloudapi.cn" - AZURE_GERMANY = "login.microsoftonline.de" AZURE_GOVERNMENT = "login.microsoftonline.us" AZURE_PUBLIC_CLOUD = "login.microsoftonline.com" diff --git a/sdk/identity/azure-identity/azure/identity/_credentials/vscode.py b/sdk/identity/azure-identity/azure/identity/_credentials/vscode.py index 4990d7076292..0c6b4a8e1b2f 100644 --- a/sdk/identity/azure-identity/azure/identity/_credentials/vscode.py +++ b/sdk/identity/azure-identity/azure/identity/_credentials/vscode.py @@ -77,8 +77,6 @@ def _initialize(self, vscode_user_settings: Dict, **kwargs: Any) -> None: authority = AzureAuthorityHosts.AZURE_PUBLIC_CLOUD elif self._cloud == "AzureChinaCloud": authority = AzureAuthorityHosts.AZURE_CHINA - elif self._cloud == "AzureGermanCloud": - authority = AzureAuthorityHosts.AZURE_GERMANY elif self._cloud == "AzureUSGovernment": authority = AzureAuthorityHosts.AZURE_GOVERNMENT else: diff --git a/sdk/identity/azure-identity/azure/identity/_internal/interactive.py b/sdk/identity/azure-identity/azure/identity/_internal/interactive.py index c2665ee15932..50f812111383 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/interactive.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/interactive.py @@ -27,7 +27,6 @@ _DEFAULT_AUTHENTICATE_SCOPES = { "https://" + KnownAuthorities.AZURE_CHINA: ("https://management.core.chinacloudapi.cn//.default",), - "https://" + KnownAuthorities.AZURE_GERMANY: ("https://management.core.cloudapi.de//.default",), "https://" + KnownAuthorities.AZURE_GOVERNMENT: ("https://management.core.usgovcloudapi.net//.default",), "https://" + KnownAuthorities.AZURE_PUBLIC_CLOUD: ("https://management.core.windows.net//.default",), } From 2f120a975f9602f81aa7a3d2e4d0e657c73e2719 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Mon, 30 Sep 2024 16:12:58 -0700 Subject: [PATCH 2/5] update --- sdk/identity/azure-identity/tests/test_interactive_credential.py | 1 - sdk/identity/azure-identity/tests/test_vscode_credential.py | 1 - .../azure-identity/tests/test_vscode_credential_async.py | 1 - 3 files changed, 3 deletions(-) diff --git a/sdk/identity/azure-identity/tests/test_interactive_credential.py b/sdk/identity/azure-identity/tests/test_interactive_credential.py index d623f8b80048..4234bbbd250d 100644 --- a/sdk/identity/azure-identity/tests/test_interactive_credential.py +++ b/sdk/identity/azure-identity/tests/test_interactive_credential.py @@ -183,7 +183,6 @@ def validate_scopes(*scopes, **_): "authority,expected_scope", ( (KnownAuthorities.AZURE_CHINA, "https://management.core.chinacloudapi.cn//.default"), - (KnownAuthorities.AZURE_GERMANY, "https://management.core.cloudapi.de//.default"), (KnownAuthorities.AZURE_GOVERNMENT, "https://management.core.usgovcloudapi.net//.default"), (KnownAuthorities.AZURE_PUBLIC_CLOUD, "https://management.core.windows.net//.default"), ), diff --git a/sdk/identity/azure-identity/tests/test_vscode_credential.py b/sdk/identity/azure-identity/tests/test_vscode_credential.py index becfe82af14b..70ce4fd6fe74 100644 --- a/sdk/identity/azure-identity/tests/test_vscode_credential.py +++ b/sdk/identity/azure-identity/tests/test_vscode_credential.py @@ -256,7 +256,6 @@ def test_custom_cloud_no_authority(): ( ("AzureCloud", AzureAuthorityHosts.AZURE_PUBLIC_CLOUD), ("AzureChinaCloud", AzureAuthorityHosts.AZURE_CHINA), - ("AzureGermanCloud", AzureAuthorityHosts.AZURE_GERMANY), ("AzureUSGovernment", AzureAuthorityHosts.AZURE_GOVERNMENT), ), ) diff --git a/sdk/identity/azure-identity/tests/test_vscode_credential_async.py b/sdk/identity/azure-identity/tests/test_vscode_credential_async.py index bca4a4c992b9..ce414b6343ac 100644 --- a/sdk/identity/azure-identity/tests/test_vscode_credential_async.py +++ b/sdk/identity/azure-identity/tests/test_vscode_credential_async.py @@ -244,7 +244,6 @@ async def test_custom_cloud_no_authority(): ( ("AzureCloud", AzureAuthorityHosts.AZURE_PUBLIC_CLOUD), ("AzureChinaCloud", AzureAuthorityHosts.AZURE_CHINA), - ("AzureGermanCloud", AzureAuthorityHosts.AZURE_GERMANY), ("AzureUSGovernment", AzureAuthorityHosts.AZURE_GOVERNMENT), ), ) From df5047eccd183f6162ce828426a279b1d155af51 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Thu, 3 Oct 2024 15:05:04 -0700 Subject: [PATCH 3/5] update --- .../azure-identity/azure/identity/_constants.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/azure/identity/_constants.py b/sdk/identity/azure-identity/azure/identity/_constants.py index ca76979a3ce9..93653e9ded00 100644 --- a/sdk/identity/azure-identity/azure/identity/_constants.py +++ b/sdk/identity/azure-identity/azure/identity/_constants.py @@ -2,6 +2,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ +import warnings DEVELOPER_SIGN_ON_CLIENT_ID = "04b07795-8ddb-461a-bbee-02f9e1bf7b46" AZURE_VSCODE_CLIENT_ID = "aebc6443-996d-45c2-90f0-388ff96faa56" @@ -13,7 +14,17 @@ CACHE_CAE_SUFFIX = ".cae" -class AzureAuthorityHosts: +class AzureAuthorityHostsMeta(type): + def __getattr__(cls, name): + if name == "AZURE_GERMANY": + warnings.warn( + "AZURE_GERMANY is deprecated. Please use other clouds instead.", DeprecationWarning, stacklevel=2 + ) + return "login.microsoftonline.de" + raise AttributeError(f"{name} not found in {cls.__name__}") + + +class AzureAuthorityHosts(metaclass=AzureAuthorityHostsMeta): AZURE_CHINA = "login.chinacloudapi.cn" AZURE_GOVERNMENT = "login.microsoftonline.us" AZURE_PUBLIC_CLOUD = "login.microsoftonline.com" From b5a726edaef92515578badba4fee4de64748dbfd Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Thu, 3 Oct 2024 16:10:13 -0700 Subject: [PATCH 4/5] Update sdk/identity/azure-identity/azure/identity/_constants.py Co-authored-by: Paul Van Eck --- sdk/identity/azure-identity/azure/identity/_constants.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/azure/identity/_constants.py b/sdk/identity/azure-identity/azure/identity/_constants.py index 93653e9ded00..9c02cd873752 100644 --- a/sdk/identity/azure-identity/azure/identity/_constants.py +++ b/sdk/identity/azure-identity/azure/identity/_constants.py @@ -18,7 +18,9 @@ class AzureAuthorityHostsMeta(type): def __getattr__(cls, name): if name == "AZURE_GERMANY": warnings.warn( - "AZURE_GERMANY is deprecated. Please use other clouds instead.", DeprecationWarning, stacklevel=2 + "AZURE_GERMANY is deprecated. Microsoft Cloud Germany was closed on October 29th, 2021.", + DeprecationWarning, + stacklevel=2 ) return "login.microsoftonline.de" raise AttributeError(f"{name} not found in {cls.__name__}") From 9b1f43cae298392de24c9a90f9f9e74ae788fbe4 Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Thu, 3 Oct 2024 17:15:55 -0700 Subject: [PATCH 5/5] update --- sdk/identity/azure-identity/azure/identity/_constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/azure/identity/_constants.py b/sdk/identity/azure-identity/azure/identity/_constants.py index 9c02cd873752..92d56a7d3401 100644 --- a/sdk/identity/azure-identity/azure/identity/_constants.py +++ b/sdk/identity/azure-identity/azure/identity/_constants.py @@ -20,7 +20,7 @@ def __getattr__(cls, name): warnings.warn( "AZURE_GERMANY is deprecated. Microsoft Cloud Germany was closed on October 29th, 2021.", DeprecationWarning, - stacklevel=2 + stacklevel=2, ) return "login.microsoftonline.de" raise AttributeError(f"{name} not found in {cls.__name__}")