thothctl 0.17.3__tar.gz → 0.17.4__tar.gz

{thothctl-0.17.3 → thothctl-0.17.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thothctl
-Version: 0.17.3
+Version: 0.17.4
 Summary: A CLI for Developer Control Plane. Accelerate your cloud IaC deployments.
 Project-URL: SourceCode, https://github.com/thothforge/thothctl
 Project-URL: HomePage, https://github.com/thothforge/thothctl

{thothctl-0.17.3 → thothctl-0.17.4}/src/thothctl/services/check/stack_optimizer/__init__.py

@@ -36,7 +36,7 @@ class StackOptimizer:
 
         Returns:
             dict with keys:
-                optimized_filters: minimal list of filters
+                optimized_filters: minimal list of terragrunt-compatible filters
                 removed_redundant: filters that were eliminated
                 details: per-filter resolution info
         """
@@ -64,13 +64,13 @@ class StackOptimizer:
                     redundant.add(stack_a)
                     break
 
-        optimized = [s for s in target_stacks if s not in redundant]
+        optimized = [self._normalize_filter(s) for s in target_stacks if s not in redundant]
 
         return {
             "optimized_filters": optimized,
             "removed_redundant": list(redundant),
             "total_units_before": sum(len(v) for v in resolved.values()),
-            "total_units_after": len(set().union(*(resolved[s] for s in optimized))),
+            "total_units_after": len(set().union(*(resolved[s] for s in target_stacks if s not in redundant))),
             "details": {
                 stack: {
                     "direct_units": len(self._resolve_stack_direct(stack)),
@@ -157,6 +157,27 @@ class StackOptimizer:
 
         return ""
 
+
+    def _normalize_filter(self, stack_pattern: str) -> str:
+        """Normalize a filter for terragrunt compatibility.
+
+        Strips trailing /** for leaf units (units with no child sub-units)
+        because terragrunt's ** glob requires child directories to match.
+        """
+        if not stack_pattern.endswith("/**"):
+            return stack_pattern
+
+        bare = stack_pattern[:-3]
+        # Check if it's a leaf unit (exists as a unit AND has no sub-units)
+        if bare in self._units:
+            has_children = any(
+                u.startswith(bare + "/") for u in self._all_unit_paths if u != bare
+            )
+            if not has_children:
+                return bare
+
+        return stack_pattern
+
     def _resolve_stack_direct(self, stack_pattern: str) -> Set[str]:
         """Resolve a glob pattern to matching unit paths (no dependency expansion)."""
         matched = set()

thothctl-0.17.4/src/thothctl/version.py

@@ -0,0 +1,2 @@
+"""Version module."""
+__version__ = "0.17.4"

{thothctl-0.17.3 → thothctl-0.17.4}/tests/test_stack_optimizer.py

@@ -148,3 +148,31 @@ class TestStackOptimizer:
         assert "Compute/EC2/EC2_Bastion_Private" in result["optimized_filters"]
         assert "Database/RDS" in result["optimized_filters"]
         assert result["removed_redundant"] == []
+
+    def test_leaf_unit_strips_glob(self, project_dir):
+        """Trailing /** is stripped for leaf units (no sub-units) so terragrunt
+        can match the exact path."""
+        optimizer = StackOptimizer(base_path=project_dir, stacks_base="resources")
+        result = optimizer.optimize(["Compute/EC2/EC2_Bastion_Private/**"])
+
+        # EC2_Bastion_Private has no children → /** stripped
+        assert result["optimized_filters"] == ["Compute/EC2/EC2_Bastion_Private"]
+
+    def test_non_leaf_keeps_glob(self, project_dir):
+        """Trailing /** is kept for directories with sub-units."""
+        optimizer = StackOptimizer(base_path=project_dir, stacks_base="resources")
+        result = optimizer.optimize(["Network/**"])
+
+        # Network has child units (VPC, SecurityGroups/*, etc.) → keep **
+        assert result["optimized_filters"] == ["Network/**"]
+
+    def test_mixed_leaf_and_non_leaf(self, project_dir):
+        """Mix of leaf and non-leaf correctly normalizes each."""
+        optimizer = StackOptimizer(base_path=project_dir, stacks_base="resources")
+        result = optimizer.optimize([
+            "Network/**",
+            "Compute/EC2/EC2_Bastion_Private/**",
+        ])
+
+        assert "Network/**" in result["optimized_filters"]
+        assert "Compute/EC2/EC2_Bastion_Private" in result["optimized_filters"]

thothctl-0.17.3/src/thothctl/version.py

@@ -1,2 +0,0 @@
-"""Version module."""
-__version__ = "0.17.3"