docker-stack 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

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.dist-info → docker_stack-2.0.6.dist-info}/METADATA

@@ -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.dist-info → docker_stack-2.0.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 docker_stack/__init__.py,sha256=22W2926fX4sMA1POE1EligVb05cbmP8I6rnacEUmaFs,879
-docker_stack/cli.py,sha256=UJ7ux33-EAZtqY3lwMyFlg95PJWsAnarBRkjMKU3RyM,53053
+docker_stack/cli.py,sha256=wMRmHHGwz8EVSAKCgCiG1UG6PxmsdHVgsYKABuJbn1E,53416
 docker_stack/command_runner.py,sha256=mNaUAVKtrJbji_5ARVPLKhc92avqllNKrVQj1A6S0dA,1252
 docker_stack/compose.py,sha256=_fAVesjyW5ecid46sYYhcu02yF1vqknDSCFYflJPDOE,534
 docker_stack/docker_objects.py,sha256=6FYi3Cq5qTkz2XgRrb_DGy2tgX8uoagib6bZD_Bs3W4,10922
@@ -12,8 +12,8 @@ docker_stack/markers.py,sha256=gqStnr0tNWZ1kzqvREc2jVQVQrevheShgJtL5QzSx4g,2388
 docker_stack/merge_conf.py,sha256=Pmsabcgf3SDyaWvf2OLsBPodzEqsvOIjj9xzn_qWXH0,1917
 docker_stack/registry.py,sha256=sWC1J9JDIrcYyhei1POYCZHJ0xUCKC2pveisSHMgYsQ,9036
 docker_stack/url_parser.py,sha256=Sk8GQE0nEiwCkijp1OltP2AfgtKEmM2hybcH_rBhfiI,6824
-docker_stack-2.0.4.dist-info/METADATA,sha256=FIag9JDv5WzZ6yOH1AurLdAnKHOcHZO-YFSl_r6YN5g,8753
-docker_stack-2.0.4.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-docker_stack-2.0.4.dist-info/entry_points.txt,sha256=mpe2RwIguARsosXIUBQEN2pKU53URqZCh2S4ATwDFL4,55
-docker_stack-2.0.4.dist-info/top_level.txt,sha256=zT6TPL54cLrt9LO_MNkhEpGGOmsoe2HV6Na5Ohy3_2c,13
-docker_stack-2.0.4.dist-info/RECORD,,
+docker_stack-2.0.6.dist-info/METADATA,sha256=a-N6GphEmKigqoC0B-9_dmjBFgbvKNh7g88IBZLnt1Y,8753
+docker_stack-2.0.6.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+docker_stack-2.0.6.dist-info/entry_points.txt,sha256=mpe2RwIguARsosXIUBQEN2pKU53URqZCh2S4ATwDFL4,55
+docker_stack-2.0.6.dist-info/top_level.txt,sha256=zT6TPL54cLrt9LO_MNkhEpGGOmsoe2HV6Na5Ohy3_2c,13
+docker_stack-2.0.6.dist-info/RECORD,,