docker-stack 2.0.0__tar.gz → 2.0.2__tar.gz

{docker_stack-2.0.0 → docker_stack-2.0.2}/PKG-INFO

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

{docker_stack-2.0.0 → docker_stack-2.0.2}/docker_stack/cli.py

@@ -639,10 +639,9 @@ class DockerStack:
             )
             return
 
-        _, cmd = self.docker.config.increment(stack_name, rendered_content, labels=labels, stack=stack_name)
-        if not cmd.isNop():
-            self.commands.append(cmd)
-
+        # Manager-backed deploys must stay on the manager stack APIs. Hitting
+        # direct daemon config endpoints here breaks GitHub OIDC workflows,
+        # which are intentionally restricted away from generic daemon access.
         if manager_deploy and not with_registry_auth:
             self.commands.append(
                 CallbackCommand(
@@ -657,6 +656,10 @@ class DockerStack:
             )
             return
 
+        _, cmd = self.docker.config.increment(stack_name, rendered_content, labels=labels, stack=stack_name)
+        if not cmd.isNop():
+            self.commands.append(cmd)
+
         cmd = ["docker", "stack", "deploy", "-c", str(rendered_filename), stack_name]
         if with_registry_auth:
             cmd.insert(3, "--with-registry-auth")

{docker_stack-2.0.0 → docker_stack-2.0.2}/docker_stack/manager_api.py

@@ -48,6 +48,28 @@ def _manager_target_from_env() -> Optional[str]:
     return None
 
 
+def _format_control_plane_endpoints(endpoints: Any) -> str:
+    if not isinstance(endpoints, list) or not endpoints:
+        return "none"
+    values = []
+    for item in endpoints:
+        if not isinstance(item, dict):
+            continue
+        endpoint_id = item.get("id")
+        name = str(item.get("name") or "").strip()
+        slug = str(item.get("slug") or "").strip()
+        parts = []
+        if endpoint_id is not None:
+            parts.append(f"id={endpoint_id}")
+        if name:
+            parts.append(f"name={name}")
+        if slug:
+            parts.append(f"slug={slug}")
+        if parts:
+            values.append(", ".join(parts))
+    return "; ".join(values) if values else "none"
+
+
 class ManagerApiClient:
     def __init__(
         self,
@@ -134,70 +156,13 @@ class ManagerApiClient:
 
         self._endpoint_id_checked = True
 
-        env_endpoint_id = os.getenv("DOCKER_MANAGER_ENDPOINT_ID", "").strip()
-        if env_endpoint_id:
-            try:
-                parsed_id = int(env_endpoint_id)
-            except ValueError as exc:
-                raise RuntimeError("DOCKER_MANAGER_ENDPOINT_ID must be a positive integer") from exc
-            if parsed_id <= 0:
-                raise RuntimeError("DOCKER_MANAGER_ENDPOINT_ID must be a positive integer")
-            self._endpoint_id = parsed_id
-            return parsed_id
-
         payload = self._request_json("/api/endpoints")
         endpoints = payload.get("endpoints")
-        if not isinstance(endpoints, list) or not endpoints:
-            raise RuntimeError("No visible Docker-Manager endpoints available")
-
-        endpoint_slug = os.getenv("DOCKER_MANAGER_ENDPOINT_SLUG", "").strip()
-        endpoint_name = os.getenv("DOCKER_MANAGER_ENDPOINT_NAME", "").strip()
-        selected = None
-
-        if endpoint_slug:
-            selected = next(
-                (
-                    item
-                    for item in endpoints
-                    if isinstance(item, dict) and str(item.get("slug", "")).strip() == endpoint_slug
-                ),
-                None,
-            )
-            if selected is None:
-                raise RuntimeError(
-                    f"Could not find endpoint with slug '{endpoint_slug}'. "
-                    "Set DOCKER_MANAGER_ENDPOINT_ID to select explicitly."
-                )
-        elif endpoint_name:
-            selected = next(
-                (
-                    item
-                    for item in endpoints
-                    if isinstance(item, dict) and str(item.get("name", "")).strip() == endpoint_name
-                ),
-                None,
-            )
-            if selected is None:
-                raise RuntimeError(
-                    f"Could not find endpoint with name '{endpoint_name}'. "
-                    "Set DOCKER_MANAGER_ENDPOINT_ID to select explicitly."
-                )
-        else:
-            selected = next((item for item in endpoints if isinstance(item, dict)), None)
-
-        if not isinstance(selected, dict):
-            raise RuntimeError("Docker-Manager endpoint payload is invalid")
-
-        try:
-            endpoint_id = int(selected.get("id"))
-        except (TypeError, ValueError) as exc:
-            raise RuntimeError("Docker-Manager endpoint payload is missing a valid id") from exc
-
-        if endpoint_id <= 0:
-            raise RuntimeError("Docker-Manager endpoint id must be positive")
-
-        self._endpoint_id = endpoint_id
-        return endpoint_id
+        raise RuntimeError(
+            "docker-stack does not support Docker-Manager control-plane targets. "
+            "Point DOCKER_MANAGER_URL at a direct manager stack API instead. "
+            f"Visible endpoints: {_format_control_plane_endpoints(endpoints)}"
+        )
 
     def _endpoint_path(self, suffix: str) -> str:
         normalized = suffix if suffix.startswith("/") else f"/{suffix}"
@@ -208,13 +173,9 @@ class ManagerApiClient:
         features = self.detect_features()
         if feature_name not in features:
             return False
-        if feature_name in {FEATURE_STACK_QUERY, FEATURE_STACK_DEPLOY}:
+        if feature_name == FEATURE_STACK_DEPLOY:
             if not self._detect_manager_backend():
                 return False
-            try:
-                self._resolve_endpoint_id()
-            except RuntimeError:
-                return False
         return True
 
     def list_stacks(self) -> Dict[str, Any]:
@@ -300,7 +261,7 @@ class ManagerApiClient:
         if options:
             payload["options"] = options
         return self._request_json(
-            self._endpoint_path("/stacks/validate"),
+            "/api/stacks/validate",
             method="POST",
             payload=payload,
         )
@@ -317,7 +278,7 @@ class ManagerApiClient:
         if options:
             payload["options"] = options
         return self._request_json(
-            self._endpoint_path("/stacks/deploy"),
+            "/api/stacks/deploy",
             method="POST",
             payload=payload,
         )

{docker_stack-2.0.0 → docker_stack-2.0.2}/docker_stack.egg-info/PKG-INFO

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

{docker_stack-2.0.0 → docker_stack-2.0.2}/docker_stack.egg-info/SOURCES.txt

@@ -25,4 +25,5 @@ tests/test_docker_objects.py
 tests/test_docker_stack.py
 tests/test_load_env.py
 tests/test_login.py
+tests/test_manager_api.py
 tests/test_node_ls.py

{docker_stack-2.0.0 → docker_stack-2.0.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="docker-stack",
-    version="2.0.0",
+    version="2.0.2",
     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.0.0 → docker_stack-2.0.2}/tests/test_docker_stack.py

@@ -311,7 +311,10 @@ def test_checkout_uses_manager_fast_path_for_tag(monkeypatch):
 def test_deploy_enqueues_manager_callback_when_supported(monkeypatch, tmp_path):
     fake_manager = FakeManagerClient()
     monkeypatch.setattr("docker_stack.cli.discover_manager_client", lambda *_args, **_kwargs: fake_manager)
-    monkeypatch.setattr("docker_stack.cli.run_cli_command", lambda *args, **kwargs: "")
+    monkeypatch.setattr(
+        "docker_stack.cli.run_cli_command",
+        lambda *args, **kwargs: pytest.fail("manager-backed deploy should not hit direct daemon CLI"),
+    )
     compose_file = tmp_path / "docker-compose.yml"
     compose_file.write_text("services:\n  api:\n    image: busybox\n")
 

{docker_stack-2.0.0 → docker_stack-2.0.2}/tests/test_login.py

@@ -552,6 +552,6 @@ def test_browser_login_handles_callback_and_token_exchange(monkeypatch):
     result = browser_login(config, browser_opener=fake_browser_open, port_finder=port_finder)
 
     assert result.redirect_uri.endswith("/auth/callback")
-    assert result.callback_port in range(8070, 8080)
+    assert result.callback_port > 0
     assert result.access_token == "header.eyJleHAiOjE5MDAwMDAwMDB9.signature"
     assert result.expires_at == 1900000000

docker_stack-2.0.2/tests/test_manager_api.py

@@ -0,0 +1,72 @@
+import pytest
+
+from docker_stack.manager_api import FEATURE_STACK_DEPLOY, ManagerApiClient
+
+
+def test_supports_stack_deploy_without_endpoint_catalog(monkeypatch):
+    client = ManagerApiClient("https://172.31.0.6:2378", skip_tls_verify=True)
+    calls = []
+
+    def fake_request(path, *, method="GET", payload=None):
+        calls.append((method, path, payload))
+        if path == "/version":
+            return {"MesudipFeatures": [FEATURE_STACK_DEPLOY]}
+        raise AssertionError(f"unexpected request: {method} {path}")
+
+    monkeypatch.setattr(client, "_request_json", fake_request)
+
+    assert client.supports(FEATURE_STACK_DEPLOY) is True
+    assert calls == [("GET", "/version", None)]
+
+
+def test_deploy_stack_uses_direct_stack_api(monkeypatch):
+    client = ManagerApiClient("https://172.31.0.6:2378", skip_tls_verify=True)
+    calls = []
+
+    def fake_request(path, *, method="GET", payload=None):
+        calls.append((method, path, payload))
+        return {"warnings": []}
+
+    monkeypatch.setattr(client, "_request_json", fake_request)
+
+    payload = client.deploy_stack(
+        stack="trusted-publish-test",
+        namespace="default",
+        compose="services: {}",
+        options={},
+    )
+
+    assert payload == {"warnings": []}
+    assert calls == [
+        (
+            "POST",
+            "/api/stacks/deploy",
+            {
+                "stack": "trusted-publish-test",
+                "namespace": "default",
+                "compose": "services: {}",
+            },
+        )
+    ]
+
+
+def test_control_plane_error_lists_visible_endpoints(monkeypatch):
+    client = ManagerApiClient("https://172.31.0.6:2378", skip_tls_verify=True)
+
+    def fake_request(path, *, method="GET", payload=None):
+        assert path == "/api/endpoints"
+        return {
+            "endpoints": [
+                {"id": 1, "name": "office", "slug": "office"},
+                {"id": 2, "name": "lab"},
+            ]
+        }
+
+    monkeypatch.setattr(client, "_request_json", fake_request)
+
+    with pytest.raises(RuntimeError) as excinfo:
+        client._resolve_endpoint_id()
+
+    assert "control-plane targets" in str(excinfo.value)
+    assert "id=1, name=office, slug=office" in str(excinfo.value)
+    assert "id=2, name=lab" in str(excinfo.value)