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

docker_stack/cli.py

@@ -303,23 +303,59 @@ class DockerStack:
         Returns a tuple: (processed_objects, commands)
         """
         processed_objects = {}
+        manager_client = self._manager_client_for_feature(FEATURE_STACK_DEPLOY)
+        namespace = os.getenv("DOCKER_STACK_NAMESPACE", "default")
 
-        def add_obj(name, data, explicit_name=None, is_generated_secret=False):
+        def docker_object_name_for(name, explicit_name=None):
+            if explicit_name:
+                return explicit_name
+            if stack:
+                return f"{stack}_{name}"
+            return name
+
+        def normalize_labels(labels):
+            normalized = {}
+            for raw in labels:
+                key, _, value = raw.partition("=")
+                if key and _:
+                    normalized[key] = value
+            return normalized
+
+        def add_obj(name, data, explicit_name=None, is_generated_secret=False, generate_options=None):
             labels = []
             if is_generated_secret:
                 labels.append("mesudip.secret.generated=true")
 
-            if explicit_name:
-                docker_object_name = explicit_name
-            elif stack:
-                docker_object_name = f"{stack}_{name}"
-            else:
-                docker_object_name = name
+            docker_object_name = docker_object_name_for(name, explicit_name=explicit_name)
+
+            if manager_client and stack:
+                label_map = normalize_labels(labels)
+                if manager.object_type == "config":
+                    response = manager_client.resolve_config(
+                        stack=stack,
+                        namespace=namespace,
+                        name=docker_object_name,
+                        content=data,
+                        labels=label_map,
+                    )
+                else:
+                    response = manager_client.resolve_secret(
+                        stack=stack,
+                        namespace=namespace,
+                        name=docker_object_name,
+                        content=None if is_generated_secret else data,
+                        generate=generate_options if is_generated_secret else None,
+                        labels=label_map,
+                        return_generated_value=is_generated_secret,
+                    )
+                    if is_generated_secret and response.get("generated_value"):
+                        self.generated_secrets[name] = response["generated_value"]
+                processed_objects[name] = {"name": response["actual_name"], "external": True}
+                return
 
             (object_name, command) = manager.create(docker_object_name, data, labels=labels, stack=stack)
             if not command.isNop():
                 self.commands.append(command)
-                # If a new secret was actually created (not just reused), store it
                 if is_generated_secret:
                     self.generated_secrets[name] = data
             processed_objects[name] = {"name": object_name, "external": True}
@@ -338,28 +374,40 @@ class DockerStack:
                 with open(filename) as file:
                     add_obj(name, file.read(), explicit_name=explicit_name)
             elif isinstance(details, dict) and "x-generate" in details and manager.object_type == "secret":
-                is_generated_secret = True
                 generate_options = details["x-generate"]
-                secret_content = ""
-
-                # Determine the content to be used for the secret
-                # This logic is now simplified as DockerObjectManager.create handles persistence
                 if isinstance(generate_options, bool) and generate_options:
-                    secret_content = generate_secret()
+                    if manager_client and stack:
+                        add_obj(name, "", explicit_name=explicit_name, is_generated_secret=True, generate_options={})
+                    else:
+                        add_obj(name, generate_secret(), explicit_name=explicit_name, is_generated_secret=True)
                 elif isinstance(generate_options, int):
-                    secret_content = generate_secret(length=generate_options)
+                    if manager_client and stack:
+                        add_obj(name, "", explicit_name=explicit_name, is_generated_secret=True, generate_options={"length": generate_options})
+                    else:
+                        add_obj(name, generate_secret(length=generate_options), explicit_name=explicit_name, is_generated_secret=True)
                 elif isinstance(generate_options, dict):
-                    secret_content = generate_secret(
-                        length=generate_options.get("length"),
-                        numbers=generate_options.get("numbers", True),
-                        special=generate_options.get("special", True),
-                        uppercase=generate_options.get("uppercase", True),
-                    )
+                    options = {
+                        "length": generate_options.get("length"),
+                        "numbers": generate_options.get("numbers", True),
+                        "special": generate_options.get("special", True),
+                        "uppercase": generate_options.get("uppercase", True),
+                    }
+                    if manager_client and stack:
+                        add_obj(name, "", explicit_name=explicit_name, is_generated_secret=True, generate_options=options)
+                    else:
+                        add_obj(
+                            name,
+                            generate_secret(
+                                length=options.get("length"),
+                                numbers=options.get("numbers", True),
+                                special=options.get("special", True),
+                                uppercase=options.get("uppercase", True),
+                            ),
+                            explicit_name=explicit_name,
+                            is_generated_secret=True,
+                        )
                 else:
                     raise ValueError(f"Invalid x-generate value for secret {name}: {generate_options}")
-
-                # Call add_obj with the potentially new secret content and the generated flag
-                add_obj(name, secret_content, explicit_name=explicit_name, is_generated_secret=True)
             else:
                 processed_objects[name] = details
         return processed_objects

docker_stack/manager_api.py

@@ -110,7 +110,16 @@ class ManagerApiClient:
             with urllib.request.urlopen(request, timeout=self.timeout_secs, context=context) as response:
                 return json.loads(response.read().decode("utf-8"))
         except urllib.error.HTTPError as exc:
-            raise RuntimeError(f"Manager request failed ({method} {path}): HTTP {exc.code}") from exc
+            body = ""
+            try:
+                payload = exc.read().decode("utf-8", errors="replace").strip()
+                if payload:
+                    body = f": {payload}"
+            except Exception:
+                body = ""
+            raise RuntimeError(
+                f"Manager request failed ({method} {path}): HTTP {exc.code}{body}"
+            ) from exc
         except urllib.error.URLError as exc:
             raise RuntimeError(f"Manager request failed ({method} {path}): {exc.reason}") from exc
         except json.JSONDecodeError as exc:
@@ -249,6 +258,60 @@ class ManagerApiClient:
 
         return {"nodes": nodes}
 
+
+
+    def resolve_config(
+        self,
+        *,
+        stack: str,
+        namespace: str,
+        name: str,
+        content: str,
+        labels: Optional[Dict[str, str]] = None,
+    ) -> Dict[str, Any]:
+        payload: Dict[str, Any] = {
+            "stack": stack,
+            "namespace": namespace,
+            "name": name,
+            "content": content,
+        }
+        if labels:
+            payload["labels"] = labels
+        return self._request_json(
+            "/api/configs/resolve",
+            method="POST",
+            payload=payload,
+        )
+
+    def resolve_secret(
+        self,
+        *,
+        stack: str,
+        namespace: str,
+        name: str,
+        content: Optional[str] = None,
+        generate: Optional[Dict[str, Any]] = None,
+        labels: Optional[Dict[str, str]] = None,
+        return_generated_value: bool = False,
+    ) -> Dict[str, Any]:
+        payload: Dict[str, Any] = {
+            "stack": stack,
+            "namespace": namespace,
+            "name": name,
+            "return_generated_value": return_generated_value,
+        }
+        if content is not None:
+            payload["content"] = content
+        if generate is not None:
+            payload["generate"] = generate
+        if labels:
+            payload["labels"] = labels
+        return self._request_json(
+            "/api/secrets/resolve",
+            method="POST",
+            payload=payload,
+        )
+
     def validate_stack(
         self,
         *,

{docker_stack-2.0.2.dist-info → docker_stack-2.0.4.dist-info}/METADATA

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

{docker_stack-2.0.2.dist-info → docker_stack-2.0.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 docker_stack/__init__.py,sha256=22W2926fX4sMA1POE1EligVb05cbmP8I6rnacEUmaFs,879
-docker_stack/cli.py,sha256=fsjXjaGFBXi-uYtAm5jcYSPg-yafaVsENsjKK9o_55g,50570
+docker_stack/cli.py,sha256=UJ7ux33-EAZtqY3lwMyFlg95PJWsAnarBRkjMKU3RyM,53053
 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
@@ -7,13 +7,13 @@ docker_stack/envsubst.py,sha256=gdEUpsjWJeNbbahySk56vUdQh1nns85o3LbU6SUBo3I,8337
 docker_stack/envsubst_merge.py,sha256=TwOu8BducG0rWnSreJGwesNi-VghCetljcf-aWceE8M,4971
 docker_stack/helpers.py,sha256=7zQT_lYU6IcqjSOYjE0JlHRtbB8Sffz3XlJKyNvot6U,5580
 docker_stack/login.py,sha256=_4sx0hltvKnwA81r_HyYkdQjXs5AEPlh_Qy87sUfcP0,30996
-docker_stack/manager_api.py,sha256=MrPKfbykRHgGoEl-1qehJBdaxncXGvzN_ef5Q2QBPXk,11486
+docker_stack/manager_api.py,sha256=NsSuXV7b5CiBDOz5EqqDWE4xwzaXNoqldrsd2oKAziw,13205
 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.2.dist-info/METADATA,sha256=GUpDIRMWkpz6IFjZUGhHU9qhaEMmU2WYfyEweLaLyVE,8753
-docker_stack-2.0.2.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-docker_stack-2.0.2.dist-info/entry_points.txt,sha256=mpe2RwIguARsosXIUBQEN2pKU53URqZCh2S4ATwDFL4,55
-docker_stack-2.0.2.dist-info/top_level.txt,sha256=zT6TPL54cLrt9LO_MNkhEpGGOmsoe2HV6Na5Ohy3_2c,13
-docker_stack-2.0.2.dist-info/RECORD,,
+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,,