devservices 1.2.1__tar.gz → 1.2.3__tar.gz

{devservices-1.2.1 → devservices-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devservices
-Version: 1.2.1
+Version: 1.2.3
 Requires-Python: >=3.11
 License-File: LICENSE.md
 Requires-Dist: pyyaml

{devservices-1.2.1 → devservices-1.2.3}/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.1
+devservices==1.2.3
 ```
 
 ### 2. Add devservices config files
@@ -47,7 +47,7 @@ The configuration file is a yaml file that looks like this:
 # - version: The version of the devservices config file. This is used to ensure compatibility between devservices and the config file.
 # - service_name: The name of the service. This is used to identify the service in the config file.
 # - dependencies: A list of dependencies for the service. Each dependency is a yaml block that holds the dependency configuration. There are two types of dependencies:
-#   - local: A dependency that is defined in the config file. These dependencies do not have a remote field. These dependency definitions are specific to the service and are not defined elsewhere.
+#   - 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.
 x-sentry-service-config:
@@ -69,6 +69,27 @@ x-sentry-service-config:
     default: [example-dependency-1, example-remote-dependency]
     custom-mode: [example-dependency-1, example-dependency-2, example-remote-dependency]
 
+# This block defines supervisor programs that can be managed by devservices.
+# Programs defined here are managed using Python's supervisor package and can be:
+# - Started and stopped along with docker services when running `devservices up/down`
+# - Run in the foreground for interactive debugging using `devservices foreground <program-name>`
+# - Used as development server with `devservices serve` (requires a program named "devserver")
+#
+# These are particularly useful for:
+# - Defining a devserver to run locally
+# - Background workers or task processors
+# - Any process that needs to be managed alongside your docker services
+x-programs:
+  # Example devserver
+  devserver:
+    # Required: The command to execute
+    command: "python manage.py run_server"
+    # Optional: You can also specify any of the supervisor program settings defined here: https://supervisord.org/configuration.html#program-x-section-settings
+
+  # Example background worker
+  example-worker:
+    command: "python manage.py worker"
+
 # This will be a standard block used by docker compose to define dependencies.
 #
 # The following fields are important to all dependencies:

{devservices-1.2.1 → devservices-1.2.3}/devservices/commands/down.py

@@ -8,6 +8,7 @@ from argparse import ArgumentParser
 from argparse import Namespace
 
 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
@@ -116,6 +117,15 @@ def down(args: Namespace) -> None:
         == DependencyType.SUPERVISOR
     ]
 
+    sentry_logger.info(
+        "Stopping service",
+        extra={
+            "service_name": service.name,
+            "exclude_local": exclude_local,
+            "active_modes": list(active_modes),
+        },
+    )
+
     with Status(
         lambda: console.warning(f"Stopping {service.name}"),
     ) as status:

devservices-1.2.3/devservices/commands/purge.py

@@ -0,0 +1,219 @@
+from __future__ import annotations
+
+import os
+import shutil
+from argparse import _SubParsersAction
+from argparse import ArgumentParser
+from argparse import Namespace
+
+from devservices.configs.service_config import load_service_config_from_file
+from devservices.constants import DEPENDENCY_CONFIG_VERSION
+from devservices.constants import DEVSERVICES_CACHE_DIR
+from devservices.constants import DEVSERVICES_DEPENDENCIES_CACHE_DIR
+from devservices.constants import DEVSERVICES_ORCHESTRATOR_LABEL
+from devservices.constants import DOCKER_NETWORK_NAME
+from devservices.exceptions import ConfigNotFoundError
+from devservices.exceptions import ConfigParseError
+from devservices.exceptions import ConfigValidationError
+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.docker import get_matching_containers
+from devservices.utils.docker import get_matching_networks
+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.state import State
+from devservices.utils.state import StateTables
+
+
+def add_parser(subparsers: _SubParsersAction[ArgumentParser]) -> None:
+    parser = subparsers.add_parser("purge", help="Purge the local devservices cache")
+    parser.add_argument(
+        "service_name",
+        nargs="?",
+        help="Service name to purge (optional, purges all if not specified)",
+        default=None,
+    )
+    parser.set_defaults(func=purge)
+
+
+def _get_service_cache_paths(service_name: str) -> list[str]:
+    """Find cache directory paths for a given service name."""
+
+    cache_paths: list[str] = []
+    dependencies_cache_dir = os.path.join(
+        DEVSERVICES_DEPENDENCIES_CACHE_DIR, DEPENDENCY_CONFIG_VERSION
+    )
+
+    if not os.path.exists(dependencies_cache_dir):
+        return cache_paths
+
+    for repo_name in os.listdir(dependencies_cache_dir):
+        repo_path = os.path.join(dependencies_cache_dir, repo_name)
+        if not os.path.isdir(repo_path):
+            continue
+
+        try:
+            service_config = load_service_config_from_file(repo_path)
+            if service_config.service_name == service_name:
+                cache_paths.append(repo_path)
+        except (ConfigNotFoundError, ConfigParseError, ConfigValidationError):
+            # Skip invalid configs
+            continue
+
+    return cache_paths
+
+
+def purge(args: Namespace) -> None:
+    """Purge the local devservices state and cache and remove all devservices containers and volumes."""
+    console = Console()
+    service_name = getattr(args, "service_name", None)
+
+    if service_name:
+        _purge_service(service_name, console)
+    else:
+        _purge_all(console)
+
+
+def _purge_service(service_name: str, console: Console) -> None:
+    """Purge a specific service."""
+    state = State()
+
+    # Warn user about potential dependency issues
+    if not console.confirm(
+        f"WARNING: Purging {service_name} may introduce issues with the dependency tree.\n"
+        "Other services that depend on this service may stop working correctly.\n"
+        "Do you want to continue?"
+    ):
+        console.info("Purge cancelled.")
+        return
+
+    state.remove_service_entry(service_name, StateTables.SERVICE_RUNTIME)
+
+    try:
+        service_containers = get_matching_containers(
+            [
+                DEVSERVICES_ORCHESTRATOR_LABEL,
+                f"com.docker.compose.service={service_name}",
+            ]
+        )
+    except DockerDaemonNotRunningError as e:
+        console.warning(str(e))
+        service_containers = []
+    except DockerError as de:
+        console.failure(f"Failed to get containers for {service_name}: {de.stderr}")
+        exit(1)
+
+    if len(service_containers) == 0:
+        console.warning(f"No containers found for {service_name}")
+    else:
+        try:
+            service_volumes = get_volumes_for_containers(service_containers)
+        except DockerError as e:
+            console.failure(f"Failed to get volumes for {service_name}: {e.stderr}")
+            exit(1)
+
+        with Status(
+            lambda: console.warning(f"Stopping {service_name} containers"),
+            lambda: console.success(f"{service_name} containers have been stopped"),
+        ):
+            try:
+                stop_containers(service_containers, should_remove=True)
+            except DockerError as e:
+                console.failure(f"Failed to stop {service_name} containers: {e.stderr}")
+                exit(1)
+
+        console.warning(f"Removing {service_name} docker volumes")
+        if len(service_volumes) == 0:
+            console.success(f"No volumes found for {service_name}")
+        else:
+            try:
+                remove_docker_resources("volume", list(service_volumes))
+                console.success(f"{service_name} volumes removed")
+            except DockerError as e:
+                console.failure(f"Failed to remove {service_name} volumes: {e.stderr}")
+
+    cache_paths = _get_service_cache_paths(service_name)
+    if cache_paths:
+        console.warning(f"Removing cache for {service_name}")
+        for cache_path in cache_paths:
+            try:
+                shutil.rmtree(cache_path)
+            except PermissionError as e:
+                console.failure(f"Failed to remove cache at {cache_path}: {e}")
+                exit(1)
+        console.success(f"Cache for {service_name} has been removed")
+    else:
+        console.success(f"No cache found for {service_name}")
+
+    console.success(f"{service_name} has been purged")
+
+
+def _purge_all(console: Console) -> None:
+    """Purge all devservices state, cache, containers, volumes, and networks."""
+    if os.path.exists(DEVSERVICES_CACHE_DIR):
+        try:
+            shutil.rmtree(DEVSERVICES_CACHE_DIR)
+        except PermissionError as e:
+            console.failure(f"Failed to purge cache: {e}")
+            exit(1)
+    state = State()
+    state.clear_state()
+
+    try:
+        devservices_containers = get_matching_containers(
+            [DEVSERVICES_ORCHESTRATOR_LABEL]
+        )
+    except DockerDaemonNotRunningError as e:
+        console.warning(str(e))
+        return
+    except DockerError as de:
+        console.failure(f"Failed to get devservices containers {de.stderr}")
+        exit(1)
+
+    try:
+        devservices_volumes = get_volumes_for_containers(devservices_containers)
+    except DockerError as e:
+        console.failure(f"Failed to get devservices volumes {e.stderr}")
+        exit(1)
+
+    with Status(
+        lambda: console.warning("Stopping all devservices containers"),
+        lambda: console.success("All devservices containers have been stopped"),
+    ):
+        try:
+            stop_containers(devservices_containers, should_remove=True)
+        except DockerError as e:
+            console.failure(f"Failed to stop devservices containers {e.stderr}")
+            exit(1)
+
+    console.warning("Removing any devservices docker volumes")
+    if len(devservices_volumes) == 0:
+        console.success("No devservices volumes found to remove")
+    else:
+        try:
+            remove_docker_resources("volume", list(devservices_volumes))
+            console.success("All devservices volumes removed")
+        except DockerError as e:
+            # We don't want to exit here since we still want to try to remove the networks
+            console.failure(f"Failed to remove devservices volumes {e.stderr}")
+
+    console.warning("Removing any devservices networks")
+    try:
+        devservices_networks = get_matching_networks(DOCKER_NETWORK_NAME)
+    except DockerError as e:
+        console.failure(f"Failed to get devservices networks {e.stderr}")
+        exit(1)
+    if len(devservices_networks) == 0:
+        console.success("No devservices networks found to remove")
+    else:
+        try:
+            remove_docker_resources("network", devservices_networks)
+            console.success("All devservices networks removed")
+        except DockerError as e:
+            console.failure(f"Failed to remove devservices networks {e.stderr}")
+            exit(1)
+
+    console.success("The local devservices cache and state has been purged")

{devservices-1.2.1 → devservices-1.2.3}/devservices/commands/up.py

@@ -8,6 +8,7 @@ from argparse import ArgumentParser
 from argparse import Namespace
 
 from sentry_sdk import capture_exception
+from sentry_sdk import logger as sentry_logger
 from sentry_sdk import set_context
 from sentry_sdk import start_span
 
@@ -94,18 +95,30 @@ def up(args: Namespace, existing_status: Status | None = None) -> None:
     mode = args.mode
     exclude_local = getattr(args, "exclude_local", False)
 
+    sentry_logger.info(
+        "Starting service",
+        extra={
+            "service_name": service.name,
+            "mode": mode,
+            "exclude_local": exclude_local,
+            "available_modes": list(modes.keys()),
+        },
+    )
+
     state = State()
 
     with Status(
         lambda: (
-            console.warning(f"Starting '{service.name}' in mode: '{mode}'")
+            console.warning(f"Starting '{service.name}' dependencies in mode: '{mode}'")
             if existing_status is None
-            else existing_status.warning(f"Starting '{service.name}' in mode: '{mode}'")
+            else existing_status.warning(
+                f"Starting '{service.name}' dependencies in mode: '{mode}'"
+            )
         ),
         lambda: (
-            console.success(f"{service.name} started")
+            console.success(f"{service.name} dependencies started")
             if existing_status is None
-            else existing_status.success(f"{service.name} started")
+            else existing_status.success(f"{service.name} dependencies started")
         ),
     ) as status:
         local_runtime_dependency_names = set()

{devservices-1.2.1 → devservices-1.2.3}/devservices/main.py

@@ -16,6 +16,7 @@ from sentry_sdk import set_tag
 from sentry_sdk import set_user
 from sentry_sdk import start_transaction
 from sentry_sdk.integrations.argv import ArgvIntegration
+from sentry_sdk.integrations.logging import LoggingIntegration
 from sentry_sdk.types import Event
 from sentry_sdk.types import Hint
 
@@ -79,7 +80,11 @@ if not disable_sentry:
         dsn="https://56470da7302c16e83141f62f88e46449@o1.ingest.us.sentry.io/4507946704961536",
         traces_sample_rate=1.0,
         profiles_sample_rate=1.0,
-        integrations=[ArgvIntegration()],
+        integrations=[
+            ArgvIntegration(),
+            LoggingIntegration(sentry_logs_level=logging.DEBUG),
+        ],
+        enable_logs=True,
         environment=sentry_environment,
         before_send=before_send_error,
         before_send_transaction=before_send_transaction,

{devservices-1.2.1 → devservices-1.2.3}/devservices/utils/dependencies.py

@@ -14,6 +14,7 @@ from typing import TextIO
 from typing import TypeGuard
 
 from sentry_sdk import capture_message
+from sentry_sdk import logger as sentry_logger
 from sentry_sdk import set_context
 
 from devservices.configs.service_config import Dependency
@@ -417,6 +418,16 @@ def install_dependency(dependency: RemoteConfig) -> set[InstalledRemoteDependenc
         dependency.repo_name,
     )
 
+    sentry_logger.info(
+        "Installing dependency",
+        extra={
+            "repo_name": dependency.repo_name,
+            "repo_link": dependency.repo_link,
+            "branch": dependency.branch,
+            "mode": dependency.mode,
+        },
+    )
+
     os.makedirs(DEVSERVICES_DEPENDENCIES_CACHE_DIR, exist_ok=True)
 
     # Ensure that only one process is installing a specific dependency at a time
@@ -498,6 +509,14 @@ def _update_dependency(
     dependency: RemoteConfig,
     dependency_repo_dir: str,
 ) -> None:
+    sentry_logger.info(
+        "Updating dependency",
+        extra={
+            "repo_name": dependency.repo_name,
+            "repo_link": dependency.repo_link,
+            "branch": dependency.branch,
+        },
+    )
     git_config_manager = GitConfigManager(
         dependency_repo_dir,
         DEPENDENCY_GIT_PARTIAL_CLONE_CONFIG_OPTIONS,
@@ -580,6 +599,14 @@ def _checkout_dependency(
     dependency: RemoteConfig,
     dependency_repo_dir: str,
 ) -> None:
+    sentry_logger.info(
+        "Checking out dependency",
+        extra={
+            "repo_name": dependency.repo_name,
+            "repo_link": dependency.repo_link,
+            "branch": dependency.branch,
+        },
+    )
     with tempfile.TemporaryDirectory() as temp_dir:
         try:
             _run_command(

{devservices-1.2.1 → devservices-1.2.3}/devservices/utils/docker.py

@@ -10,6 +10,7 @@ from devservices.constants import HEALTHCHECK_TIMEOUT
 from devservices.exceptions import ContainerHealthcheckFailedError
 from devservices.exceptions import DockerDaemonNotRunningError
 from devservices.exceptions import DockerError
+from devservices.utils.console import Console
 from devservices.utils.console import Status
 
 
@@ -20,6 +21,7 @@ class ContainerNames(NamedTuple):
 
 def check_docker_daemon_running() -> None:
     """Checks if the Docker daemon is running. Raises DockerDaemonNotRunningError if not."""
+    console = Console()
     try:
         subprocess.run(
             ["docker", "info"],
@@ -27,7 +29,13 @@ def check_docker_daemon_running() -> None:
             text=True,
             check=True,
         )
+        return
+    except subprocess.CalledProcessError:
+        console.info("Docker daemon is not running. Checking if colima is available")
+    try:
+        subprocess.run(["devenv", "colima", "start"], check=True)
     except subprocess.CalledProcessError as e:
+        console.failure("Failed to start colima")
         raise DockerDaemonNotRunningError from e
 
 

{devservices-1.2.1 → devservices-1.2.3}/devservices/utils/docker_compose.py

@@ -12,6 +12,7 @@ from typing import cast
 from typing import NamedTuple
 
 from packaging import version
+from sentry_sdk import logger as sentry_logger
 
 from devservices.configs.service_config import load_service_config_from_file
 from devservices.constants import CONFIG_FILE_NAME
@@ -306,6 +307,14 @@ def run_cmd(
     console = Console()
     cmd_pretty = shlex.join(cmd)
 
+    sentry_logger.info(
+        "Running docker compose command",
+        extra={
+            "command": cmd_pretty,
+            "max_retries": retries,
+        },
+    )
+
     proc = None
     retries += 1  # initial try
 

{devservices-1.2.1 → devservices-1.2.3}/devservices.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devservices
-Version: 1.2.1
+Version: 1.2.3
 Requires-Python: >=3.11
 License-File: LICENSE.md
 Requires-Dist: pyyaml

{devservices-1.2.1 → devservices-1.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devservices"
-version = "1.2.1"
+version = "1.2.3"
 # 3.11 is just for internal pypi compat
 requires-python = ">=3.11"
 dependencies = [

{devservices-1.2.1 → devservices-1.2.3}/tests/commands/test_purge.py

@@ -552,3 +552,147 @@ def test_purge_with_cache_and_state_and_containers_with_networks_and_volumes(
                 mock.call("network", ["abc", "def", "ghe"]),
             ]
         )
+
+
+@mock.patch("devservices.commands.purge.Console.confirm")
+@mock.patch("devservices.commands.purge.get_matching_containers")
+@mock.patch("devservices.commands.purge.get_volumes_for_containers")
+@mock.patch("devservices.commands.purge.stop_containers")
+@mock.patch("devservices.commands.purge.remove_docker_resources")
+@mock.patch("devservices.commands.purge._get_service_cache_paths")
+def test_purge_specific_service(
+    mock_get_service_cache_paths: mock.Mock,
+    mock_remove_docker_resources: mock.Mock,
+    mock_stop_containers: mock.Mock,
+    mock_get_volumes_for_containers: mock.Mock,
+    mock_get_matching_containers: mock.Mock,
+    mock_console_confirm: mock.Mock,
+    tmp_path: Path,
+) -> None:
+    """Test that purging a specific service removes only that service's containers, volumes, and cache."""
+    mock_console_confirm.return_value = True
+    mock_get_matching_containers.return_value = [
+        "kafka-container-1",
+        "kafka-container-2",
+    ]
+    mock_get_volumes_for_containers.return_value = ["kafka-volume-1", "kafka-volume-2"]
+    cache_path = tmp_path / "dependencies" / "v1" / "kafka-repo"
+    cache_path.mkdir(parents=True, exist_ok=True)
+    mock_get_service_cache_paths.return_value = [str(cache_path)]
+
+    with (
+        mock.patch("devservices.utils.state.STATE_DB_FILE", str(tmp_path / "state")),
+        mock.patch(
+            "devservices.utils.docker.check_docker_daemon_running", return_value=None
+        ),
+    ):
+        state = State()
+        # Don't add kafka to STARTED_SERVICES - it should be stopped before purging
+        # Add redis to verify it's not affected by kafka purge
+        state.update_service_entry("redis", "default", StateTables.STARTED_SERVICES)
+
+        assert state.get_service_entries(StateTables.STARTED_SERVICES) == ["redis"]
+        assert cache_path.exists()
+
+        purge(Namespace(service_name="kafka"))
+
+        # redis should still be in state (unaffected)
+        assert state.get_service_entries(StateTables.STARTED_SERVICES) == ["redis"]
+        # Cache path should be removed
+        assert not cache_path.exists()
+
+        # Should filter containers by service name
+        mock_get_matching_containers.assert_called_once_with(
+            [
+                DEVSERVICES_ORCHESTRATOR_LABEL,
+                "com.docker.compose.service=kafka",
+            ]
+        )
+        mock_get_volumes_for_containers.assert_called_once_with(
+            ["kafka-container-1", "kafka-container-2"]
+        )
+        mock_stop_containers.assert_called_once_with(
+            ["kafka-container-1", "kafka-container-2"], should_remove=True
+        )
+        mock_remove_docker_resources.assert_called_once_with(
+            "volume", ["kafka-volume-1", "kafka-volume-2"]
+        )
+        mock_get_service_cache_paths.assert_called_once_with("kafka")
+
+
+@mock.patch("devservices.commands.purge.Console.confirm")
+@mock.patch("devservices.commands.purge.get_matching_containers")
+@mock.patch("devservices.commands.purge._get_service_cache_paths")
+def test_purge_specific_service_no_containers(
+    mock_get_service_cache_paths: mock.Mock,
+    mock_get_matching_containers: mock.Mock,
+    mock_console_confirm: mock.Mock,
+    capsys: pytest.CaptureFixture[str],
+    tmp_path: Path,
+) -> None:
+    """Test that purging a service with no containers or cache still removes it from state."""
+    mock_console_confirm.return_value = True
+    mock_get_matching_containers.return_value = []
+    mock_get_service_cache_paths.return_value = []
+
+    with (
+        mock.patch("devservices.utils.state.STATE_DB_FILE", str(tmp_path / "state")),
+        mock.patch(
+            "devservices.utils.docker.check_docker_daemon_running", return_value=None
+        ),
+    ):
+        state = State()
+        # Don't add kafka to STARTED_SERVICES - it should be stopped before purging
+
+        args = Namespace(service_name="kafka")
+        purge(args)
+
+        # State should remain empty (kafka was never added)
+        assert state.get_service_entries(StateTables.STARTED_SERVICES) == []
+
+        captured = capsys.readouterr()
+        assert "No containers found for kafka" in captured.out
+        assert "No cache found for kafka" in captured.out
+        assert "kafka has been purged" in captured.out
+
+
+@mock.patch("devservices.commands.purge.Console.confirm")
+@mock.patch("devservices.commands.purge.get_matching_containers")
+@mock.patch("devservices.commands.purge._get_service_cache_paths")
+def test_purge_specific_service_cancelled_by_user(
+    mock_get_service_cache_paths: mock.Mock,
+    mock_get_matching_containers: mock.Mock,
+    mock_console_confirm: mock.Mock,
+    capsys: pytest.CaptureFixture[str],
+    tmp_path: Path,
+) -> None:
+    """Test that purging a service can be cancelled by the user."""
+    mock_console_confirm.return_value = False
+    mock_get_matching_containers.return_value = []
+    mock_get_service_cache_paths.return_value = []
+
+    with (
+        mock.patch("devservices.utils.state.STATE_DB_FILE", str(tmp_path / "state")),
+        mock.patch(
+            "devservices.utils.docker.check_docker_daemon_running", return_value=None
+        ),
+    ):
+        state = State()
+        # Add kafka to state
+        state.update_service_entry("kafka", "default", StateTables.STARTED_SERVICES)
+
+        args = Namespace(service_name="kafka")
+        purge(args)
+
+        # Service should still be in state (purge was cancelled)
+        assert state.get_service_entries(StateTables.STARTED_SERVICES) == ["kafka"]
+
+        # Should have prompted user
+        mock_console_confirm.assert_called_once()
+
+        # Should not have attempted to get containers
+        mock_get_matching_containers.assert_not_called()
+        mock_get_service_cache_paths.assert_not_called()
+
+        captured = capsys.readouterr()
+        assert "Purge cancelled." in captured.out

{devservices-1.2.1 → devservices-1.2.3}/tests/commands/test_up.py

@@ -170,7 +170,10 @@ def test_up_simple(
         mock_check_all_containers_healthy.assert_called_once()
         captured = capsys.readouterr()
         assert "Retrieving dependencies" in captured.out.strip()
-        assert "Starting 'example-service' in mode: 'default'" in captured.out.strip()
+        assert (
+            "Starting 'example-service' dependencies in mode: 'default'"
+            in captured.out.strip()
+        )
         assert "Starting clickhouse" in captured.out.strip()
         assert "Starting redis" in captured.out.strip()
 
@@ -238,7 +241,8 @@ def test_up_dependency_error(
         captured = capsys.readouterr()
         assert "Retrieving dependencies" not in captured.out.strip()
         assert (
-            "Starting 'example-service' in mode: 'default'" not in captured.out.strip()
+            "Starting 'example-service' dependencies in mode: 'default'"
+            not in captured.out.strip()
         )
         assert "Starting clickhouse" not in captured.out.strip()
         assert "Starting redis" not in captured.out.strip()
@@ -348,7 +352,10 @@ def test_up_error(
     mock_remove_service_entry.assert_not_called()
 
     assert "Retrieving dependencies" in captured.out.strip()
-    assert "Starting 'example-service' in mode: 'default'" in captured.out.strip()
+    assert (
+        "Starting 'example-service' dependencies in mode: 'default'"
+        in captured.out.strip()
+    )
     assert "Starting clickhouse" not in captured.out.strip()
     assert "Starting redis" not in captured.out.strip()
 
@@ -564,7 +571,7 @@ def test_up_pull_error_eventual_success(
     mock_create_devservices_network.assert_called_once()
     captured = capsys.readouterr()
 
-    assert "example-service started" in captured.out.strip()
+    assert "example-service dependencies started" in captured.out.strip()
 
 
 @mock.patch("devservices.utils.state.State.remove_service_entry")
@@ -704,7 +711,10 @@ def test_up_docker_compose_container_lookup_error(
         mock_check_all_containers_healthy.assert_not_called()
         captured = capsys.readouterr()
         assert "Retrieving dependencies" in captured.out.strip()
-        assert "Starting 'example-service' in mode: 'default'" in captured.out.strip()
+        assert (
+            "Starting 'example-service' dependencies in mode: 'default'"
+            in captured.out.strip()
+        )
         assert "Starting clickhouse" in captured.out.strip()
         assert "Starting redis" in captured.out.strip()
         assert (
@@ -848,7 +858,10 @@ def test_up_docker_compose_container_healthcheck_failed(
         mock_check_all_containers_healthy.assert_called_once()
         captured = capsys.readouterr()
         assert "Retrieving dependencies" in captured.out.strip()
-        assert "Starting 'example-service' in mode: 'default'" in captured.out.strip()
+        assert (
+            "Starting 'example-service' dependencies in mode: 'default'"
+            in captured.out.strip()
+        )
         assert "Starting clickhouse" in captured.out.strip()
         assert "Starting redis" in captured.out.strip()
         assert (
@@ -993,7 +1006,10 @@ def test_up_mode_simple(
         assert (
             "Starting dependencies with local runtimes..." not in captured.out.strip()
         ), "This shouldn't be printed since we don't have any dependencies with local runtimes"
-        assert "Starting 'example-service' in mode: 'test'" in captured.out.strip()
+        assert (
+            "Starting 'example-service' dependencies in mode: 'test'"
+            in captured.out.strip()
+        )
         assert "Starting redis" in captured.out.strip()
 
 
@@ -1079,7 +1095,10 @@ def test_up_mode_does_not_exist(
         assert (
             "Starting dependencies with local runtimes..." not in captured.out.strip()
         ), "This shouldn't be printed since we don't have any dependencies with local runtimes"
-        assert "Starting 'example-service' in mode: 'test'" not in captured.out.strip()
+        assert (
+            "Starting 'example-service' dependencies in mode: 'test'"
+            not in captured.out.strip()
+        )
         assert "Starting clickhouse" not in captured.out.strip()
         assert "Starting redis" not in captured.out.strip()
 
@@ -1184,7 +1203,10 @@ def test_up_multiple_modes(
         mock_check_all_containers_healthy.assert_called_once()
 
         captured = capsys.readouterr()
-        assert "Starting 'example-service' in mode: 'test'" in captured.out.strip()
+        assert (
+            "Starting 'example-service' dependencies in mode: 'test'"
+            in captured.out.strip()
+        )
         assert (
             "Starting dependencies with local runtimes..." not in captured.out.strip()
         ), "This shouldn't be printed since we don't have any dependencies with local runtimes"
@@ -1351,7 +1373,10 @@ def test_up_multiple_modes_overlapping_running_service(
         )
 
         captured = capsys.readouterr()
-        assert "Starting 'example-service' in mode: 'test'" in captured.out.strip()
+        assert (
+            "Starting 'example-service' dependencies in mode: 'test'"
+            in captured.out.strip()
+        )
         assert "Retrieving dependencies" in captured.out.strip()
         assert (
             "Starting dependencies with local runtimes..." not in captured.out.strip()
@@ -2522,7 +2547,10 @@ def test_up_supervisor_program(
         assert (
             "Starting dependencies with local runtimes..." not in captured.out.strip()
         ), "This shouldn't be printed since we don't have any dependencies with local runtimes"
-        assert "Starting 'example-service' in mode: 'default'" in captured.out.strip()
+        assert (
+            "Starting 'example-service' dependencies in mode: 'default'"
+            in captured.out.strip()
+        )
         assert "Starting supervisor daemon" in captured.out.strip()
         assert "Starting supervisor-program" in captured.out.strip()
 
@@ -2615,7 +2643,10 @@ def test_up_supervisor_program_error(
         assert (
             "Starting dependencies with local runtimes..." not in captured.out.strip()
         ), "This shouldn't be printed since we don't have any dependencies with local runtimes"
-        assert "Starting 'example-service' in mode: 'default'" in captured.out.strip()
+        assert (
+            "Starting 'example-service' dependencies in mode: 'default'"
+            in captured.out.strip()
+        )
         assert "Starting supervisor daemon" in captured.out.strip()
         assert "Error starting supervisor daemon" in captured.out.strip()
 

{devservices-1.2.1 → devservices-1.2.3}/tests/utils/test_docker.py

@@ -7,6 +7,7 @@ from unittest import mock
 import pytest
 from freezegun import freeze_time
 
+from devservices.constants import Color
 from devservices.constants import DEVSERVICES_ORCHESTRATOR_LABEL
 from devservices.constants import DOCKER_NETWORK_NAME
 from devservices.constants import HEALTHCHECK_INTERVAL
@@ -25,15 +26,29 @@ from devservices.utils.docker import wait_for_healthy
 
 
 @mock.patch("subprocess.run")
-def test_check_docker_daemon_running_error(mock_run: mock.Mock) -> None:
+def test_check_docker_daemon_running_error(
+    mock_run: mock.Mock, capsys: pytest.CaptureFixture[str]
+) -> None:
     mock_run.side_effect = subprocess.CalledProcessError(1, "cmd")
     with pytest.raises(DockerDaemonNotRunningError):
         check_docker_daemon_running()
-    mock_run.assert_called_once_with(
-        ["docker", "info"],
-        capture_output=True,
-        text=True,
-        check=True,
+    mock_run.assert_has_calls(
+        [
+            mock.call(
+                ["docker", "info"],
+                capture_output=True,
+                text=True,
+                check=True,
+            ),
+            mock.call(
+                ["devenv", "colima", "start"],
+                check=True,
+            ),
+        ]
+    )
+    assert (
+        capsys.readouterr().out
+        == f"Docker daemon is not running. Checking if colima is available\n{Color.RED}Failed to start colima{Color.RESET}\n"
     )
 
 

{devservices-1.2.1 → devservices-1.2.3}/tests/utils/test_docker_compose.py

@@ -79,7 +79,10 @@ def test_check_docker_compose_invalid_version(
 
 @mock.patch(
     "subprocess.run",
-    side_effect=[subprocess.CalledProcessError(returncode=1, cmd="docker info")],
+    side_effect=[
+        subprocess.CalledProcessError(returncode=1, cmd="docker info"),
+        subprocess.CalledProcessError(returncode=1, cmd="devenv colima start"),
+    ],
 )
 @mock.patch(
     "devservices.utils.docker_compose.install_docker_compose", side_effect=lambda: None

devservices-1.2.1/devservices/commands/purge.py

@@ -1,96 +0,0 @@
-from __future__ import annotations
-
-import os
-import shutil
-from argparse import _SubParsersAction
-from argparse import ArgumentParser
-from argparse import Namespace
-
-from devservices.constants import DEVSERVICES_CACHE_DIR
-from devservices.constants import DEVSERVICES_ORCHESTRATOR_LABEL
-from devservices.constants import DOCKER_NETWORK_NAME
-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.docker import get_matching_containers
-from devservices.utils.docker import get_matching_networks
-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.state import State
-
-
-def add_parser(subparsers: _SubParsersAction[ArgumentParser]) -> None:
-    parser = subparsers.add_parser("purge", help="Purge the local devservices cache")
-    parser.set_defaults(func=purge)
-
-
-def purge(_args: Namespace) -> None:
-    """Purge the local devservices state and cache and remove all devservices containers and volumes."""
-    console = Console()
-
-    if os.path.exists(DEVSERVICES_CACHE_DIR):
-        try:
-            shutil.rmtree(DEVSERVICES_CACHE_DIR)
-        except PermissionError as e:
-            console.failure(f"Failed to purge cache: {e}")
-            exit(1)
-    state = State()
-    state.clear_state()
-
-    try:
-        devservices_containers = get_matching_containers(
-            [DEVSERVICES_ORCHESTRATOR_LABEL]
-        )
-    except DockerDaemonNotRunningError as e:
-        console.warning(str(e))
-        return
-    except DockerError as de:
-        console.failure(f"Failed to get devservices containers {de.stderr}")
-        exit(1)
-
-    try:
-        devservices_volumes = get_volumes_for_containers(devservices_containers)
-    except DockerError as e:
-        console.failure(f"Failed to get devservices volumes {e.stderr}")
-        exit(1)
-
-    with Status(
-        lambda: console.warning("Stopping all devservices containers"),
-        lambda: console.success("All devservices containers have been stopped"),
-    ):
-        try:
-            stop_containers(devservices_containers, should_remove=True)
-        except DockerError as e:
-            console.failure(f"Failed to stop devservices containers {e.stderr}")
-            exit(1)
-
-    console.warning("Removing any devservices docker volumes")
-    if len(devservices_volumes) == 0:
-        console.success("No devservices volumes found to remove")
-    else:
-        try:
-            remove_docker_resources("volume", list(devservices_volumes))
-            console.success("All devservices volumes removed")
-        except DockerError as e:
-            # We don't want to exit here since we still want to try to remove the networks
-            console.failure(f"Failed to remove devservices volumes {e.stderr}")
-
-    console.warning("Removing any devservices networks")
-    try:
-        devservices_networks = get_matching_networks(DOCKER_NETWORK_NAME)
-    except DockerError as e:
-        console.failure(f"Failed to get devservices networks {e.stderr}")
-        exit(1)
-    if len(devservices_networks) == 0:
-        console.success("No devservices networks found to remove")
-    else:
-        try:
-            remove_docker_resources("network", devservices_networks)
-            console.success("All devservices networks removed")
-        except DockerError as e:
-            console.failure(f"Failed to remove devservices networks {e.stderr}")
-            exit(1)
-
-    console.success("The local devservices cache and state has been purged")