{Profile} az login: Handle missing tenantDisplayName (#29245)

Author: jiasli

src/azure-cli/azure/cli/command_modules/profile/_subscription_selector.py

@@ -95,7 +95,7 @@ def __call__(self):
 
     @staticmethod
     def _get_tenant_string(subscription):
-        try:
-            return subscription[_TENANT_DISPLAY_NAME]
-        except KeyError:
-            return subscription[_TENANT_ID]
+        if tenant_display_name := subscription.get(_TENANT_DISPLAY_NAME):
+            return tenant_display_name
+        # If _TENANT_DISPLAY_NAME doesn't exist or is None, return _TENANT_ID
+        return subscription[_TENANT_ID]

src/azure-cli/azure/cli/command_modules/profile/tests/latest/test_subscription_selector.py

@@ -40,7 +40,17 @@
         "environmentName": "AzureCloud",
         "isDefault": False
     },
-    # 3: tenant account
+    # 3: sub 4 without tenantDisplayName
+    {
+        "id": "00000000-0000-0000-0000-444444444444",
+        "name": "Sub 4 without tenantDisplayName",
+        "tenantDefaultDomain": "tenant1.onmicrosoft.com",
+        "tenantDisplayName": None,
+        "tenantId": "00000000-0000-0000-1111-111111111111",
+        "environmentName": "AzureCloud",
+        "isDefault": False
+    },
+    # 4: tenant account
     {
         "id": "00000000-0000-0000-1111-222222222222",
         "name": "N/A(tenant level account)",
@@ -54,11 +64,12 @@
 
 EXPECTED_SUBSCRIPTION_TABLE = """\
 No     Subscription name                     Subscription ID                       Tenant
------  ------------------------------------  ------------------------------------  --------
+-----  ------------------------------------  ------------------------------------  ------------------------------------
 [1]    N/A(tenant level account)             00000000-0000-0000-1111-222222222222  Tenant 2
 [2]    SUB 1                                 00000000-0000-0000-0000-111111111111  Tenant 1
 \x1b[96m[3]\x1b[0m *  \x1b[96msub 2\x1b[0m                                 \x1b[96m00000000-0000-0000-0000-222222222222\x1b[0m  \x1b[96mTenant 1\x1b[0m
-[4]    Sub 3 with long long long long lo...  00000000-0000-0000-0000-333333333333  Tenant 1"""
+[4]    Sub 3 with long long long long lo...  00000000-0000-0000-0000-333333333333  Tenant 1
+[5]    Sub 4 without tenantDisplayName       00000000-0000-0000-0000-444444444444  00000000-0000-0000-1111-111111111111"""
 
 DUMMY_SUBSCRIPTIONS_NO_TENANT_INFO = [
     {
@@ -103,10 +114,12 @@ def test_format_subscription_table(self):
         with mock.patch.object(format_styled_text, 'theme', 'dark', create=True):
             selector = SubscriptionSelector(sub)
             assert (selector._index_to_subscription_map == {
-                '1': sub[3],
+                '1': sub[4],
                 '2': sub[1],
                 '3': sub[0],
-                '4': sub[2]})
+                '4': sub[2],
+                '5': sub[3],
+            })
             assert selector._table_str == EXPECTED_SUBSCRIPTION_TABLE
 
             selector = SubscriptionSelector(DUMMY_SUBSCRIPTIONS_NO_TENANT_INFO)