Refactor account sorting to a method

This takes into account email address as well, which is used when printing the output.

Author: kdaily

awscli/customizations/configure/sso.py

@@ -186,6 +186,15 @@ def display_account(account):
     return account_template.format(**account)
 
 
+def get_account_sorting_key(account):
+    only_account_id = ('accountName' not in account and 'emailAddress' not in account)
+    for key in ('accountName', 'emailAddress', 'accountId'):
+        value = account.get(key, None)
+        if value is not None:
+            return (only_account_id, value.lower())
+    return (only_account_id, None)
+
+
 class SSOSessionConfigurationPrompter:
     _DEFAULT_SSO_SCOPE = 'sso:account:access'
     _KNOWN_SSO_SCOPES = {
@@ -441,9 +450,7 @@ def _handle_multiple_accounts(self, accounts):
             'There are {} AWS accounts available to you.\n'
         )
         uni_print(available_accounts_msg.format(len(accounts)))
-        sorted_accounts = sorted(accounts, key=lambda x: (
-            'accountName' not in x, x.get('accountName',
-                                          x.get('accountId')).lower()))
+        sorted_accounts = sorted(accounts, key=get_account_sorting_key)
         selected_account = self._selector(
             sorted_accounts, display_format=display_account
         )

tests/unit/customizations/configure/test_sso.py

@@ -37,6 +37,7 @@
     SSOSessionConfigurationPrompter,
     StartUrlValidator,
     display_account,
+    get_account_sorting_key,
 )
 from awscli.customizations.sso.utils import (
     PrintOnlyHandler,
@@ -359,13 +360,15 @@ def account_id_select(account_id):
     }
     return SelectMenu(
         answer=selected_account,
-        expected_choices=[
-            selected_account,
-            {"accountId": "1234567890", "emailAddress": "account2@site.com"},
-        ],
+        expected_choices=sorted(
+            [
+                selected_account,
+                {"accountId": "1234567890", "emailAddress": "account2@site.com"},
+            ],
+            key=get_account_sorting_key,
+        )
     )
 
-
 @pytest.fixture
 def role_name_select(role_name):
     return SelectMenu(answer=role_name, expected_choices=[role_name, "roleB"])