runbooks 1.1.4__py3-none-any.whl → 1.1.6__py3-none-any.whl

runbooks/inventory/core/formatter.py

@@ -203,6 +203,17 @@ class InventoryFormatter(CloudFoundationsFormatter):
 
     def format_console_table(self) -> str:
         """Format inventory data for console display."""
+        import os
+        import sys
+        import re
+
+        # Test Mode Support: Disable Rich Console in test environments to prevent I/O conflicts
+        USE_RICH = os.getenv("RUNBOOKS_TEST_MODE") != "1"
+
+        if not USE_RICH:
+            # Test mode: Use simple text formatting to prevent Click CliRunner I/O conflicts
+            return self._format_simple_text_table()
+
         try:
             from rich.console import Console
             from rich.table import Table

runbooks/inventory/draw_org_structure.py

@@ -58,7 +58,7 @@ from typing import Any, Dict, List, Optional
 
 import boto3
 from ArgumentsClass import CommonArguments
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 from graphviz import Digraph
 
 # Optional imports for enhanced features
@@ -74,7 +74,6 @@ except ImportError:
 
 __version__ = "2025.04.09"
 
-init()
 
 # Visual styling constants
 account_fillcolor = "orange"
@@ -379,7 +378,7 @@ def generate_mermaid(org_structure: Any, filename: str) -> None:
     try:
         with open(filename, "w", encoding="utf-8") as f:
             f.write("\n".join(lines))
-        print(f"Mermaid diagram successfully saved to '{Fore.RED}{filename}{Fore.RESET}'")
+        print(f"Mermaid diagram successfully saved to '[red]{filename}'")
         logging.info(f"Mermaid diagram successfully saved to {filename}")
     except Exception as e:
         logging.error(f"Failed to write Mermaid diagram to {filename}: {e}")
@@ -412,7 +411,7 @@ def generate_diagrams(org_structure: Any, filename: str) -> None:
         )
     except ImportError as imp_err:
         logging.error("Please install the 'diagrams' package to use generate_diagrams: pip install diagrams")
-        print(f"{Fore.YELLOW}Warning: diagrams library not available. Install with: pip install diagrams{Fore.RESET}")
+        print(f"[yellow]Warning: diagrams library not available. Install with: pip install diagrams")
         return
 
     def build_diagram(node: Dict[str, Any]):
@@ -434,7 +433,7 @@ def generate_diagrams(org_structure: Any, filename: str) -> None:
     try:
         with Diagram("AWS Organization Diagram", filename=filename, show=False, direction="LR"):
             build_diagram(org_structure)
-        print(f"Diagrams image successfully generated as '{Fore.RED}{filename}{Fore.RESET}'")
+        print(f"Diagrams image successfully generated as '[red]{filename}'")
         logging.info(f"Diagrams image successfully generated as {filename}")
     except Exception as e:
         logging.error(f"Failed to generate diagrams image: {e}")
@@ -636,7 +635,7 @@ def draw_org(froot: str, filename: str):
 
     # Save the diagram to a PNG file
     dot_unflat.render(filename, format="png", view=False)
-    print(f"Diagram saved to '{Fore.RED}{filename}.png{Fore.RESET}'")
+    print(f"Diagram saved to '[red]{filename}.png'")
 
 
 #####################
@@ -708,7 +707,7 @@ if __name__ == "__main__":
         if anticipated_time > 30:
             print()
             print(
-                f"{Fore.RED}Since this may take a while, you could re-run this script for only a specific OU by using the '--ou <OU ID>' parameter {Fore.RESET}"
+                f"[red]Since this may take a while, you could re-run this script for only a specific OU by using the '--ou <OU ID>' parameter "
             )
             print()
     else:
@@ -737,11 +736,11 @@ if __name__ == "__main__":
     # Display timing information
     if pTiming and pPolicy:
         print(
-            f"{Fore.GREEN}Drawing the Org structure when policies are included took {time() - begin_time:.2f} seconds{Fore.RESET}"
+            f"[green]Drawing the Org structure when policies are included took {time() - begin_time:.2f} seconds"
         )
     elif pTiming:
         print(
-            f"{Fore.GREEN}Drawing the Org structure without policies took {time() - begin_time:.2f} seconds{Fore.RESET}"
+            f"[green]Drawing the Org structure without policies took {time() - begin_time:.2f} seconds"
         )
 
     print("Thank you for using this script")

