add validation to short profile list.

Author: carl-adams-planet

src/planet_auth_utils/commands/cli/profile_cmd.py

@@ -133,38 +133,30 @@ def cmd_profile_list(long):
     """
     List auth profiles.
     """
+    click.echo("Built-in profiles:")
+    profile_names = Builtins.builtin_profile_names().copy()
+    profile_names.sort()
+    display_dicts = OrderedDict()
+    display_names = []
+    for profile_name in profile_names:
+        config_dict = Builtins.builtin_profile_auth_client_config_dict(profile_name)
+        # The idea of a "hidden" profile currently only applies to built-in profiles.
+        # This is largely so we can have partial SKEL profiles.
+        if not config_dict.get("_hidden", False):
+            display_dicts[profile_name] = config_dict
+            display_names.append(profile_name)
     if long:
-        click.echo("Built-in profiles:")
-        profile_names = Builtins.builtin_profile_names().copy()
-        profile_names.sort()
-        display_object = OrderedDict()
-        for profile_name in profile_names:
-            config_dict = Builtins.builtin_profile_auth_client_config_dict(profile_name)
-            # The idea of a "hidden" profile currently only applies to built-in profiles.
-            # This is largely so we can have partial SKEL profiles.
-            if not config_dict.get("_hidden", False):
-                display_object[profile_name] = config_dict
-        print_obj(display_object)
-
-        click.echo("\nLocally defined profiles:")
-        print_obj(_load_all_on_disk_profiles())
+        print_obj(display_dicts)
+    else:
+        print_obj(display_names)
 
+    click.echo("\nLocally defined profiles:")
+    profile_dicts = _load_all_on_disk_profiles()
+    profile_names = list(profile_dicts.keys())
+    if long:
+        print_obj(profile_dicts)
     else:
-        click.echo("Built-in profiles:")
-        display_profile_names = []
-        for profile_name in Builtins.builtin_profile_names():
-            config_dict = Builtins.builtin_profile_auth_client_config_dict(profile_name)
-            # The idea of a "hidden" profile currently only applies to built-in profiles.
-            # This is largely so we can have partial SKEL profiles.
-            if not config_dict.get("_hidden", False):
-                display_profile_names.append(profile_name)
-        display_profile_names.sort()
-        print_obj(display_profile_names)
-
-        click.echo("\nLocally defined profiles:")
-        display_profile_names = Profile.list_on_disk_profiles()
-        display_profile_names.sort()
-        print_obj(display_profile_names)
+        print_obj(profile_names)
 
 
 @cmd_profile.command("create")