docker-stack 2.2.4__tar.gz → 2.2.5__tar.gz

{docker_stack-2.2.4 → docker_stack-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docker-stack
-Version: 2.2.4
+Version: 2.2.5
 Summary: CLI for deploying and managing Docker stacks.
 Home-page: https://github.com/mesudip/docker-stack
 Author: Sudip Bhattarai

{docker_stack-2.2.4 → docker_stack-2.2.5}/docker_stack/cli.py

@@ -37,7 +37,6 @@ from docker_stack.shell_auth import (
     shell_session_active,
 )
 from docker_stack.manager_api import (
-    FEATURE_CLUSTER_CONTAINER_CLI,
     FEATURE_STACK_DEPLOY,
     FEATURE_STACK_QUERY,
     ManagerApiClient,
@@ -102,15 +101,23 @@ def _write_selected_node(value: Optional[str], display_name: str) -> None:
         Path(node_state).write_text(f"{display_name}\n", encoding="utf-8")
 
 
-def _manager_with_cluster_cli() -> ManagerApiClient:
-    client = discover_manager_client()
-    if client is None or not client.supports(FEATURE_CLUSTER_CONTAINER_CLI):
-        raise RuntimeError("Docker-Manager does not support cluster container CLI; upgrade the manager and all node agents")
+def _require_manager() -> ManagerApiClient:
+    """Return a client for the Docker-Manager behind this shell, or explain why not.
+
+    Only the current manager is supported, so there is no capability negotiation here -
+    either the target is a Docker-Manager or it is a plain Docker daemon.
+    """
+    client = discover_manager_client(strict=True)
+    if client is None or not client.is_manager_backend():
+        raise RuntimeError(
+            f"{client.manager_url if client else 'the current Docker endpoint'} is not a "
+            "Docker-Manager; node-local commands need one"
+        )
     return client
 
 
 def _select_node(value: str) -> str:
-    client = _manager_with_cluster_cli()
+    client = _require_manager()
     requested = value.strip()
     if requested.lower() == "cluster":
         _write_selected_node(None, "cluster")
@@ -133,6 +140,9 @@ def _select_node(value: str) -> str:
         raise RuntimeError(f"node '{requested}' is not ready")
     node_id = str(node.get("id") or "").strip()
     hostname = str(node.get("hostname") or node_id).strip()
+    # Only this node has to be usable. The health of every other node - drained, down, or
+    # missing its agent - is none of this command's business.
+    client.check_node_agent(node_id or hostname)
     _write_selected_node(node_id, hostname)
     return hostname
 
@@ -339,6 +349,13 @@ def _print_cluster_containers(payload: Dict[str, object], *, no_trunc: bool = Fa
         columns.append("SIZE")
     columns.append("NODE")
     _print_table(columns, rows)
+    skipped = payload.get("skipped_nodes") if isinstance(payload.get("skipped_nodes"), list) else []
+    for node in skipped:
+        if isinstance(node, dict):
+            print(
+                f"docker ps: skipped node {node.get('node_name') or node.get('node_id')}: {node.get('reason')}",
+                file=sys.stderr,
+            )
     errors = payload.get("node_errors") if isinstance(payload.get("node_errors"), list) else []
     for error in errors:
         if isinstance(error, dict):
@@ -413,7 +430,7 @@ def _managed_docker(arguments: List[str]) -> int:
         return _exec_docker(values)
     try:
         client = discover_manager_client()
-        if client is None or not client.supports(FEATURE_CLUSTER_CONTAINER_CLI):
+        if client is None or not client.is_manager_backend():
             return _exec_docker(values)
         filters = []
         all_containers = False

{docker_stack-2.2.4 → docker_stack-2.2.5}/docker_stack/manager_api.py

@@ -416,6 +416,22 @@ class ManagerApiClient:
         endpoint_id = self._resolve_endpoint_id()
         return f"/api/endpoints/{endpoint_id}{normalized}"
 
+    def is_manager_backend(self) -> bool:
+        """True when the target is a Docker-Manager stack API rather than a raw daemon."""
+        return self._detect_manager_backend()
+
+    def check_node_agent(self, selector: str) -> Dict[str, Any]:
+        """Report whether one node can serve node-local Docker commands.
+
+        Scoped to ``selector`` on purpose: an unrelated node that is drained, down, or
+        missing its agent must never make a usable node look unusable.
+        """
+        node = urllib.parse.quote(selector, safe="")
+        payload = self._request_json(f"/api/docker-stack/nodes/{node}/agent")
+        if not isinstance(payload, dict):
+            raise RuntimeError("Docker-Manager node agent response is invalid")
+        return payload
+
     def supports(self, feature_name: str) -> bool:
         features = self.detect_features()
         if FEATURE_MESUDIP_DOCKER_ENTERPRISE in features and feature_name in {
@@ -721,7 +737,15 @@ class ManagerApiClient:
         )
 
 
-def discover_manager_client(timeout_secs: int = 5) -> Optional[ManagerApiClient]:
+def discover_manager_client(
+    timeout_secs: int = 5, *, strict: bool = False
+) -> Optional[ManagerApiClient]:
+    """Build a client for the manager behind DOCKER_MANAGER_URL or the Docker context.
+
+    ``strict`` raises the concrete reason instead of returning ``None``. Callers that
+    fall back to the plain Docker CLI want the quiet form; callers that are about to
+    report a failure to the user must not discard why discovery failed.
+    """
     try:
         target = _manager_target_from_env()
         if target:
@@ -729,11 +753,26 @@ def discover_manager_client(timeout_secs: int = 5) -> Optional[ManagerApiClient]
         elif shutil.which("docker"):
             _, context_target = current_docker_context_target()
             if not context_target or not context_target.startswith(("tcp://", "http://", "https://")):
+                if strict:
+                    raise RuntimeError(
+                        "no Docker-Manager endpoint found: set DOCKER_MANAGER_URL, or select a "
+                        f"docker context with a tcp:// endpoint (current target: {context_target or 'none'})"
+                    )
                 return None
             config = resolve_login_config(manager_target=context_target)
         else:
+            if strict:
+                raise RuntimeError(
+                    "no Docker-Manager endpoint found: DOCKER_MANAGER_URL is unset and the docker CLI is not installed"
+                )
             return None
-    except Exception:
+    except RuntimeError:
+        if strict:
+            raise
+        return None
+    except Exception as exc:
+        if strict:
+            raise RuntimeError(f"failed resolving the Docker-Manager endpoint: {exc}") from exc
         return None
 
     return ManagerApiClient(

{docker_stack-2.2.4 → docker_stack-2.2.5}/docker_stack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docker-stack
-Version: 2.2.4
+Version: 2.2.5
 Summary: CLI for deploying and managing Docker stacks.
 Home-page: https://github.com/mesudip/docker-stack
 Author: Sudip Bhattarai

{docker_stack-2.2.4 → docker_stack-2.2.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="docker-stack",
-    version="2.2.4",
+    version="2.2.5",
     description="CLI for deploying and managing Docker stacks.",
     long_description=open("README.md").read(),  # You can include a README file to describe your package
     long_description_content_type="text/markdown",

{docker_stack-2.2.4 → docker_stack-2.2.5}/tests/test_docker_stack.py

@@ -38,14 +38,17 @@ def test_node_use_updates_only_managed_shell_config(monkeypatch, tmp_path):
     monkeypatch.setenv("DOCKER_STACK_SHELL_SECRET", "secret")
     monkeypatch.setenv("DOCKER_CONFIG", str(tmp_path))
     monkeypatch.setenv("DOCKER_STACK_SHELL_NODE_STATE", str(node_state))
+    checked = []
     client = SimpleNamespace(
         list_nodes=lambda: {
             "nodes": [
                 {"id": "node-worker-123", "hostname": "worker-02", "state": "Ready"},
             ]
-        }
+        },
+        check_node_agent=lambda selector: checked.append(selector)
+        or {"node_id": selector, "node_name": "worker-02", "agent": "ready"},
     )
-    monkeypatch.setattr("docker_stack.cli._manager_with_cluster_cli", lambda: client)
+    monkeypatch.setattr("docker_stack.cli._require_manager", lambda: client)
 
     assert _select_node("worker-02") == "worker-02"
     payload = json.loads(config_path.read_text(encoding="utf-8"))
@@ -54,6 +57,8 @@ def test_node_use_updates_only_managed_shell_config(monkeypatch, tmp_path):
     assert _read_selected_node() == "node-worker-123"
     assert node_state.read_text(encoding="utf-8").strip() == "worker-02"
 
+    assert checked == ["node-worker-123"]
+
     assert _select_node("cluster") == "cluster"
     payload = json.loads(config_path.read_text(encoding="utf-8"))
     assert "X-Docker-Manager-Node" not in payload["HttpHeaders"]
@@ -61,7 +66,7 @@ def test_node_use_updates_only_managed_shell_config(monkeypatch, tmp_path):
 
 def test_managed_docker_ps_renders_node_column(monkeypatch, capsys):
     client = SimpleNamespace(
-        supports=lambda feature: feature == "cluster_container_cli_v1",
+        is_manager_backend=lambda: True,
         list_containers=lambda **_kwargs: {
             "containers": [
                 {
@@ -93,7 +98,7 @@ def test_managed_docker_ps_renders_node_column(monkeypatch, capsys):
 
 def test_managed_docker_ps_matches_docker_columns(monkeypatch, capsys):
     client = SimpleNamespace(
-        supports=lambda feature: feature == "cluster_container_cli_v1",
+        is_manager_backend=lambda: True,
         list_containers=lambda **_kwargs: {
             "containers": [
                 {
@@ -156,7 +161,7 @@ def test_managed_docker_ps_matches_docker_columns(monkeypatch, capsys):
 )
 def test_managed_docker_ps_drops_pinned_digest_like_docker(monkeypatch, capsys, image, expected, expected_no_trunc):
     client = SimpleNamespace(
-        supports=lambda feature: feature == "cluster_container_cli_v1",
+        is_manager_backend=lambda: True,
         list_containers=lambda **_kwargs: {
             "containers": [
                 {
@@ -187,7 +192,7 @@ def test_managed_docker_ps_drops_pinned_digest_like_docker(monkeypatch, capsys,
 def test_managed_docker_ps_forwards_global_latest_and_limit(monkeypatch):
     calls = []
     client = SimpleNamespace(
-        supports=lambda feature: feature == "cluster_container_cli_v1",
+        is_manager_backend=lambda: True,
         list_containers=lambda **kwargs: calls.append(kwargs)
         or {"containers": [], "node_errors": []},
     )
@@ -292,9 +297,9 @@ def test_managed_docker_delegates_explicit_target_overrides(monkeypatch, argumen
     assert calls == [["docker", *arguments]]
 
 
-def test_managed_docker_ps_delegates_when_manager_lacks_cluster_feature(monkeypatch):
+def test_managed_docker_ps_delegates_when_target_is_not_a_manager(monkeypatch):
     calls = []
-    client = SimpleNamespace(supports=lambda _feature: False)
+    client = SimpleNamespace(is_manager_backend=lambda: False)
     monkeypatch.setattr("docker_stack.cli.discover_manager_client", lambda: client)
     monkeypatch.setattr(
         "docker_stack.cli._exec_process",