refactor + minor issues

Author: 8ohamed

deploy/services/cli/dtaas_services/commands/service_ops.py

@@ -13,6 +13,7 @@
     check_running_services_for_clean,
     print_clean_status,
     build_clean_status_message,
+    _handle_operation_result,
 )
 
 
@@ -165,10 +166,7 @@ def clean(service_names, certs):
         with console.status(status_msg, spinner="dots"):
             err, msg = setup_obj.clean_services(service_list, include_certs=certs)
 
-        if err is not None:
-            raise click.ClickException(msg)
-
-        console.print(f"[green]✅ {msg}[/green]")
+        _handle_operation_result(console, err, msg)
 
     except FileNotFoundError as e:
         raise click.ClickException(str(e)) from e

deploy/services/cli/dtaas_services/commands/setup_ops.py

@@ -146,7 +146,7 @@ def _install_thingsboard(console: Console, service_obj: Service) -> None:
     "It typically takes 5\u201310 minutes after first start.[/yellow]\n"
     "[cyan]Next steps:[/cyan]\n"
     "  1. Check status:  dtaas-services status -s gitlab\n"
-        "It will be 'starting' while it's initlizing, then 'not ready' while it's installing."
+    "It will be 'starting' while it's initializing, then 'not ready' while it's installing."
     "  2. When status shows 'running', re-run:  "
     "dtaas-services install -s gitlab"
 )

deploy/services/cli/dtaas_services/commands/utility.py

