fix(cli): canfar status checks

Author: tjzegmott

dtcli/ps.py

@@ -12,7 +12,7 @@
 from dtcli.ls import list
 from dtcli.src import functions
 from dtcli.utilities import cadcclient
-from dtcli.utilities.utilities import set_log_level, validate_scope
+from dtcli.utilities.utilities import check_canfar_status, set_log_level, validate_scope
 
 logger = logging.getLogger("ps")
 
@@ -68,15 +68,7 @@ def ps(
         return None
 
     # Check Canfar status.
-    minoc_up, luskan_up = cadcclient.status()
-    if not minoc_up:
-        error_console.print(
-            "Either Minoc is down or certificate is invalid.", style="bold yellow"
-        )
-    elif not luskan_up:
-        error_console.print(
-            "Either Luskan is down or certificate is invalid.", style="bold yellow"
-        )
+    check_canfar_status(error_console)
 
     try:
         files, policies = functions.ps(scope, dataset, verbose, quiet)

dtcli/pull.py

@@ -11,7 +11,7 @@
 from dtcli.config import procure
 from dtcli.src.functions import find_missing_dataset_files, get_files
 from dtcli.utilities import cadcclient
-from dtcli.utilities.utilities import set_log_level, validate_scope
+from dtcli.utilities.utilities import check_canfar_status, set_log_level, validate_scope
 
 logger = logging.getLogger("pull")
 
@@ -110,15 +110,10 @@ def pull(  # noqa: C901
         return None
 
     # Check Canfar status.
-    minoc_up, luskan_up = cadcclient.status()
+    minoc_up, luskan_up = check_canfar_status(error_console)
+
     if not minoc_up:
-        error_console.print(
-            "Either Minoc is down or certificate is invalid.", style="bold yellow"
-        )
-    elif not luskan_up:
-        error_console.print(
-            "Either Luskan is down or certificate is invalid.", style="bold yellow"
-        )
+        return None
 
     # Find files missing from localhost.
     console.print(f"\nSearching for files for {dataset} {scope}...\n")

dtcli/scout.py

@@ -13,7 +13,7 @@
 from dtcli.config import procure
 from dtcli.ls import list as ls
 from dtcli.utilities import cadcclient
-from dtcli.utilities.utilities import set_log_level, validate_scope
+from dtcli.utilities.utilities import check_canfar_status, set_log_level, validate_scope
 
 logger = logging.getLogger("scout")
 
@@ -79,15 +79,7 @@ def scout(  # noqa: C901
         return {"error": "No config. Create one with `datatrail config init`."}
 
     # Check Canfar status.
-    minoc_up, luskan_up = cadcclient.status()
-    if not minoc_up:
-        error_console.print(
-            "Either Minoc is down or certificate is invalid.", style="bold yellow"
-        )
-    elif not luskan_up:
-        error_console.print(
-            "Either Luskan is down or certificate is invalid.", style="bold yellow"
-        )
+    check_canfar_status(error_console)
 
     # Scout dataset.
     endpoint = (

dtcli/utilities/cadcclient.py

@@ -422,8 +422,8 @@ def status(
             else:
                 raise TypeError
         except HTTPError as error:
-            logger.error(error)
-            logger.error(f"{url.split('/')[3]} is down.")
+            logger.warning(error)
+            logger.warning(f"{url.split('/')[3]} is down.")
         except TypeError:
             logger.error("Canfar certificate is not valid.")
     return minoc_status, luskan_status

dtcli/utilities/utilities.py

@@ -2,10 +2,13 @@
 
 import json
 import logging
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Tuple, Union
 
 import requests
 from requests.models import Response
+from rich.console import Console
+
+from dtcli.utilities import cadcclient
 
 try:
     from packaging.version import parse
@@ -133,3 +136,26 @@ def cli_is_latest_release() -> bool:
         return current_version == get_latest_released_version()
     except (ConnectionError, PackageNotFoundError):
         return True
+
+
+def check_canfar_status(console: Console) -> Tuple[bool, bool]:
+    """Checks the status of Luskan and Minoc.
+
+    Args:
+        console: Console to print status messages to.
+
+    Returns:
+        Tuple[bool, bool]: Status of Minoc and Luskan, respectively.
+    """
+    # Check Canfar status.
+    minoc_up, luskan_up = cadcclient.status()
+    if not minoc_up:
+        console.print(":warning: Minoc is down!", style="bold yellow")
+    if not luskan_up:
+        console.print(":warning: Luskan is down!", style="bold yellow")
+    if not minoc_up or not luskan_up:
+        console.print(
+            "See https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/en/status/ for service availability.",  # noqa: E501
+            style="bold yellow",
+        )
+    return minoc_up, luskan_up