thothctl 0.16.7__tar.gz → 0.16.9__tar.gz

{thothctl-0.16.7 → thothctl-0.16.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thothctl
-Version: 0.16.7
+Version: 0.16.9
 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.16.7 → thothctl-0.16.9}/docs/framework/commands/check/deps.md

@@ -37,8 +37,15 @@ Infrastructure Modules
     ├── stacks/foundation/network/security-groups (38.5% risk)
     │   └── stacks/foundation/network/vpc (46.5% risk)
     └── stacks/platform/data/rds (42.5% risk)
+
+✅ Found 5 stacks, 12 modules, 10 dependencies
 ```
 
+The summary counts:
+- **Stacks**: nodes in the dependency graph (directories with `terragrunt.hcl`)
+- **Modules**: total `module` blocks across all stack `.tf` files
+- **Dependencies**: edges in the DAG (from `dependency` blocks)
+
 ### Boxart
 
 ```

{thothctl-0.16.7 → thothctl-0.16.9}/src/thothctl/commands/check/commands/iac.py

@@ -636,7 +636,7 @@ class CheckIaCCommand(ClickCommand):
             nodes, edges = self._parse_dot_graph(dot_graph)
             risks = calculate_component_risks(nodes, edges, directory)
             dep_info = self._parse_terragrunt_dependencies(directory)
-            self._display_dependency_graph(dot_graph, risks, dep_info)
+            self._display_dependency_graph(dot_graph, risks, dep_info, directory)
             return True
             
         except Exception as e:
@@ -823,7 +823,7 @@ new vis.Network(container, data, options);
         
         return dependencies_info
     
-    def _display_dependency_graph(self, dot_graph: str, risks: Dict[str, float] = None, dep_info: Dict = None) -> None:
+    def _display_dependency_graph(self, dot_graph: str, risks: Dict[str, float] = None, dep_info: Dict = None, directory: str = ".") -> None:
         """
         Display the dependency graph in a visually appealing way
         
@@ -848,7 +848,12 @@ new vis.Network(container, data, options);
             self._display_dependency_details(dep_info)
 
         # Display summary
-        self.console.print(f"\n[green]✅ Found {len(nodes)} modules with {len(edges)} dependencies[/green]")
+        total_modules = self._count_modules_in_stacks(nodes, directory)
+        self.console.print(
+            f"\n[green]✅ Found {len(nodes)} stacks, "
+            f"{total_modules} modules, "
+            f"{len(edges)} dependencies[/green]"
+        )
 
         # Display risk legend
         if risks:
@@ -881,6 +886,24 @@ new vis.Network(container, data, options);
                                 value_str = value_str[:47] + "..."
                             self.console.print(f"       • {key} = [green]{value_str}[/green]")
 
+
+    def _count_modules_in_stacks(self, nodes: list, directory: str) -> int:
+        """Count total module blocks across all stacks."""
+        import re
+        total = 0
+        for node in nodes:
+            stack_dir = os.path.join(directory, node)
+            if not os.path.isdir(stack_dir):
+                continue
+            for f in os.listdir(stack_dir):
+                if f.endswith(".tf"):
+                    try:
+                        content = open(os.path.join(stack_dir, f)).read()
+                        total += len(re.findall(r'^module\s+"', content, re.MULTILINE))
+                    except OSError:
+                        pass
+        return total
+
     def _display_risk_legend(self) -> None:
         """Display a legend for risk levels"""
         legend = Table(show_header=False, box=box.SIMPLE)

{thothctl-0.16.7 → thothctl-0.16.9}/src/thothctl/services/inventory/inventory_service.py

@@ -40,6 +40,7 @@ class InventoryService:
         self.module_compatibility_service = ModuleCompatibilityService()
         self.terragrunt_parser = TerragruntParser()
         self.is_terragrunt_project = False
+        self._failed_provider_stacks = []
 
     def _parse_hcl_file(self, file_path: Path) -> List[Component]:
         """Parse HCL file and extract components."""
@@ -633,6 +634,14 @@ class InventoryService:
         if print_console:
             self.report_service.print_inventory_console(inventory_dict)
 
+        # Warn about stacks where provider detection fell back to HCL parsing
+        if self._failed_provider_stacks:
+            inventory_dict["_provider_warnings"] = self._failed_provider_stacks
+            logger.warning(
+                f"⚠️  {len(self._failed_provider_stacks)}/{len(inventory_dict.get('stacks', []))} "
+                f"stacks used HCL fallback for providers (command failed/timed out)"
+            )
+
         return inventory_dict
 
     def update_inventory(
@@ -778,7 +787,14 @@ class InventoryService:
             logger.warning(f"Timeout while getting providers for {stack_path}")
         except Exception as e:
             logger.warning(f"Error getting providers for {stack_path}: {str(e)}")
-            
+
+        # Fallback: parse required_providers from .tf files if command failed
+        if not providers:
+            providers = self._parse_providers_from_hcl(abs_stack_path)
+            if providers:
+                logger.info(f"Recovered {len(providers)} providers from HCL for {stack_path}")
+                self._failed_provider_stacks.append(str(stack_path))
+
         return providers
         
 
@@ -829,6 +845,34 @@ class InventoryService:
         # Modules referenced but .terraform/modules not present = not initialized
         return not (stack_path / ".terraform" / "modules").exists()
 
+
+    def _parse_providers_from_hcl(self, stack_path: Path) -> List[Provider]:
+        """Fallback: extract providers from required_providers in .tf files."""
+        providers = []
+        for tf_file in stack_path.glob("*.tf"):
+            try:
+                with open(tf_file, "r", encoding="utf-8") as f:
+                    data = hcl2.load(f)
+            except Exception:
+                continue
+
+            # Look for terraform { required_providers { ... } }
+            for terraform_block in data.get("terraform", []):
+                for rp in terraform_block.get("required_providers", []):
+                    for name, config in rp.items():
+                        source = config.get("source", f"hashicorp/{name}") if isinstance(config, dict) else f"hashicorp/{name}"
+                        version = config.get("version", "~>") if isinstance(config, dict) else "~>"
+                        # Clean version constraint to just the number
+                        version_clean = version.lstrip("~>=<! ").split(",")[0].strip()
+                        providers.append(Provider(
+                            name=name,
+                            version=version_clean or "unknown",
+                            source=source,
+                            module="Root",
+                            component=os.path.basename(str(stack_path)),
+                        ))
+        return providers
+
     def _parse_providers_output(self, output: str, stack_path: str = "") -> List[Provider]:
         """
         Parse the output of terraform/tofu providers command.

thothctl-0.16.9/src/thothctl/version.py

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

thothctl-0.16.7/src/thothctl/version.py

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