Skip to content

Commit 2ced257

Browse files
committed
Do not fail info command when user not set
1 parent 320f919 commit 2ced257

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

infrahub_sdk/client.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,7 @@ async def get_version(self) -> str:
310310

311311
async def get_user(self) -> dict:
312312
"""Return user information"""
313-
user_info = await self.execute_graphql(query=QUERY_USER)
314-
return user_info
313+
return await self.execute_graphql(query=QUERY_USER)
315314

316315
async def get_user_permissions(self) -> dict:
317316
"""Return user permissions"""
@@ -1565,8 +1564,7 @@ def get_version(self) -> str:
15651564

15661565
def get_user(self) -> dict:
15671566
"""Return user information"""
1568-
user_info = self.execute_graphql(query=QUERY_USER)
1569-
return user_info
1567+
return self.execute_graphql(query=QUERY_USER)
15701568

15711569
def get_user_permissions(self) -> dict:
15721570
"""Return user permissions"""

infrahub_sdk/ctl/cli_commands.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,12 +417,17 @@ def info( # noqa: PLR0915
417417
"user_info": {},
418418
"groups": {},
419419
}
420+
client = initialize_client_sync()
421+
fetch_user_details = client.config.username or client.config.api_token
422+
420423
try:
421-
client = initialize_client_sync()
422424
info["infrahub_version"] = client.get_version()
423-
info["user_info"] = client.get_user()
425+
426+
if fetch_user_details:
427+
info["user_info"] = client.get_user()
428+
info["groups"] = client.get_user_permissions()
429+
424430
info["status"] = ":white_heavy_check_mark:"
425-
info["groups"] = client.get_user_permissions()
426431
except Exception as e:
427432
info["error"] = f"{e!s} ({e.__class__.__name__})"
428433

@@ -469,7 +474,7 @@ def info( # noqa: PLR0915
469474
pretty_model = Pretty(client.config.model_dump(), expand_all=True)
470475
layout["client_info"].update(Panel(pretty_model, title="Client Info"))
471476

472-
# Infrahub information planel
477+
# Infrahub information panel
473478
infrahub_info = Table(show_header=False, box=None)
474479
if info["user_info"]:
475480
infrahub_info.add_row("User:", info["user_info"]["AccountProfile"]["display_label"])
@@ -487,6 +492,8 @@ def info( # noqa: PLR0915
487492
infrahub_info.add_row("Groups:", "")
488493
for group, roles in groups.items():
489494
infrahub_info.add_row("", group, ", ".join(roles))
495+
else:
496+
infrahub_info.add_row("User:", "anonymous")
490497

491498
layout["infrahub_info"].update(Panel(infrahub_info, title="Infrahub Info"))
492499

0 commit comments

Comments
 (0)