@@ -37,6 +37,22 @@ def _print_operation_status(
         console.print(f"[{meta.color}]{meta.name} all services....[/{meta.color}]")
 
 
+def _handle_operation_result(console: Console, err, msg: str) -> None:
+    """Handle the result of a service operation.
+
+    Args:
+        console: Rich console for output
+        err: Error object from operation (None if success)
+        msg: Result message from operation
+
+    Raises:
+        click.ClickException: If operation failed
+    """
+    if err is not None:
+        raise click.ClickException(msg)
+    console.print(f"[green]✅ {msg}[/green]")
+
+
 def _handle_service_command(
     operation_func: Callable,
     service_list: Optional[list[str]],
@@ -52,10 +68,7 @@ def _handle_service_command(
         ):
             err, msg = operation_func(service_list)
 
-        if err is not None:
-            raise click.ClickException(msg)
-
-        console.print(f"[green]✅ {msg}[/green]")
+        _handle_operation_result(console, err, msg)
     except FileNotFoundError as e:
         raise click.ClickException(str(e)) from e
 

deploy/services/cli/dtaas_services/pkg/lib/status.py

@@ -1,6 +1,6 @@
 """Service status & inspection"""
 
-from typing import Any, Tuple, Optional, Set
+from typing import Tuple, Optional, Set
 from python_on_whales import Container
 from .utils import check_compose_file, DOCKER_OPERATION_EXCEPTIONS
 from ..formatter import RemovedServiceEntry
@@ -194,7 +194,7 @@ def _categorize_container_state(
             )
 
     def _process_single_container(
-        self, container: Any, container_map: dict, all_services: set
+        self, container: Container, container_map: dict, all_services: set
     ) -> None:
         """Process a single container and add to map if it matches a service."""
         if not self._match_container_by_name(container, container_map, all_services):

deploy/services/cli/dtaas_services/pkg/lib/utils.py

@@ -15,6 +15,17 @@
     TypeError,
 )
 
+# List of service names for data/log directory management
+SERVICE_DATA_SUBDIRS = [
+    "grafana",
+    "gitlab",
+    "influxdb",
+    "mongodb",
+    "postgres",
+    "rabbitmq",
+    "thingsboard",
+]
+
 
 def try_remove_file(path: Path) -> None:
     """Try to remove a file with permission handling."""
@@ -221,12 +232,4 @@ def get_data_subdirectories(service_list: Optional[list] = None) -> list:
     """Get list of data subdirectories to clean."""
     if service_list:
         return service_list
-    return [
-        "grafana",
-        "influxdb",
-        "mongodb",
-        "postgres",
-        "rabbitmq",
-        "thingsboard",
-        "gitlab",
-    ]
+    return SERVICE_DATA_SUBDIRS

deploy/services/cli/dtaas_services/pkg/password_store.py

@@ -7,7 +7,7 @@
 
 logger = logging.getLogger(__name__)
 
-PASSWORDS_FILE = "current.passwords.env"
+PASSWORDS_FILE = "password.env.current"
 
 # Keys belonging to each service (used by remove_service_passwords)
 SERVICE_KEYS = {

deploy/services/cli/dtaas_services/pkg/services/gitlab/health.py

@@ -3,6 +3,7 @@
 import logging
 from typing import Optional
 from python_on_whales import DockerClient
+from ...utils import get_container_health_status, has_running_container
 
 logger = logging.getLogger(__name__)
 
@@ -26,23 +27,6 @@ def _get_gitlab_container(docker):
         return None
 
 
-def _check_container_health(container) -> str:
-    """Get the health status of the GitLab container.
-
-    Args:
-        container: Docker container object
-
-    Returns:
-        Health status string, or "unknown" if not available
-    """
-    try:
-        if hasattr(container.state, "health") and container.state.health:
-            return container.state.health.status
-    except (AttributeError, TypeError):
-        logger.warning("Could not get health status for gitlab.")
-    return "unknown state"
-
-
 def is_gitlab_healthy(docker) -> str:
     """Check the current health status of the GitLab container (non-blocking).
 
@@ -56,7 +40,7 @@ def is_gitlab_healthy(docker) -> str:
     container = _get_gitlab_container(docker)
     if container is None:
         return "not found"
-    return _check_container_health(container)
+    return get_container_health_status(container)
 
 
 def is_gitlab_running() -> bool:
@@ -71,9 +55,7 @@ def is_gitlab_running() -> bool:
     try:
         docker = DockerClient()
         containers = docker.container.list(filters={"name": GITLAB_CONTAINER_NAME})
-        return any(
-            hasattr(c, "state") and c.state.status == "running" for c in containers
-        )
+        return has_running_container(containers)
     except Exception:
         logger.exception("Error while checking if GitLab is running")
         return False

deploy/services/cli/dtaas_services/pkg/services/gitlab/users.py

@@ -53,9 +53,7 @@ def _create_single_user(gl: gitlab.Gitlab, row: dict) -> Tuple[bool, str, int |
         return False, f"Failed to create user '{username}': {exc}", None
 
 
-def _create_user_and_pat(
-    gl: gitlab.Gitlab, row: dict
-) -> Tuple[bool, str, str]:
+def _create_user_and_pat(gl: gitlab.Gitlab, row: dict) -> Tuple[bool, str, str]:
     """Create a user and, if newly created, their Personal Access Token.
 
     Args:

deploy/services/cli/dtaas_services/pkg/services/thingsboard/checker.py

@@ -7,7 +7,7 @@
 import sys
 import click
 from rich.console import Console
-from ...utils import is_ci
+from ...utils import has_running_container, is_ci, is_container_running
 
 logger = logging.getLogger(__name__)
 
@@ -36,10 +36,7 @@ def _validate_postgres_for_thingsboard_check(container_map: dict) -> bool:
         return False
 
     postgres_container = container_map["postgres"]
-    return (
-        hasattr(postgres_container, "state")
-        and postgres_container.state.status == "running"
-    )
+    return is_container_running(postgres_container)
 
 
 def _find_thingsboard_containers(docker) -> list:
@@ -58,30 +55,6 @@ def _find_thingsboard_containers(docker) -> list:
         return []
 
 
-def _is_container_running(container) -> bool:
-    """Check if a single container is running.
-
-    Args:
-        container: Container object
-
-    Returns:
-        True if container has state and is running
-    """
-    return hasattr(container, "state") and container.state.status == "running"
-
-
-def _has_running_container(containers: list) -> bool:
-    """Check if any container in list is running.
-
-    Args:
-        containers: List of container objects
-
-    Returns:
-        True if any container is running
-    """
-    return any(_is_container_running(container) for container in containers)
-
-
 def _is_thingsboard_container_running(docker) -> bool:
     """Check if ThingsBoard container is running.
 
@@ -90,7 +63,7 @@ def _is_thingsboard_container_running(docker) -> bool:
     while ThingsBoard is running since ThingsBoard depends on PostgreSQL.
     """
     containers = _find_thingsboard_containers(docker)
-    return _has_running_container(containers)
+    return has_running_container(containers)
 
 
 def is_thingsboard_running() -> bool:

deploy/services/cli/dtaas_services/pkg/services/thingsboard/tb_utility.py

@@ -67,7 +67,7 @@ def run_thingsboard_install(console: Console, docker) -> None:
         "[bold cyan]Installing ThingsBoard schema...[/bold cyan]",
         spinner="dots",
     ):
-        timeout = int(os.getenv("THINGSBOARD_INSTALL_TIMEOUT", "300"))
+        timeout = 400
 
         try:
             with concurrent.futures.ThreadPoolExecutor(max_workers=1) as executor: