docker-stack 2.0.4__tar.gz → 2.0.6__tar.gz

{docker_stack-2.0.4 → docker_stack-2.0.6}/PKG-INFO

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

{docker_stack-2.0.4 → docker_stack-2.0.6}/docker_stack/cli.py

@@ -329,12 +329,13 @@ class DockerStack:
             docker_object_name = docker_object_name_for(name, explicit_name=explicit_name)
 
             if manager_client and stack:
+                manager_object_name = explicit_name or name
                 label_map = normalize_labels(labels)
                 if manager.object_type == "config":
                     response = manager_client.resolve_config(
                         stack=stack,
                         namespace=namespace,
-                        name=docker_object_name,
+                        name=manager_object_name,
                         content=data,
                         labels=label_map,
                     )
@@ -342,7 +343,7 @@ class DockerStack:
                     response = manager_client.resolve_secret(
                         stack=stack,
                         namespace=namespace,
-                        name=docker_object_name,
+                        name=manager_object_name,
                         content=None if is_generated_secret else data,
                         generate=generate_options if is_generated_secret else None,
                         labels=label_map,
@@ -432,6 +433,12 @@ class DockerStack:
     @staticmethod
     def _version_sort_key(raw: str):
         return int(raw) if raw.isdigit() else raw
+    @staticmethod
+    def _display_stack_name(raw: str) -> str:
+        value = raw.strip()
+        if value.startswith("default--"):
+            return value[len("default--"):]
+        return value
 
     def _print_stack_listing(self, stack_versions: Dict[str, List[str]]) -> None:
         max_stack_name_length = max(len(stack) for stack in stack_versions) if stack_versions else 10
@@ -461,7 +468,7 @@ class DockerStack:
             try:
                 payload = client.list_stacks()
                 stack_versions = {
-                    str(item.get("stack")): [
+                    self._display_stack_name(str(item.get("stack"))): [
                         str(version)
                         for version in (
                             item.get("versions")
@@ -487,7 +494,7 @@ class DockerStack:
             parts = line.split("\t")
             if len(parts) == 3 and "mesudip.stack.name" in parts[2]:
                 labels = {k: v for k, v in (label.split("=") for label in parts[2].split(",") if "=" in label)}
-                stack_name = labels.get("mesudip.stack.name")
+                stack_name = self._display_stack_name(labels.get("mesudip.stack.name", "")) or None
                 version = labels.get("mesudip.object.version", "unknown")
 
                 if stack_name:
@@ -558,7 +565,7 @@ class DockerStack:
             parts = line.split("\t")
             if len(parts) == 2 and "mesudip.stack.name" in parts[1]:
                 labels = {k: v for k, v in (label.split("=") for label in parts[1].split(",") if "=" in label)}
-                stack = labels.get("mesudip.stack.name")
+                stack = self._display_stack_name(labels.get("mesudip.stack.name", "")) or None
                 version = labels.get("mesudip.object.version", "unknown")
                 tag = labels.get("mesudip.stack.tag", "")
 

{docker_stack-2.0.4 → docker_stack-2.0.6}/docker_stack.egg-info/PKG-INFO

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

{docker_stack-2.0.4 → docker_stack-2.0.6}/setup.py

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

@@ -229,7 +229,7 @@ def test_process_x_content_uses_manager_resolve_apis(monkeypatch):
         {
             "stack": "govtool",
             "namespace": "default",
-            "name": "govtool_app.conf",
+            "name": "app.conf",
             "content": "hello",
             "labels": {},
         }
@@ -238,7 +238,7 @@ def test_process_x_content_uses_manager_resolve_apis(monkeypatch):
         {
             "stack": "govtool",
             "namespace": "default",
-            "name": "govtool_app-secret",
+            "name": "app-secret",
             "content": None,
             "generate": {
                 "length": 24,
@@ -250,8 +250,8 @@ def test_process_x_content_uses_manager_resolve_apis(monkeypatch):
             "return_generated_value": True,
         }
     ]
-    assert processed_configs == {"app.conf": {"name": "govtool_app.conf_v2", "external": True}}
-    assert processed_secrets == {"app-secret": {"name": "govtool_app-secret", "external": True}}
+    assert processed_configs == {"app.conf": {"name": "app.conf_v2", "external": True}}
+    assert processed_secrets == {"app-secret": {"name": "app-secret", "external": True}}
     assert docker.stack.generated_secrets == {"app-secret": "generated-from-manager"}
 
 
@@ -295,6 +295,33 @@ def test_rm_enqueues_stack_remove_command():
     assert docker.stack.commands[-1].command == ["docker", "stack", "rm", "govtool"]
 
 
+def test_default_namespace_stack_names_are_normalized_in_output(monkeypatch, capsys):
+    inspect_payloads = {
+        ("docker", "config", "ls", "--format", "{{.ID}}	{{.Name}}	{{.Labels}}"):
+            "cfg1	default--team-a	mesudip.stack.name=default--team-a,mesudip.object.version=1",
+        ("docker", "config", "ls", "--format", "{{.Name}}	{{.Labels}}"):
+            "default--team-a	mesudip.stack.name=default--team-a,mesudip.object.version=1,mesudip.stack.tag=stable",
+        ("docker", "config", "inspect", "team-a"):
+            json.dumps([{"Spec": {"Data": base64.b64encode(b"services:\n  api:\n    image: busybox\n").decode("utf-8")}}]),
+    }
+
+    def fake_run_cli_command(command, **kwargs):
+        key = tuple(command)
+        if key not in inspect_payloads:
+            raise AssertionError(f"Unexpected command: {command}")
+        return inspect_payloads[key]
+
+    monkeypatch.setattr("docker_stack.cli.run_cli_command", fake_run_cli_command)
+    monkeypatch.setattr("docker_stack.cli.discover_manager_client", lambda *_args, **_kwargs: None)
+
+    docker = Docker()
+    assert docker.stack.ls() == {"team-a": ["1"]}
+    assert docker.stack.versions("team-a") == [("1", "stable")]
+    output = capsys.readouterr().out
+    assert "default--team-a" not in output
+    assert "team-a" in output
+
+
 def test_filtered_agent_outputs_still_render(monkeypatch, capsys):
     inspect_payloads = {
         ("docker", "config", "ls", "--format", "{{.ID}}\t{{.Name}}\t{{.Labels}}"): "\n".join(