thothctl 0.18.7__tar.gz → 0.18.8__tar.gz

{thothctl-0.18.7 → thothctl-0.18.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thothctl
-Version: 0.18.7
+Version: 0.18.8
 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.18.7 → thothctl-0.18.8}/src/thothctl/commands/scan/commands/iac.py

@@ -67,13 +67,13 @@ class RestoredIaCScanCommand(ClickCommand):
             
             # Create a panel with scan information
             scan_info = Panel(
-                f"[bold]Starting security scan (Original Mode)[/bold]\n\n"
+                f"[bold]Starting security scan[/bold]\n\n"
                 f"Directory: [cyan]{code_directory}[/cyan]\n"
                 f"Project: [magenta]{project_name}[/magenta]\n"
                 f"Tools: [yellow]{', '.join(tools)}[/yellow]\n"
                 f"Reports directory: [green]{reports_dir}[/green]\n"
-                f"Output: [blue]Original structure with unified styling[/blue]",
-                title="[bold blue]ThothCTL Original Scan[/bold blue]",
+                f"Enforcement: [{'red' if self._enforcement == 'hard' else 'green'}]{self._enforcement}[/{'red' if self._enforcement == 'hard' else 'green'}]",
+                title="[bold blue]ThothCTL Security Scan[/bold blue]",
                 border_style="blue"
             )
             self.console.print(scan_info)
@@ -171,12 +171,12 @@ class RestoredIaCScanCommand(ClickCommand):
 
             # Create completion panel
             completion_panel = Panel(
-                f"[bold green]Original scan completed successfully![/bold green]\n\n"
+                f"[bold green]Security scan completed![/bold green]\n\n"
                 f"⏱️  Scan time: [cyan]{scan_time:.2f} seconds[/cyan]\n"
                 f"📊 Reports directory: [blue]{reports_dir}[/blue]\n"
                 f"🎨 HTML reports: [blue]Generated with unified styling[/blue]\n"
                 f"🔍 Tools used: [yellow]{len(tools)}[/yellow]",
-                title="[bold green]Original Scan Complete[/bold green]",
+                title="[bold green]Scan Complete[/bold green]",
                 border_style="green"
             )
             self.console.print(completion_panel)
@@ -184,20 +184,90 @@ class RestoredIaCScanCommand(ClickCommand):
             # Exit with code 1 if hard enforcement failed
             if has_violations:
                 ctx = click.get_current_context()
-                self.console.print(
-                    "[bold red]⛔ Hard enforcement: policy violations detected. Exiting with code 1.[/bold red]"
+                # Collect violation details per tool
+                violation_lines = []
+                all_findings = []
+                for tool_name, tool_result in results.items():
+                    if tool_name == "summary" or not isinstance(tool_result, dict):
+                        continue
+                    rd = tool_result.get("report_data", {})
+                    failed = rd.get("failed_count", 0)
+                    errors = rd.get("error_count", 0)
+                    if failed + errors > 0:
+                        violation_lines.append(
+                            f"  • [yellow]{tool_name}[/yellow]: {failed} violation{'s' if failed != 1 else ''}, {errors} error{'s' if errors != 1 else ''}"
+                        )
+                        # Collect findings for the table (only HIGH/deny-level)
+                        for f in tool_result.get("findings", []):
+                            sev = f.get("severity", "HIGH").upper()
+                            if sev in ("HIGH", "CRITICAL"):
+                                all_findings.append({**f, "tool": tool_name})
+
+                # Build non-compliance table
+                findings_table = Table(
+                    title="Non-Compliance Findings",
+                    box=rich.box.SIMPLE_HEAVY,
+                    header_style="bold red",
+                    title_style="bold red",
+                    show_lines=False,
+                    expand=True,
+                )
+                findings_table.add_column("Tool", style="yellow", max_width=12)
+                findings_table.add_column("Severity", justify="center", max_width=10)
+                findings_table.add_column("Policy Violation", style="white", ratio=3)
+                findings_table.add_column("File", style="dim", ratio=2, overflow="ellipsis")
+
+                # Show up to 15 findings
+                display_findings = all_findings[:15]
+                for f in display_findings:
+                    sev = f.get("severity", "HIGH").upper()
+                    sev_style = "bold red" if sev == "CRITICAL" else "red"
+                    file_ref = f.get("file", "")
+                    if file_ref and len(file_ref) > 60:
+                        file_ref = "..." + file_ref[-57:]
+                    line = f.get("line", 0)
+                    file_display = f"{file_ref}:{line}" if line else file_ref
+
+                    findings_table.add_row(
+                        f.get("tool", ""),
+                        f"[{sev_style}]{sev}[/{sev_style}]",
+                        f.get("title", ""),
+                        file_display,
+                    )
+
+                remaining = len(all_findings) - len(display_findings)
+                if remaining > 0:
+                    findings_table.add_row(
+                        "", "", f"[dim]... and {remaining} more[/dim]", ""
+                    )
+
+                self.console.print()
+                self.console.print(findings_table)
+
+                violations_detail = "\n".join(violation_lines)
+                enforcement_panel = Panel(
+                    f"[bold red]Security policy violations detected[/bold red]\n\n"
+                    f"{violations_detail}\n\n"
+                    f"[dim]Mode:[/dim] [bold]--enforcement hard[/bold] — pipeline will exit with code 1\n"
+                    f"[dim]Fix:[/dim]  Resolve the violations above, or use [bold]--enforcement soft[/bold] to report without blocking.\n"
+                    f"[dim]Reports:[/dim] See [blue]{reports_dir}[/blue] for details.",
+                    title="[bold red]⛔ Enforcement Failed[/bold red]",
+                    border_style="red"
                 )
+                self.console.print(enforcement_panel)
                 ctx.exit(1)
 
         except Exception as e:
             error_panel = Panel(
-                f"[bold red]Original scan failed![/bold red]\n\n"
-                f"Error: [red]{str(e)}[/red]",
-                title="[bold red]Error[/bold red]",
+                f"[bold red]Security scan could not complete[/bold red]\n\n"
+                f"[red]{str(e)}[/red]\n\n"
+                f"[dim]This is an execution error, not a policy violation.\n"
+                f"Check that the required tools are installed and the target directory is valid.[/dim]",
+                title="[bold red]❌ Scan Error[/bold red]",
                 border_style="red"
             )
             self.console.print(error_panel)
-            self.logger.error(f"Original scan execution failed: {e}")
+            self.logger.error(f"Scan execution failed: {e}")
             raise
 
     def _parse_options(self, options_str: str) -> dict:

thothctl-0.18.8/src/thothctl/version.py

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

thothctl-0.18.7/src/thothctl/version.py

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