From 01a2a81a26dc48b3c7971493b13bf2e984bb2e60 Mon Sep 17 00:00:00 2001 From: Gabor Burges Date: Fri, 15 Sep 2023 18:02:12 +0200 Subject: [PATCH] Doesn't output frontend links if no frontend is deployed (#327) * Doesn't output frontend links if no frontend is deployed * Print 'No frontends found' if there are no frontends --------- Co-authored-by: Brandon Squizzato --- bonfire/namespaces.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/bonfire/namespaces.py b/bonfire/namespaces.py index 23b01b7f..4f9bfb8b 100644 --- a/bonfire/namespaces.py +++ b/bonfire/namespaces.py @@ -373,8 +373,6 @@ def extend_namespace(namespace, duration, local=True): def describe_namespace(project_name: str): - output = "" - ns_data = get_json("namespace", project_name) if not ns_data: raise FatalError(f"namespace '{project_name}' not found") @@ -382,18 +380,23 @@ def describe_namespace(project_name: str): if not ns.operator_ns: raise FatalError(f"namespace '{project_name}' was not reserved with namespace operator") + frontends = get_json("frontend", namespace=project_name) fe_host, keycloak_url = parse_fe_env(project_name) - fe_creds = get_keycloak_creds(project_name) - output += f"Current project: {project_name}\n" - + kc_creds = get_keycloak_creds(project_name) project_url = get_console_url() + + output = f"Current project: {project_name}\n" if project_url: ns_url = f"{project_url}/k8s/cluster/projects/{project_name}" - output += f"Console url: {ns_url}\n" + output += f"Project URL: {ns_url}\n" output += f"Keycloak admin route: {keycloak_url}\n" - output += f"Keycloak admin login: {fe_creds['username']} | {fe_creds['password']}\n" - output += f"Frontend route: https://{fe_host}\n" - output += f"Frontend login: {fe_creds['defaultUsername']} | {fe_creds['defaultPassword']}\n" + output += f"Keycloak admin login: {kc_creds['username']} | {kc_creds['password']}\n" + if frontends.get('items'): + output += f"Frontend route: https://{fe_host}\n" + else: + output += "No frontends deployed\n" + output += f"Default user login: {kc_creds['defaultUsername']} | {kc_creds['defaultPassword']}\n" + return output