runbooks/inventory/drift_detection_cli.py

@@ -11,7 +11,7 @@ Strategic Alignment:
 
 Features:
 - Real-time AWS API cross-validation
-- Terraform state drift detection  
+- Terraform state drift detection
 - Rich CLI enterprise UX with visual indicators
 - Evidence-based drift reporting
 - Profile override priority system
@@ -34,7 +34,7 @@ from ..common.rich_utils import console, print_error, print_info, print_success
 from .mcp_inventory_validator import (
     create_inventory_mcp_validator,
     generate_drift_report,
-    validate_inventory_results_with_mcp
+    validate_inventory_results_with_mcp,
 )
 
 
@@ -45,46 +45,32 @@ def drift():
 
 
 @drift.command("detect")
-@click.option(
-    "--profile",
-    help="AWS profile to use (overrides environment variables)"
-)
-@click.option(
-    "--profiles", 
-    help="Comma-separated list of AWS profiles for multi-account analysis"
-)
+@click.option("--profile", help="AWS profile to use (overrides environment variables)")
+@click.option("--profiles", help="Comma-separated list of AWS profiles for multi-account analysis")
 @click.option(
     "--terraform-dir",
     default="/Volumes/Working/1xOps/CloudOps-Runbooks/terraform-aws",
-    help="Path to terraform configuration directory"
+    help="Path to terraform configuration directory",
 )
 @click.option(
     "--report-format",
     type=click.Choice(["console", "json", "csv"]),
     default="console",
-    help="Output format for drift report"
-)
-@click.option(
-    "--output-file",
-    help="File path to save drift report (optional)"
-)
-@click.option(
-    "--threshold",
-    type=float,
-    default=99.5,
-    help="Accuracy threshold for drift detection (default: 99.5%)"
+    help="Output format for drift report",
 )
+@click.option("--output-file", help="File path to save drift report (optional)")
+@click.option("--threshold", type=float, default=99.5, help="Accuracy threshold for drift detection (default: 99.5%)")
 def detect_drift(
     profile: Optional[str],
-    profiles: Optional[str], 
+    profiles: Optional[str],
     terraform_dir: str,
     report_format: str,
     output_file: Optional[str],
-    threshold: float
+    threshold: float,
 ):
     """
     Detect infrastructure drift using 3-way validation.
-    
+
     Compares inventory collection results against AWS API and terraform state
     to identify discrepancies and provide actionable recommendations.
     """
