Skip to content

Commit 4cb2a66

Browse files
add validation to short profile list.
1 parent 45d3433 commit 4cb2a66

File tree

1 file changed

+21
-29
lines changed

1 file changed

+21
-29
lines changed

src/planet_auth_utils/commands/cli/profile_cmd.py

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -133,38 +133,30 @@ def cmd_profile_list(long):
133133
"""
134134
List auth profiles.
135135
"""
136+
click.echo("Built-in profiles:")
137+
profile_names = Builtins.builtin_profile_names().copy()
138+
profile_names.sort()
139+
display_dicts = OrderedDict()
140+
display_names = []
141+
for profile_name in profile_names:
142+
config_dict = Builtins.builtin_profile_auth_client_config_dict(profile_name)
143+
# The idea of a "hidden" profile currently only applies to built-in profiles.
144+
# This is largely so we can have partial SKEL profiles.
145+
if not config_dict.get("_hidden", False):
146+
display_dicts[profile_name] = config_dict
147+
display_names.append(profile_name)
136148
if long:
137-
click.echo("Built-in profiles:")
138-
profile_names = Builtins.builtin_profile_names().copy()
139-
profile_names.sort()
140-
display_object = OrderedDict()
141-
for profile_name in profile_names:
142-
config_dict = Builtins.builtin_profile_auth_client_config_dict(profile_name)
143-
# The idea of a "hidden" profile currently only applies to built-in profiles.
144-
# This is largely so we can have partial SKEL profiles.
145-
if not config_dict.get("_hidden", False):
146-
display_object[profile_name] = config_dict
147-
print_obj(display_object)
148-
149-
click.echo("\nLocally defined profiles:")
150-
print_obj(_load_all_on_disk_profiles())
149+
print_obj(display_dicts)
150+
else:
151+
print_obj(display_names)
151152

153+
click.echo("\nLocally defined profiles:")
154+
profile_dicts = _load_all_on_disk_profiles()
155+
profile_names = list(profile_dicts.keys())
156+
if long:
157+
print_obj(profile_dicts)
152158
else:
153-
click.echo("Built-in profiles:")
154-
display_profile_names = []
155-
for profile_name in Builtins.builtin_profile_names():
156-
config_dict = Builtins.builtin_profile_auth_client_config_dict(profile_name)
157-
# The idea of a "hidden" profile currently only applies to built-in profiles.
158-
# This is largely so we can have partial SKEL profiles.
159-
if not config_dict.get("_hidden", False):
160-
display_profile_names.append(profile_name)
161-
display_profile_names.sort()
162-
print_obj(display_profile_names)
163-
164-
click.echo("\nLocally defined profiles:")
165-
display_profile_names = Profile.list_on_disk_profiles()
166-
display_profile_names.sort()
167-
print_obj(display_profile_names)
159+
print_obj(profile_names)
168160

169161

170162
@cmd_profile.command("create")

0 commit comments

Comments
 (0)