devservices 1.2.4__tar.gz → 1.3.1__tar.gz

{devservices-1.2.4 → devservices-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devservices
-Version: 1.2.4
+Version: 1.3.1
 Requires-Python: >=3.11
 License-File: LICENSE.md
 Requires-Dist: pyyaml
@@ -8,10 +8,4 @@ Requires-Dist: sentry-devenv
 Requires-Dist: sentry-sdk
 Requires-Dist: packaging
 Requires-Dist: supervisor
-Provides-Extra: dev
-Requires-Dist: black; extra == "dev"
-Requires-Dist: mypy; extra == "dev"
-Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: types-PyYAML; extra == "dev"
 Dynamic: license-file

{devservices-1.2.4 → devservices-1.3.1}/README.md

@@ -33,7 +33,7 @@ NOTE: service-name is an optional parameter. If not provided, devservices will a
 The recommended way to install devservices is through a virtualenv in the requirements.txt. Once that is installed and a devservices config file is added, you should be able to run `devservices up` to begin local development.
 
 ```
-devservices==1.2.4
+devservices==1.3.1
 ```
 
 ### 2. Add devservices config files
@@ -50,6 +50,7 @@ The configuration file is a yaml file that looks like this:
 #   - local: A dependency that is defined in the config file. These dependencies do not have a remote field and must correspond to either a service defined in the 'services' section or a program defined in the 'x-programs' section.
 #   - remote: A dependency that is defined in the devservices directory in a remote repository. These configs are automatically fetched from the remote repository and installed. Any dependency with a remote field will be treated as a remote dependency. Example: https://github.com/getsentry/snuba/blob/59a5258ccbb502827ebc1d3b1bf80c607a3301bf/devservices/config.yml#L8
 # - modes: A list of modes for the service. Each mode includes a list of dependencies that are used in that mode.
+# - healthcheck_timeout: Optional. The number of seconds to wait for all containers to become healthy before failing. Defaults to 180.
 x-sentry-service-config:
   version: 0.1
   service_name: example-service
@@ -167,3 +168,11 @@ networks:
     name: devservices
     external: true
 ```
+
+## Dev
+
+```sh
+uv sync
+direnv allow
+pytest -n4
+```

{devservices-1.2.4 → devservices-1.3.1}/devservices/__init__.py

@@ -1,4 +1,5 @@
 """
 DevServices CLI tool for managing Docker Compose services.
 """
+
 from __future__ import annotations

{devservices-1.2.4 → devservices-1.3.1}/devservices/commands/down.py

@@ -3,19 +3,19 @@ from __future__ import annotations
 import concurrent.futures
 import os
 import subprocess
-from argparse import _SubParsersAction
 from argparse import ArgumentParser
 from argparse import Namespace
+from argparse import _SubParsersAction
 
 from sentry_sdk import capture_exception
 from sentry_sdk import logger as sentry_logger
 
 from devservices.constants import CONFIG_FILE_NAME
 from devservices.constants import DEPENDENCY_CONFIG_VERSION
-from devservices.constants import DependencyType
 from devservices.constants import DEVSERVICES_DEPENDENCIES_CACHE_DIR
 from devservices.constants import DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY
 from devservices.constants import DEVSERVICES_DIR_NAME
+from devservices.constants import DependencyType
 from devservices.exceptions import ConfigError
 from devservices.exceptions import ConfigNotFoundError
 from devservices.exceptions import DependencyError
@@ -25,16 +25,17 @@ from devservices.exceptions import SupervisorConfigError
 from devservices.exceptions import SupervisorError
 from devservices.utils.console import Console
 from devservices.utils.console import Status
-from devservices.utils.dependencies import construct_dependency_graph
 from devservices.utils.dependencies import DependencyNode
+from devservices.utils.dependencies import InstalledRemoteDependency
+from devservices.utils.dependencies import construct_dependency_graph
 from devservices.utils.dependencies import get_non_shared_remote_dependencies
 from devservices.utils.dependencies import install_and_verify_dependencies
-from devservices.utils.dependencies import InstalledRemoteDependency
 from devservices.utils.docker_compose import DockerComposeCommand
 from devservices.utils.docker_compose import get_docker_compose_commands_to_run
 from devservices.utils.docker_compose import run_cmd
-from devservices.utils.services import find_matching_service
 from devservices.utils.services import Service
+from devservices.utils.services import find_matching_service
+from devservices.utils.services import get_active_service_names
 from devservices.utils.state import ServiceRuntime
 from devservices.utils.state import State
 from devservices.utils.state import StateTables
@@ -71,7 +72,9 @@ def down(args: Namespace) -> None:
     console = Console()
     service_name = args.service_name
     try:
-        service = find_matching_service(service_name)
+        service = find_matching_service(
+            service_name, config_path=getattr(args, "config", None)
+        )
     except ConfigNotFoundError as e:
         capture_exception(e, level="info")
         console.failure(
@@ -90,9 +93,7 @@ def down(args: Namespace) -> None:
     exclude_local = getattr(args, "exclude_local", False)
 
     state = State()
-    starting_services = set(state.get_service_entries(StateTables.STARTING_SERVICES))
-    started_services = set(state.get_service_entries(StateTables.STARTED_SERVICES))
-    active_services = starting_services.union(started_services)
+    active_services = get_active_service_names(clean_stale_entries=True)
     if service.name not in active_services:
         console.warning(f"{service.name} is not running")
         return  # Since exit(0) is captured as an internal_error by sentry
@@ -232,9 +233,9 @@ def bring_down_service(
 
     # Set the environment variable for the local dependencies directory to be used by docker compose
     current_env = os.environ.copy()
-    current_env[
-        DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY
-    ] = relative_local_dependency_directory
+    current_env[DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY] = (
+        relative_local_dependency_directory
+    )
     state = State()
 
     # We want to ignore any dependencies that are set to run locally if we are excluding local dependencies

{devservices-1.2.4 → devservices-1.3.1}/devservices/commands/foreground.py

@@ -3,15 +3,15 @@ from __future__ import annotations
 import os
 import pty
 import shlex
-from argparse import _SubParsersAction
 from argparse import ArgumentParser
 from argparse import Namespace
+from argparse import _SubParsersAction
 
 from sentry_sdk import capture_exception
 
 from devservices.constants import CONFIG_FILE_NAME
-from devservices.constants import DependencyType
 from devservices.constants import DEVSERVICES_DIR_NAME
+from devservices.constants import DependencyType
 from devservices.exceptions import ConfigError
 from devservices.exceptions import ConfigNotFoundError
 from devservices.exceptions import ServiceNotFoundError
@@ -19,6 +19,7 @@ from devservices.exceptions import SupervisorConfigError
 from devservices.exceptions import SupervisorProcessError
 from devservices.utils.console import Console
 from devservices.utils.services import find_matching_service
+from devservices.utils.services import get_active_service_names
 from devservices.utils.state import State
 from devservices.utils.state import StateTables
 from devservices.utils.supervisor import SupervisorManager
@@ -39,7 +40,7 @@ def foreground(args: Namespace) -> None:
     console = Console()
     program_name = args.program_name
     try:
-        service = find_matching_service()
+        service = find_matching_service(config_path=getattr(args, "config", None))
     except ConfigNotFoundError as e:
         capture_exception(e, level="info")
         console.failure(
@@ -60,9 +61,7 @@ def foreground(args: Namespace) -> None:
         )
         return
     state = State()
-    starting_services = set(state.get_service_entries(StateTables.STARTING_SERVICES))
-    started_services = set(state.get_service_entries(StateTables.STARTED_SERVICES))
-    active_services = starting_services.union(started_services)
+    active_services = get_active_service_names()
     if service.name not in active_services:
         console.warning(f"{service.name} is not running")
         return

{devservices-1.2.4 → devservices-1.3.1}/devservices/commands/list_dependencies.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from argparse import _SubParsersAction
 from argparse import ArgumentParser
 from argparse import Namespace
+from argparse import _SubParsersAction
 
 from sentry_sdk import capture_exception
 
@@ -32,7 +32,9 @@ def list_dependencies(args: Namespace) -> None:
     service_name = args.service_name
 
     try:
-        service = find_matching_service(service_name)
+        service = find_matching_service(
+            service_name, config_path=getattr(args, "config", None)
+        )
     except ConfigNotFoundError as e:
         capture_exception(e, level="info")
         console.failure(

{devservices-1.2.4 → devservices-1.3.1}/devservices/commands/logs.py

@@ -3,19 +3,19 @@ from __future__ import annotations
 import concurrent.futures
 import os
 import subprocess
-from argparse import _SubParsersAction
 from argparse import ArgumentParser
 from argparse import Namespace
+from argparse import _SubParsersAction
 
 from sentry_sdk import capture_exception
 
 from devservices.constants import CONFIG_FILE_NAME
 from devservices.constants import DEPENDENCY_CONFIG_VERSION
-from devservices.constants import DependencyType
 from devservices.constants import DEVSERVICES_DEPENDENCIES_CACHE_DIR
 from devservices.constants import DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY
 from devservices.constants import DEVSERVICES_DIR_NAME
 from devservices.constants import MAX_LOG_LINES
+from devservices.constants import DependencyType
 from devservices.exceptions import ConfigError
 from devservices.exceptions import ConfigNotFoundError
 from devservices.exceptions import DependencyError
@@ -24,12 +24,16 @@ from devservices.exceptions import ServiceNotFoundError
 from devservices.exceptions import SupervisorConfigError
 from devservices.exceptions import SupervisorError
 from devservices.utils.console import Console
-from devservices.utils.dependencies import install_and_verify_dependencies
 from devservices.utils.dependencies import InstalledRemoteDependency
+from devservices.utils.dependencies import install_and_verify_dependencies
+from devservices.utils.docker import get_container_health
+from devservices.utils.docker_compose import DockerComposeCommand
+from devservices.utils.docker_compose import get_container_names_for_project
 from devservices.utils.docker_compose import get_docker_compose_commands_to_run
 from devservices.utils.docker_compose import run_cmd
-from devservices.utils.services import find_matching_service
 from devservices.utils.services import Service
+from devservices.utils.services import find_matching_service
+from devservices.utils.services import get_active_service_names
 from devservices.utils.state import State
 from devservices.utils.state import StateTables
 from devservices.utils.supervisor import SupervisorManager
@@ -51,7 +55,9 @@ def logs(args: Namespace) -> None:
     console = Console()
     service_name = args.service_name
     try:
-        service = find_matching_service(service_name)
+        service = find_matching_service(
+            service_name, config_path=getattr(args, "config", None)
+        )
     except ConfigNotFoundError as e:
         capture_exception(e, level="info")
         console.failure(
@@ -84,9 +90,7 @@ def logs(args: Namespace) -> None:
     if not mode_dependencies and "default" in modes:
         mode_dependencies.update(modes["default"])
 
-    starting_services = set(state.get_service_entries(StateTables.STARTING_SERVICES))
-    started_services = set(state.get_service_entries(StateTables.STARTED_SERVICES))
-    running_services = starting_services.union(started_services)
+    running_services = get_active_service_names()
     if service.name not in running_services:
         console.warning(f"Service {service.name} is not running")
         return
@@ -102,7 +106,9 @@ def logs(args: Namespace) -> None:
         )
         exit(1)
     try:
-        logs_output = _logs(service, remote_dependencies, list(mode_dependencies))
+        logs_output, docker_compose_commands = _logs(
+            service, list(remote_dependencies), list(mode_dependencies)
+        )
     except DockerComposeError as dce:
         capture_exception(dce, level="info")
         console.failure(f"Failed to get logs for {service.name}: {dce.stderr}")
@@ -128,12 +134,14 @@ def logs(args: Namespace) -> None:
                 console.info(f"=== Logs for supervisor program: {program_name} ===")
                 console.info(log_content)
 
+    _print_health_logs(console, docker_compose_commands)
+
 
 def _logs(
     service: Service,
-    remote_dependencies: set[InstalledRemoteDependency],
+    remote_dependencies: list[InstalledRemoteDependency],
     mode_dependencies: list[str],
-) -> list[subprocess.CompletedProcess[str]]:
+) -> tuple[list[subprocess.CompletedProcess[str]], list[DockerComposeCommand]]:
     relative_local_dependency_directory = os.path.relpath(
         os.path.join(DEVSERVICES_DEPENDENCIES_CACHE_DIR, DEPENDENCY_CONFIG_VERSION),
         service.repo_path,
@@ -141,23 +149,20 @@ def _logs(
     service_config_file_path = os.path.join(
         service.repo_path, DEVSERVICES_DIR_NAME, CONFIG_FILE_NAME
     )
-    # Set the environment variable for the local dependencies directory to be used by docker compose
     current_env = os.environ.copy()
-    current_env[
-        DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY
-    ] = relative_local_dependency_directory
+    current_env[DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY] = (
+        relative_local_dependency_directory
+    )
     docker_compose_commands = get_docker_compose_commands_to_run(
         service=service,
-        remote_dependencies=list(remote_dependencies),
+        remote_dependencies=remote_dependencies,
         current_env=current_env,
         command="logs",
-        options=["-n", MAX_LOG_LINES],
+        options=["--timestamps", "-n", MAX_LOG_LINES],
         service_config_file_path=service_config_file_path,
         mode_dependencies=mode_dependencies,
     )
-
     cmd_outputs = []
-
     with concurrent.futures.ThreadPoolExecutor() as executor:
         futures = [
             executor.submit(run_cmd, cmd.full_command, current_env)
@@ -165,8 +170,46 @@ def _logs(
         ]
         for future in concurrent.futures.as_completed(futures):
             cmd_outputs.append(future.result())
+    return cmd_outputs, docker_compose_commands
+
+
+def _print_health_logs(
+    console: Console, docker_compose_commands: list[DockerComposeCommand]
+) -> None:
+    container_names: list[str] = []
+    for cmd in docker_compose_commands:
+        try:
+            container_names += [
+                c.name
+                for c in get_container_names_for_project(
+                    cmd.project_name, cmd.config_path, cmd.services
+                )
+            ]
+        except Exception:
+            continue
+
+    if not container_names:
+        return
+
+    health_results = get_container_health(container_names)
+    if not health_results:
+        return
 
-    return cmd_outputs
+    console.info("=== Container health ===")
+    for h in health_results:
+        if h.status == "healthy":
+            console.success(f"  {h.name}: {h.status}")
+        elif h.status in ("unhealthy", "starting"):
+            console.warning(f"  {h.name}: {h.status}")
+        else:
+            console.info(f"  {h.name}: no healthcheck")
+
+    for h in health_results:
+        if not h.log or h.status == "healthy":
+            continue
+        console.info(f"\n--- {h.name} health check log ---")
+        for entry in h.log:
+            console.info(f"  exit={entry.exit_code}  {entry.output}")
 
 
 def _supervisor_logs(

{devservices-1.2.4 → devservices-1.3.1}/devservices/commands/reset.py

@@ -1,25 +1,26 @@
 from __future__ import annotations
 
-from argparse import _SubParsersAction
 from argparse import ArgumentParser
 from argparse import Namespace
+from argparse import _SubParsersAction
 
 from sentry_sdk import capture_exception
 
 from devservices.commands.down import down
-from devservices.constants import DependencyType
 from devservices.constants import DEVSERVICES_ORCHESTRATOR_LABEL
+from devservices.constants import DependencyType
 from devservices.exceptions import DockerDaemonNotRunningError
 from devservices.exceptions import DockerError
 from devservices.utils.console import Console
 from devservices.utils.console import Status
-from devservices.utils.dependencies import construct_dependency_graph
 from devservices.utils.dependencies import DependencyNode
+from devservices.utils.dependencies import construct_dependency_graph
 from devservices.utils.docker import get_matching_containers
 from devservices.utils.docker import get_volumes_for_containers
 from devservices.utils.docker import remove_docker_resources
 from devservices.utils.docker import stop_containers
 from devservices.utils.services import find_matching_service
+from devservices.utils.services import get_active_service_names
 from devservices.utils.state import State
 from devservices.utils.state import StateTables
 
@@ -69,9 +70,7 @@ def reset(args: Namespace) -> None:
         exit(1)
 
     state = State()
-    started_services = set(state.get_service_entries(StateTables.STARTED_SERVICES))
-    starting_services = set(state.get_service_entries(StateTables.STARTING_SERVICES))
-    active_service_names = starting_services.union(started_services)
+    active_service_names = get_active_service_names(clean_stale_entries=True)
 
     # TODO: We should add threading here to speed up the process
     for active_service_name in active_service_names:

{devservices-1.2.4 → devservices-1.3.1}/devservices/commands/serve.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 import os
 import pty
 import shlex
-from argparse import _SubParsersAction
 from argparse import ArgumentParser
 from argparse import Namespace
+from argparse import _SubParsersAction
 
 from sentry_sdk import capture_exception
 
@@ -35,7 +35,7 @@ def serve(args: Namespace) -> None:
     console = Console()
 
     try:
-        service = find_matching_service()
+        service = find_matching_service(config_path=getattr(args, "config", None))
     except ConfigNotFoundError as e:
         console.failure(
             f"{str(e)}. Please run the command from a directory with a valid devservices configuration."

{devservices-1.2.4 → devservices-1.3.1}/devservices/commands/status.py

@@ -4,22 +4,22 @@ import concurrent.futures
 import json
 import os
 import subprocess
-from argparse import _SubParsersAction
 from argparse import ArgumentParser
 from argparse import Namespace
+from argparse import _SubParsersAction
 from collections import namedtuple
 from datetime import timedelta
 from typing import TypedDict
 
 from sentry_sdk import capture_exception
 
-from devservices.constants import Color
 from devservices.constants import CONFIG_FILE_NAME
 from devservices.constants import DEPENDENCY_CONFIG_VERSION
-from devservices.constants import DependencyType
 from devservices.constants import DEVSERVICES_DEPENDENCIES_CACHE_DIR
 from devservices.constants import DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY
 from devservices.constants import DEVSERVICES_DIR_NAME
+from devservices.constants import Color
+from devservices.constants import DependencyType
 from devservices.exceptions import ConfigError
 from devservices.exceptions import ConfigNotFoundError
 from devservices.exceptions import DependencyError
@@ -27,15 +27,16 @@ from devservices.exceptions import DockerComposeError
 from devservices.exceptions import ServiceNotFoundError
 from devservices.exceptions import SupervisorConfigError
 from devservices.utils.console import Console
-from devservices.utils.dependencies import construct_dependency_graph
 from devservices.utils.dependencies import DependencyGraph
 from devservices.utils.dependencies import DependencyNode
-from devservices.utils.dependencies import install_and_verify_dependencies
 from devservices.utils.dependencies import InstalledRemoteDependency
+from devservices.utils.dependencies import construct_dependency_graph
+from devservices.utils.dependencies import install_and_verify_dependencies
 from devservices.utils.docker_compose import get_docker_compose_commands_to_run
 from devservices.utils.docker_compose import run_cmd
-from devservices.utils.services import find_matching_service
 from devservices.utils.services import Service
+from devservices.utils.services import find_matching_service
+from devservices.utils.services import get_active_service_names
 from devservices.utils.state import ServiceRuntime
 from devservices.utils.state import State
 from devservices.utils.state import StateTables
@@ -80,7 +81,9 @@ def status(args: Namespace) -> None:
     console = Console()
     service_name = args.service_name
     try:
-        service = find_matching_service(service_name)
+        service = find_matching_service(
+            service_name, config_path=getattr(args, "config", None)
+        )
     except ConfigNotFoundError as e:
         capture_exception(e)
         console.failure(
@@ -95,10 +98,7 @@ def status(args: Namespace) -> None:
         console.failure(str(e))
         exit(1)
 
-    state = State()
-    starting_services = set(state.get_service_entries(StateTables.STARTING_SERVICES))
-    started_services = set(state.get_service_entries(StateTables.STARTED_SERVICES))
-    active_services = starting_services.union(started_services)
+    active_services = get_active_service_names()
     if service.name not in active_services:
         console.warning(f"Status unavailable. {service.name} is not running standalone")
         return  # Since exit(0) is captured as an internal_error by sentry
@@ -182,9 +182,9 @@ def get_status_json_results(
     )
     # Set the environment variable for the local dependencies directory to be used by docker compose
     current_env = os.environ.copy()
-    current_env[
-        DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY
-    ] = relative_local_dependency_directory
+    current_env[DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY] = (
+        relative_local_dependency_directory
+    )
     docker_compose_commands = get_docker_compose_commands_to_run(
         service=service,
         remote_dependencies=list(remote_dependencies),
@@ -318,9 +318,9 @@ def parse_docker_compose_status(
                 docker_compose_service_status
             )
             compose_service = docker_compose_service_status_json["Service"]
-            docker_compose_service_to_status[
-                compose_service
-            ] = docker_compose_service_status_json
+            docker_compose_service_to_status[compose_service] = (
+                docker_compose_service_status_json
+            )
 
     return docker_compose_service_to_status
 

{devservices-1.2.4 → devservices-1.3.1}/devservices/commands/toggle.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from argparse import _SubParsersAction
 from argparse import ArgumentParser
 from argparse import Namespace
+from argparse import _SubParsersAction
 
 from sentry_sdk import capture_exception
 
@@ -19,8 +19,9 @@ from devservices.utils.console import Status
 from devservices.utils.dependencies import construct_dependency_graph
 from devservices.utils.dependencies import get_non_shared_remote_dependencies
 from devservices.utils.dependencies import install_and_verify_dependencies
-from devservices.utils.services import find_matching_service
 from devservices.utils.services import Service
+from devservices.utils.services import find_matching_service
+from devservices.utils.services import get_active_service_names
 from devservices.utils.state import ServiceRuntime
 from devservices.utils.state import State
 from devservices.utils.state import StateTables
@@ -52,7 +53,9 @@ def toggle(args: Namespace) -> None:
     console = Console()
     service_name = args.service_name
     try:
-        service = find_matching_service(service_name)
+        service = find_matching_service(
+            service_name, config_path=getattr(args, "config", None)
+        )
     except ConfigNotFoundError as e:
         capture_exception(e, level="info")
         console.failure(
@@ -97,9 +100,7 @@ def handle_transition_to_local_runtime(service_to_transition: Service) -> None:
     console = Console()
     state = State()
 
-    starting_services = set(state.get_service_entries(StateTables.STARTING_SERVICES))
-    started_services = set(state.get_service_entries(StateTables.STARTED_SERVICES))
-    active_services = starting_services.union(started_services)
+    active_services = get_active_service_names(clean_stale_entries=True)
 
     # If the service is already running standalone, we can just update the runtime
     if service_to_transition.name in active_services:
@@ -158,9 +159,7 @@ def handle_transition_to_containerized_runtime(service: Service) -> None:
     """Handle the transition to a containerized runtime for a service."""
     console = Console()
     state = State()
-    starting_services = set(state.get_service_entries(StateTables.STARTING_SERVICES))
-    started_services = set(state.get_service_entries(StateTables.STARTED_SERVICES))
-    active_services = starting_services.union(started_services)
+    active_services = get_active_service_names(clean_stale_entries=True)
     if service.name in active_services:
         console.warning(f"{service.name} is running, please stop it first")
         return

{devservices-1.2.4 → devservices-1.3.1}/devservices/commands/up.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 import concurrent.futures
 import os
 import subprocess
-from argparse import _SubParsersAction
 from argparse import ArgumentParser
 from argparse import Namespace
+from argparse import _SubParsersAction
 
 from sentry_sdk import capture_exception
 from sentry_sdk import logger as sentry_logger
@@ -14,10 +14,10 @@ from sentry_sdk import start_span
 
 from devservices.constants import CONFIG_FILE_NAME
 from devservices.constants import DEPENDENCY_CONFIG_VERSION
-from devservices.constants import DependencyType
 from devservices.constants import DEVSERVICES_DEPENDENCIES_CACHE_DIR
 from devservices.constants import DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY
 from devservices.constants import DEVSERVICES_DIR_NAME
+from devservices.constants import DependencyType
 from devservices.exceptions import ConfigError
 from devservices.exceptions import ConfigNotFoundError
 from devservices.exceptions import ContainerHealthcheckFailedError
@@ -29,17 +29,17 @@ from devservices.exceptions import SupervisorConfigError
 from devservices.exceptions import SupervisorError
 from devservices.utils.console import Console
 from devservices.utils.console import Status
-from devservices.utils.dependencies import construct_dependency_graph
 from devservices.utils.dependencies import DependencyNode
-from devservices.utils.dependencies import install_and_verify_dependencies
 from devservices.utils.dependencies import InstalledRemoteDependency
+from devservices.utils.dependencies import construct_dependency_graph
+from devservices.utils.dependencies import install_and_verify_dependencies
 from devservices.utils.docker import check_all_containers_healthy
 from devservices.utils.docker_compose import DockerComposeCommand
 from devservices.utils.docker_compose import get_container_names_for_project
 from devservices.utils.docker_compose import get_docker_compose_commands_to_run
 from devservices.utils.docker_compose import run_cmd
-from devservices.utils.services import find_matching_service
 from devservices.utils.services import Service
+from devservices.utils.services import find_matching_service
 from devservices.utils.state import ServiceRuntime
 from devservices.utils.state import State
 from devservices.utils.state import StateTables
@@ -76,7 +76,9 @@ def up(args: Namespace, existing_status: Status | None = None) -> None:
     console = Console()
     service_name = args.service_name
     try:
-        service = find_matching_service(service_name)
+        service = find_matching_service(
+            service_name, config_path=getattr(args, "config", None)
+        )
     except ConfigNotFoundError as e:
         capture_exception(e, level="info")
         console.failure(
@@ -318,9 +320,9 @@ def bring_up_docker_compose_services(
     )
     # Set the environment variable for the local dependencies directory to be used by docker compose
     current_env = os.environ.copy()
-    current_env[
-        DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY
-    ] = relative_local_dependency_directory
+    current_env[DEVSERVICES_DEPENDENCIES_CACHE_DIR_KEY] = (
+        relative_local_dependency_directory
+    )
     dependency_graph = construct_dependency_graph(service, modes=modes)
     starting_order = dependency_graph.get_starting_order()
     sorted_remote_dependencies = sorted(
@@ -388,7 +390,9 @@ def bring_up_docker_compose_services(
             )
             exit(1)
     try:
-        check_all_containers_healthy(status, containers_to_check)
+        check_all_containers_healthy(
+            status, containers_to_check, timeout=service.config.healthcheck_timeout
+        )
     except ContainerHealthcheckFailedError as e:
         status.failure(str(e))
         exit(1)