@@ -98,9 +84,9 @@ def detect_drift(
             # Use operational profile as default
             default_profile = get_profile_for_operation("operational", None)
             profile_list = [default_profile]
-            
+
         print_info(f"Starting drift detection for {len(profile_list)} profile(s)")
-        
+
         # Validate all profiles
         valid_profiles = []
         for prof in profile_list:
@@ -108,99 +94,83 @@ def detect_drift(
                 valid_profiles.append(prof)
             else:
                 print_error(f"Profile '{prof}' validation failed - skipping")
-                
+
         if not valid_profiles:
             print_error("No valid profiles available for drift detection")
             return
-            
+
         # Create validator with terraform integration
-        validator = create_inventory_mcp_validator(
-            profiles=valid_profiles,
-            terraform_directory=terraform_dir
-        )
-        
+        validator = create_inventory_mcp_validator(profiles=valid_profiles, terraform_directory=terraform_dir)
+
         # Set custom threshold if provided
         validator.validation_threshold = threshold
-        
+
         console.print(f"[blue]🔍 Initializing drift detection...[/]")
         console.print(f"[dim]Terraform directory: {terraform_dir}[/]")
         console.print(f"[dim]Accuracy threshold: {threshold}%[/]")
-        
+
         # For demonstration, create mock inventory data
         # In practice, this would come from actual inventory collection
         mock_inventory = _create_mock_inventory_data(valid_profiles)
-        
+
         # Perform enhanced validation with drift detection
         validation_results = validator.validate_inventory_data(mock_inventory)
-        
+
         # Generate summary results
         overall_accuracy = validation_results.get("total_accuracy", 0)
         terraform_integration = validation_results.get("terraform_integration", {})
-        
+
         if validation_results.get("passed_validation", False):
             print_success(f"✅ Drift detection completed: {overall_accuracy:.1f}% accuracy")
         else:
             console.print(f"[yellow]🔄 Infrastructure drift detected: {overall_accuracy:.1f}% accuracy[/]")
-            
+
         # Display terraform integration status
         if terraform_integration.get("enabled", False):
             tf_files = terraform_integration.get("state_files_discovered", 0)
             print_info(f"Terraform integration: {tf_files} configuration files analyzed")
-            
+
             drift_analysis = terraform_integration.get("drift_analysis", {})
             if drift_analysis:
                 drift_pct = drift_analysis.get("drift_percentage", 0)
                 tf_coverage = drift_analysis.get("terraform_coverage_percentage", 0)
                 console.print(f"[dim]📊 {drift_pct:.1f}% of accounts have drift detected[/]")
                 console.print(f"[dim]🎯 {tf_coverage:.1f}% of accounts have terraform coverage[/]")
-        
+
         # Generate and export report if requested
         if output_file or report_format != "console":
             drift_report = generate_drift_report(valid_profiles, mock_inventory, terraform_dir)
-            
+
             if output_file:
                 _export_drift_report(drift_report, output_file, report_format)
                 print_success(f"Drift report exported to: {output_file}")
-                
+
         print_info("Drift detection analysis complete")
-        
+
     except Exception as e:
         print_error(f"Drift detection failed: {str(e)}")
         raise click.Abort()
 
 
 @drift.command("report")
-@click.option(
-    "--profile",
-    help="AWS profile to use for single-account analysis"
-)
+@click.option("--profile", help="AWS profile to use for single-account analysis")
 @click.option(
     "--terraform-dir",
     default="/Volumes/Working/1xOps/CloudOps-Runbooks/terraform-aws",
-    help="Path to terraform configuration directory"
+    help="Path to terraform configuration directory",
 )
 @click.option(
     "--format",
     "report_format",
     type=click.Choice(["json", "csv", "markdown"]),
     default="json",
-    help="Report output format"
+    help="Report output format",
 )
-@click.option(
-    "--output",
-    "output_file",
-    required=True,
-    help="Output file path for drift report"
-)
-def generate_report(
-    profile: Optional[str],
-    terraform_dir: str,
-    report_format: str,
-    output_file: str
-):
+@click.option("--output", "output_file", required=True, help="Output file path for drift report")
+def generate_report(profile: Optional[str], terraform_dir: str, report_format: str, output_file: str):
     """
     Generate comprehensive infrastructure drift report.
-    
+
     Creates detailed drift analysis report with actionable recommendations
     for infrastructure as code management and compliance.
     """
@@ -208,35 +178,35 @@ def generate_report(
         # Use default profile if none specified
         if not profile:
             profile = get_profile_for_operation("operational", None)
-            
+
         print_info(f"Generating drift report for profile: {profile}")
-        
+
         # Validate profile
         if not validate_profile_access(profile, "drift-reporting"):
             print_error(f"Profile '{profile}' validation failed")
             return
-            
+
         # Create mock inventory for demonstration
         mock_inventory = _create_mock_inventory_data([profile])
-        
+
         # Generate comprehensive drift report
         drift_report = generate_drift_report([profile], mock_inventory, terraform_dir)
-        
+
         # Export report
         _export_drift_report(drift_report, output_file, report_format)
-        
+
         print_success(f"Drift report generated: {output_file}")
-        
+
         # Display summary
         accounts_analyzed = drift_report.get("accounts_analyzed", 0)
         overall_accuracy = drift_report.get("overall_accuracy", 0)
         drift_detected = drift_report.get("drift_detected", False)
-        
+
         console.print(f"[dim]📊 Analysis Summary:[/]")
         console.print(f"[dim]  Accounts analyzed: {accounts_analyzed}[/]")
         console.print(f"[dim]  Overall accuracy: {overall_accuracy:.1f}%[/]")
         console.print(f"[dim]  Drift detected: {'Yes' if drift_detected else 'No'}[/]")
-        
+
     except Exception as e:
         print_error(f"Report generation failed: {str(e)}")
         raise click.Abort()
@@ -245,7 +215,7 @@ def generate_report(
 def _create_mock_inventory_data(profiles: List[str]) -> dict:
     """Create mock inventory data for demonstration purposes."""
     mock_data = {}
-    
+
     for profile in profiles:
         mock_data[profile] = {
             "resource_counts": {
@@ -258,12 +228,12 @@ def _create_mock_inventory_data(profiles: List[str]) -> dict:
                 "cloudformation": 4,
                 "elbv2": 1,
                 "route53": 2,
-                "sns": 3
+                "sns": 3,
             },
             "regions": ["us-east-1", "us-west-2", "ap-southeast-2"],
-            "collection_timestamp": "2024-09-10T12:00:00Z"
+            "collection_timestamp": "2024-09-10T12:00:00Z",
         }
-    
+
     return mock_data
 
 
@@ -271,50 +241,53 @@ def _export_drift_report(report_data: dict, output_file: str, format_type: str)
     """Export drift report to specified format."""
     import json
     from pathlib import Path
-    
+
     output_path = Path(output_file)
     output_path.parent.mkdir(parents=True, exist_ok=True)
-    
+
     if format_type == "json":
-        with open(output_path, 'w') as f:
+        with open(output_path, "w") as f:
             json.dump(report_data, f, indent=2, default=str)
     elif format_type == "csv":
         # Create CSV summary
         import csv
-        with open(output_path, 'w', newline='') as f:
+
+        with open(output_path, "w", newline="") as f:
             writer = csv.writer(f)
-            writer.writerow(['Account ID', 'Profile', 'Accuracy %', 'Drift Detected', 'Terraform Coverage'])
-            
+            writer.writerow(["Account ID", "Profile", "Accuracy %", "Drift Detected", "Terraform Coverage"])
+
             for account in report_data.get("detailed_analysis", []):
-                writer.writerow([
-                    account.get("account_id", "Unknown"),
-                    account.get("profile", "Unknown"),
-                    f"{account.get('accuracy_percent', 0):.1f}",
-                    "Yes" if account.get("drift_summary", {}).get("drift_detected", 0) > 0 else "No",
-                    "Yes" if account.get("terraform_coverage", False) else "No"
-                ])
+                writer.writerow(
+                    [
+                        account.get("account_id", "Unknown"),
+                        account.get("profile", "Unknown"),
+                        f"{account.get('accuracy_percent', 0):.1f}",
+                        "Yes" if account.get("drift_summary", {}).get("drift_detected", 0) > 0 else "No",
+                        "Yes" if account.get("terraform_coverage", False) else "No",
+                    ]
+                )
     elif format_type == "markdown":
         # Create markdown report
-        with open(output_path, 'w') as f:
+        with open(output_path, "w") as f:
             f.write("# Infrastructure Drift Analysis Report\n\n")
             f.write(f"**Generated:** {report_data.get('generated_timestamp', 'Unknown')}\n\n")
-            
+
             terraform_info = report_data.get("terraform_integration", {})
             f.write(f"**Terraform Integration:** {terraform_info.get('enabled', False)}\n")
             f.write(f"**State Files Discovered:** {terraform_info.get('state_files_discovered', 0)}\n\n")
-            
+
             f.write("## Summary\n\n")
             f.write(f"- **Accounts Analyzed:** {report_data.get('accounts_analyzed', 0)}\n")
             f.write(f"- **Overall Accuracy:** {report_data.get('overall_accuracy', 0):.1f}%\n")
             f.write(f"- **Drift Detected:** {'Yes' if report_data.get('drift_detected', False) else 'No'}\n\n")
-            
+
             f.write("## Detailed Analysis\n\n")
             for account in report_data.get("detailed_analysis", []):
                 f.write(f"### Account: {account.get('account_id', 'Unknown')}\n\n")
                 f.write(f"- **Profile:** {account.get('profile', 'Unknown')}\n")
                 f.write(f"- **Accuracy:** {account.get('accuracy_percent', 0):.1f}%\n")
                 f.write(f"- **Terraform Coverage:** {'Yes' if account.get('terraform_coverage', False) else 'No'}\n\n")
-                
+
                 recommendations = account.get("recommendations", [])
                 if recommendations:
                     f.write("**Recommendations:**\n")
@@ -324,4 +297,4 @@ def _export_drift_report(report_data: dict, output_file: str, format_type: str)
 
 
 if __name__ == "__main__":
-    drift()
+    drift()

runbooks/inventory/ec2_vpc_utils.py

@@ -14,7 +14,7 @@ def del_vpc(ocredentials, fVPCId, fRegion):
 
     import boto3
     from botocore.exceptions import ClientError
-    from colorama import Fore, init
+    from runbooks.common.rich_utils import console
 
     # ERASE_LINE = '\x1b[2K'
 
@@ -335,7 +335,7 @@ def del_vpc(ocredentials, fVPCId, fRegion):
             return 1  # out of the try
     except ClientError as my_Error:
         print(my_Error)
-        print(f"{Fore.RED}What to do now?{Fore.RESET}")
+        print(f"[red]What to do now?")
         return 1
 
     return 0

runbooks/inventory/find_cfn_drift_detection.py

@@ -70,9 +70,8 @@ import Inventory_Modules
 from account_class import aws_acct_access
 from ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 
-init()
 __version__ = "2023.05.04"
 
 # Configure comprehensive argument parsing for CloudFormation drift detection operations
@@ -142,7 +141,6 @@ This would enable:
 """
 
 ##########################
-ERASE_LINE = "\x1b[2K"  # Terminal control for dynamic output updates
 
 # Initialize AWS account access and organizational context for drift detection
 aws_acct = aws_acct_access(pProfile)
@@ -235,7 +233,7 @@ for account in ChildAccounts:
             # Log regional stack discovery progress for operational visibility
             logging.warning(f"Account: {account['AccountId']} | Region: {region} | Found {StackNum} Stacks")
             logging.info(
-                f"{ERASE_LINE}{Fore.RED}Account: {account['AccountId']} Region: {region} Found {StackNum} Stacks{Fore.RESET}"
+                f"[red]Account: {account['AccountId']} Region: {region} Found {StackNum} Stacks"
             )
 
         except ClientError as my_Error:
@@ -260,10 +258,10 @@ for account in ChildAccounts:
             NumStacksFound += 1  # Increment total drift detection counter
 
 # Provide comprehensive operational summary with drift detection metrics
-print(ERASE_LINE)
+console.print()
 print(
-    f"{Fore.RED}Looked through {NumStacksFound} Stacks across {len(ChildAccounts)} accounts across "
-    f"{len(RegionList)} regions{Fore.RESET}"
+    f"[red]Looked through {NumStacksFound} Stacks across {len(ChildAccounts)} accounts across "
+    f"{len(RegionList)} regions"
 )
 print()
 

runbooks/inventory/find_cfn_orphaned_stacks.py

@@ -76,7 +76,7 @@ from ArgumentsClass import CommonArguments
 
 # import simplejson as json
 from botocore.exceptions import ClientError
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 from Inventory_Modules import (
     display_results,
     find_stack_instances3,
@@ -87,9 +87,7 @@ from Inventory_Modules import (
     print_timings,
 )
 
-init()
 __version__ = "2024.05.18"
-ERASE_LINE = "\x1b[2K"
 begin_time = time()
 
 
@@ -250,7 +248,7 @@ def setup_auth_and_regions(fProfile: str, f_AccountList: list, f_Region: str, f_
         pass  # Valid profile specification (string or None for default)
     else:  # Invalid profile type (list, integer, etc.) - should be caught at argparse level
         print(
-            f"{Fore.RED}You specified an invalid profile name. This script only allows for one profile at a time. Please try again.{Fore.RESET}"
+            f"[red]You specified an invalid profile name. This script only allows for one profile at a time. Please try again."
         )
         sys.exit(7)
 
@@ -268,8 +266,8 @@ def setup_auth_and_regions(fProfile: str, f_AccountList: list, f_Region: str, f_
     # Validate home region specification ensuring single region for StackSet control plane
     if f_Region.lower() not in AllRegions:
         print(
-            f"{Fore.RED}You specified '{f_Region}' as the region, but this script only works with a single region.\n"
-            f"Please run the command again and specify only a single, valid region{Fore.RESET}"
+            f"[red]You specified '{f_Region}' as the region, but this script only works with a single region.\n"
+            f"Please run the command again and specify only a single, valid region"
         )
         sys.exit(9)
 
@@ -309,12 +307,12 @@ def setup_auth_and_regions(fProfile: str, f_AccountList: list, f_Region: str, f_
 
     # Display account exclusion list if specified
     print(
-        f"While skipping these accounts:\n{Fore.RED}{f_args.SkipAccounts}{Fore.RESET}"
+        f"While skipping these accounts:\n[red]{f_args.SkipAccounts}"
     ) if f_args.SkipAccounts is not None else ""
 
     # Display fragment filtering configuration with exact vs substring matching
     if f_args.Exact:
-        print(f"\t\tFor stacksets that {Fore.RED}exactly match{Fore.RESET}: {f_args.Fragments}")
+        print(f"\t\tFor stacksets that [red]exactly match: {f_args.Fragments}")
     else:
         print(
             f"\t\tFor stacksets that contain th{'is fragment' if len(f_args.Fragments) == 1 else 'ese fragments'}: {f_args.Fragments}"
@@ -712,7 +710,7 @@ if __name__ == "__main__":
 
     if pTiming:
         print(ERASE_LINE)
-        print(f"{Fore.GREEN}This script took {time() - begin_time:.2f} seconds{Fore.RESET}")
+        print(f"[green]This script took {time() - begin_time:.2f} seconds")
 
     print()
     print("Thanks for using this script...")

runbooks/inventory/find_cfn_stackset_drift.py

@@ -70,11 +70,10 @@ import Inventory_Modules
 from account_class import aws_acct_access
 from ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 from Inventory_Modules import display_results
 
 # Initialize colorama for cross-platform colored terminal output
-init()
 __version__ = "2024.03.06"
 begin_time = time()  # Script execution timing for performance monitoring
 sleep_interval = 5  # Default wait interval for drift detection operations
@@ -248,7 +247,7 @@ def setup_auth(fProfile: str) -> aws_acct_access:
 
     # Validate successful authentication and account access
     if not aws_acct.Success:
-        print(f"{Fore.RED}Profile {pProfile} failed to access an account. Check credentials and try again{Fore.RESET}")
+        print(f"[red]Profile {pProfile} failed to access an account. Check credentials and try again")
         sys.exit(99)
 
     # Display comprehensive operational context for user confirmation and audit logging
@@ -259,7 +258,7 @@ def setup_auth(fProfile: str) -> aws_acct_access:
 
     # Display fragment filtering criteria with exact vs substring matching context
     if pExact:
-        print(f"\t\tFor stacksets that {Fore.RED}exactly match{Fore.RESET}: {pFragments}")
+        print(f"\t\tFor stacksets that [red]exactly match: {pFragments}")
     else:
         print(
             f"\t\tFor stacksets that contain th{'is fragment' if len(pFragments) == 1 else 'ese fragments'}: {pFragments}"
@@ -723,11 +722,11 @@ if __name__ == "__main__":
         display_results(sorted_all_stacksets, display_dict_stacksets, None, pSaveFilename)
 
     print(ERASE_LINE)
-    print(f"{Fore.RED}Looked through {len(sorted_all_stacksets)} StackSets across the {pRegion} region{Fore.RESET}")
+    print(f"[red]Looked through {len(sorted_all_stacksets)} StackSets across the {pRegion} region")
     print()
 
     if pTiming:
         print(ERASE_LINE)
-        print(f"{Fore.GREEN}This script took {time() - begin_time:.3f} seconds{Fore.RESET}")
+        print(f"[green]This script took {time() - begin_time:.3f} seconds")
     print("Thanks for using this script...")
     print()