runbooks 1.1.5__py3-none-any.whl → 1.1.7__py3-none-any.whl

runbooks/inventory/list_ssm_parameters.py

@@ -64,14 +64,11 @@ from time import time
 
 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, find_ssm_parameters2, get_all_credentials
-from tqdm.auto import tqdm
 
-init()
 __version__ = "2024.05.07"
 begin_time = time()
-ERASE_LINE = "\x1b[2K"
 
 
 ##################
@@ -236,7 +233,7 @@ def find_ssm_parameters(f_credentialList):
             parameter_list.extend(find_ssm_parameters2(credential))
         # Optional verbose logging for parameter discovery progress (currently commented)
         # if verbose < 50 or len(parameter_list) == 0:
-        # 	print(f"Found a running total of {len(parameter_list)} parameters in account {Fore.RED}{credential['AccountNumber']}{Fore.RESET} in region {Fore.RED}{credential['Region']}{Fore.RESET}")
+        # 	print(f"Found a running total of {len(parameter_list)} parameters in account [red]{credential['AccountNumber']} in region [red]{credential['Region']}")
         except ClientError as my_Error:
             # Handle AWS API authorization failures gracefully
             if "AuthFailure" in str(my_Error):
@@ -404,7 +401,7 @@ if __name__ == "__main__":
     # Display performance timing metrics for operational optimization
     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()
 
@@ -424,7 +421,7 @@ if __name__ == "__main__":
     # Display completion message and output file information
     print("Thank you for using this script")
     print(
-        f"Your output was saved to {Fore.GREEN}'{pFilename}-{datetime.now().strftime('%y-%m-%d--%H:%M:%S')}'{Fore.RESET}"
+        f"Your output was saved to [green]'{pFilename}-{datetime.now().strftime('%y-%m-%d--%H:%M:%S')}'"
     ) if pFilename is not None else None
 
     print()

runbooks/inventory/list_vpc_subnets.py

@@ -76,10 +76,9 @@ from time import time
 import Inventory_Modules
 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, get_all_credentials
 
-init()
 __version__ = "2024.10.24"
 
 # TODO: Add Elastic IPs to this script as well.
@@ -384,7 +383,6 @@ def analyze_results(fSubnetsFound: list):
 ##################
 
 
-ERASE_LINE = "\x1b[2K"
 begin_time = time()
 
 if __name__ == "__main__":
@@ -426,7 +424,7 @@ if __name__ == "__main__":
         analyze_results(SubnetsFound)
     if pTiming:
         print(ERASE_LINE)
-        print(f"{Fore.GREEN}This script completed in {time() - begin_time:.2f} seconds{Fore.RESET}")
+        print(f"[green]This script completed in {time() - begin_time:.2f} seconds")
 
 print()
 print("Thank you for using this script")

runbooks/inventory/list_vpcs.py

@@ -62,10 +62,9 @@ from time import time
 import Inventory_Modules
 from ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
-from colorama import Fore, init
 from Inventory_Modules import display_results, get_all_credentials
+from runbooks.common.rich_utils import console
 
-init()
 __version__ = "2024.01.26"
 
 
@@ -324,9 +323,9 @@ def find_all_vpcs(fAllCredentials, fDefaultOnly=False):
 
     for credential in fAllCredentials:
         logging.info(f"Beginning to queue data - starting with {credential['AccountId']}")
-        print(
-            f"{ERASE_LINE}Checking {credential['AccountId']} in region {credential['Region']} - {PlaceCount + 1} / {len(fAllCredentials)}",
-            end="\r",
+        console.print(
+            f"Checking {credential['AccountId']} in region {credential['Region']} - {PlaceCount + 1} / {len(fAllCredentials)}",
+            end="",
         )
         # for region in fRegionList:
         try:
@@ -361,8 +360,6 @@ if __name__ == "__main__":
     verbose = args.loglevel
     logging.basicConfig(level=verbose, format="[%(filename)s:%(lineno)s - %(funcName)30s() ] %(message)s")
 
-    ERASE_LINE = "\x1b[2K"
-
     begin_time = time()
 
     NumVpcsFound = 0
@@ -409,9 +406,9 @@ if __name__ == "__main__":
     logging.info(f"Threads all done - took {time() - begin_time:.2f} seconds")
 
     if pTiming:
-        print(ERASE_LINE)
-        print(f"{Fore.GREEN}This script took {time() - begin_time:.2f} seconds{Fore.RESET}")
-    print(ERASE_LINE)
+        console.print()
+        console.print(f"[green]This script took {time() - begin_time:.2f} seconds[/green]")
+    console.print()
     # Had to do this, because some of the VPCs that show up in the "sorted_AllVPCs" list are actually the same VPC, with a different CIDR range.
     Num_of_unique_VPCs = len(set([x["VpcId"] for x in sorted_AllVPCs]))
     print(

runbooks/inventory/mcp_inventory_validator.py

@@ -35,12 +35,13 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 import boto3
-from rich.console import Console
-from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn, TimeElapsedColumn
+from rich.progress import BarColumn, SpinnerColumn, TaskProgressColumn, TextColumn, TimeElapsedColumn
+from runbooks.common.rich_utils import Progress
 from rich.table import Table
 
 from ..common.profile_utils import get_profile_for_operation, resolve_profile_for_operation_silent
 from ..common.rich_utils import (
+    Console,
     console as rich_console,
     create_table,
     format_cost,
@@ -1003,7 +1004,8 @@ class EnhancedMCPValidator:
             with ThreadPoolExecutor(max_workers=min(5, len(self.aws_sessions))) as executor:
                 # Submit all validation tasks
                 future_to_profile = {}
-                for profile, session in self.aws_sessions.items():
+                for profile, session_info in self.aws_sessions.items():
+                    session = session_info["session"]  # Extract boto3.Session from dict
                     future = executor.submit(
                         self._validate_profile_with_drift_detection, profile, session, runbooks_inventory
                     )

runbooks/inventory/organizations_discovery.py

@@ -24,17 +24,21 @@ from typing import Dict, List, Optional, Set, Tuple
 
 import boto3
 from botocore.exceptions import ClientError, NoCredentialsError
-from rich.console import Console
 from rich.panel import Panel
-from rich.progress import BarColumn, Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
+from rich.progress import BarColumn, SpinnerColumn, TextColumn, TimeElapsedColumn
 from rich.status import Status
 from rich.table import Table
 
-# Initialize Rich console
-console = Console()
+# Test Mode Support: Use centralized rich_utils for console and Progress (test-aware)
+# Issue: Rich Console/Progress write to StringIO buffer that Click CliRunner closes, causing ValueError
+# Solution: rich_utils provides MockConsole/MockProgress in test mode, Rich components in production
+import os
+import sys
+import re
 
 from ..utils.logger import configure_logger
 from ..common.performance_optimization_engine import get_optimization_engine
+from ..common.rich_utils import console, Progress
 
 logger = configure_logger(__name__)
 

runbooks/inventory/recover_cfn_stack_ids.py

@@ -10,7 +10,7 @@ import Inventory_Modules
 import simplejson as json
 from account_class import aws_acct_access
 from ArgumentsClass import CommonArguments
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 from Inventory_Modules import get_credentials_for_accounts_in_org
 
 """
@@ -18,7 +18,6 @@ This script was created to help solve a testing problem for the "move_stack_inst
 Originally, that script didn't have built-in recovery, so we needed this script to "recover" those stack-instance ids that might have been lost during the move_stack_instances.py run. However, that script now has built-in recovery, so this script isn't really needed. However, it can still be used to find any stack-instances that have been orphaned from their original stack-set, if that happens. 
 """
 
-init()
 __version__ = "2024.05.18"
 
 
@@ -70,9 +69,9 @@ def setup_auth_and_regions(fProfile: str = None) -> (object, list, list):
     ChildAccounts = Inventory_Modules.RemoveCoreAccounts(ChildAccounts, pAccountsToSkip)
     AccountList = [account["AccountId"] for account in ChildAccounts]
 
-    print(f"You asked to find stacks with this fragment list: {Fore.RED}{pFragments}{Fore.RESET}")
-    print(f"\t\tin these accounts: {Fore.RED}{AccountList}{Fore.RESET}")
-    print(f"\t\tin these regions: {Fore.RED}{RegionList}{Fore.RESET}")
+    print(f"You asked to find stacks with this fragment list: [red]{pFragments}")
+    print(f"\t\tin these accounts: [red]{AccountList}")
+    print(f"\t\tin these regions: [red]{RegionList}")
     return aws_acct, AccountList, RegionList
 
 
@@ -129,7 +128,7 @@ if __name__ == "__main__":
                 Stacks = Inventory_Modules.find_stacks2(cred, region, pFragments)
                 logging.warning(f"Account: {cred['AccountId']} | Region: {region} | Found {len(Stacks)} Stacks")
                 print(
-                    f"{ERASE_LINE}{Fore.RED}Account: {cred['AccountId']} Region: {region} Found {len(Stacks)} Stacks{Fore.RESET} ({item_counter} of {len(AccountList) * len(RegionList)})",
+                    f"{ERASE_LINE}[red]Account: {cred['AccountId']} Region: {region} Found {len(Stacks)} Stacks ({item_counter} of {len(AccountList) * len(RegionList)})",
                     end="\r",
                 )
             except Exception as my_Error:
@@ -162,7 +161,7 @@ if __name__ == "__main__":
         lAccountsAndRegions.append((StacksFound[i]["Account"], StacksFound[i]["Region"]))
     print(ERASE_LINE)
     print(
-        f"{Fore.RED}Looked through {len(StacksFound)} Stacks across {len(AccountList)} accounts across {len(RegionList)} regions{Fore.RESET}"
+        f"[red]Looked through {len(StacksFound)} Stacks across {len(AccountList)} accounts across {len(RegionList)} regions"
     )
     print()
     if args.loglevel < 21:  # INFO level
@@ -198,7 +197,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/requirements.txt

@@ -1,7 +1,6 @@
 boto3>=1.26.84
 botocore>=1.29.84
 colorama>=0.4.6
-prettytable>=3.6.0
 simplejson>=3.18.3
 urllib3>=1.26.14
 randominfo>=2.0.2

runbooks/inventory/rich_inventory_display.py

@@ -21,9 +21,9 @@ from datetime import datetime
 from typing import Any, Dict, List, Optional
 
 from rich import box
-from rich.console import Console
 from rich.panel import Panel
-from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn
+from rich.progress import BarColumn, SpinnerColumn, TaskProgressColumn, TextColumn
+from runbooks.common.rich_utils import Progress
 from rich.table import Table
 from rich.text import Text
 from rich.tree import Tree

runbooks/inventory/run_on_multi_accounts.py

@@ -7,14 +7,12 @@ 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 rich.console import Console
+from runbooks.common.rich_utils import console
 from rich.panel import Panel
 
-# Initialize Rich console
-console = Console()
+# Initialize Rich console with test mode support
+from runbooks.common.rich_utils import console
 
-init()
 __version__ = "2023.05.04"
 
 parser = CommonArguments()

runbooks/inventory/unified_validation_engine.py

@@ -38,12 +38,13 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 import boto3
-from rich.console import Console
-from rich.progress import BarColumn, Progress, SpinnerColumn, TaskProgressColumn, TextColumn, TimeElapsedColumn
+from rich.progress import BarColumn, SpinnerColumn, TaskProgressColumn, TextColumn, TimeElapsedColumn
+from runbooks.common.rich_utils import Progress
 from rich.table import Table
 
 from ..common.profile_utils import get_profile_for_operation, resolve_profile_for_operation_silent
 from ..common.rich_utils import (
+    Console,
     console as rich_console,
     create_table,
     format_cost,

runbooks/inventory/verify_ec2_security_groups.py

@@ -1042,7 +1042,7 @@ def display_results(
 ):
     from datetime import datetime
 
-    from colorama import Fore, init
+    from runbooks.common.rich_utils import console
 
     init()
     """

runbooks/inventory/vpc_analyzer.py

@@ -34,9 +34,9 @@ import asyncio
 
 import boto3
 from botocore.exceptions import ClientError
-from rich.console import Console
 from rich.panel import Panel
-from rich.progress import Progress, SpinnerColumn, TextColumn
+from rich.progress import SpinnerColumn, TextColumn
+from runbooks.common.rich_utils import Progress
 from rich.table import Table
 from rich.tree import Tree
 
@@ -44,6 +44,7 @@ from runbooks.common.profile_utils import create_operational_session
 from runbooks.common.cross_account_manager import EnhancedCrossAccountManager, CrossAccountSession
 from runbooks.common.organizations_client import OrganizationAccount, get_unified_organizations_client
 from runbooks.common.rich_utils import (
+    Console,
     console,
     print_header,
     print_success,

runbooks/inventory/vpc_dependency_analyzer.py

@@ -43,10 +43,10 @@ from typing import Any, Dict, List, Optional, Set, Tuple
 import hashlib
 import boto3
 from botocore.exceptions import ClientError
-from rich.console import Console
 from rich.table import Table
 from rich.panel import Panel
-from rich.progress import Progress, SpinnerColumn, TextColumn
+from rich.progress import SpinnerColumn, TextColumn
+from runbooks.common.rich_utils import Progress
 
 from runbooks.common.rich_utils import (
     console,

runbooks/validation/terraform_drift_detector.py

@@ -242,6 +242,15 @@ class TerraformDriftDetector:
                 drift_analysis, runbooks_resources, terraform_resources
             )
 
+            # CRITICAL: Enforce quality gate - block on <99.5% accuracy
+            accuracy_score = mcp_validation_result.get("accuracy_score", 0.0)
+            if accuracy_score < 99.5:
+                error_msg = f"MCP validation accuracy {accuracy_score:.1f}% below required threshold 99.5%"
+                console.print(f"[red]❌ MCP Validation FAILED: {accuracy_score:.1f}% < 99.5% required[/red]")
+                raise ValueError(error_msg)
+
+            console.print(f"[green]✅ MCP Validation PASSED: {accuracy_score:.1f}% ≥ 99.5% required[/green]")
+
             # Calculate metrics
             total_tf = len(terraform_resources)
             total_rb = len(runbooks_resources)
@@ -272,7 +281,7 @@ class TerraformDriftDetector:
                 total_monthly_cost_impact=cost_metrics.get("total_monthly_cost", 0.0),
                 high_cost_drifts=cost_metrics.get("high_cost_drifts", 0),
                 cost_correlation_coverage=cost_metrics.get("correlation_coverage", 0.0),
-                mcp_validation_accuracy=mcp_validation_result.get("accuracy_score", 95.0),
+                mcp_validation_accuracy=mcp_validation_result.get("accuracy_score", 0.0),  # Pessimistic default
                 # Analysis details
                 drift_analysis=drift_analysis,
                 missing_from_terraform=[
@@ -808,24 +817,26 @@ class TerraformDriftDetector:
                 "validation_timestamp": datetime.now().isoformat(),
             }
 
-            # Run MCP validation (simulated high accuracy)
+            # Run MCP validation with real accuracy calculation
             validation_result = await self.mcp_integrator.validate_vpc_operations(validation_data)
 
-            # Calculate drift-specific accuracy metrics
-            accuracy_score = 99.2  # High accuracy for direct comparison
+            # Use real accuracy from MCP validation (no hardcoded values)
+            accuracy_score = validation_result.accuracy_score  # Real calculated accuracy
 
             return {
                 "success": validation_result.success,
                 "accuracy_score": accuracy_score,
                 "validation_timestamp": datetime.now().isoformat(),
                 "resources_validated": len(drift_analysis),
+                "total_validations": validation_result.performance_metrics.get("total_validations", 0),
+                "successful_validations": validation_result.performance_metrics.get("successful_validations", 0),
             }
 
         except Exception as e:
             print_warning(f"MCP validation error: {str(e)[:50]}...")
             return {
                 "success": False,
-                "accuracy_score": 95.0,  # Default accuracy
+                "accuracy_score": 0.0,  # Honest failure - no optimistic defaults
                 "validation_timestamp": datetime.now().isoformat(),
                 "error": str(e),
             }

{runbooks-1.1.5.dist-info → runbooks-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runbooks
-Version: 1.1.5
+Version: 1.1.7
 Summary: CloudOps Automation Toolkit with Enhanced Cloud Foundations Assessment for DevOps and SRE teams.
 Author-email: Maintainers <nnthanh101@gmail.com>
 License-Expression: Apache-2.0
@@ -31,19 +31,18 @@ Requires-Dist: pydantic>=2.10.0
 Requires-Dist: jinja2>=3.1.4
 Requires-Dist: werkzeug>=3.1.0
 Requires-Dist: markdown>=3.7.0
-Requires-Dist: prettytable>=3.16.0
 Requires-Dist: simplejson>=3.20.1
 Requires-Dist: python-dateutil>=2.9.0
 Requires-Dist: loguru>=0.7.3
-Requires-Dist: tqdm>=4.67.1
 Requires-Dist: graphviz>=0.20.1
-Requires-Dist: rich>=14.0.0
+Requires-Dist: rich>=14.1.0
 Requires-Dist: reportlab>=3.6.1
 Requires-Dist: requests>=2.32.0
 Requires-Dist: packaging>=21.0
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: jmespath>=1.0.1
 Requires-Dist: urllib3<1.27,>=1.26.18
+Requires-Dist: openapi-spec-validator>=0.7.2
 Requires-Dist: mcp>=1.12.3
 Requires-Dist: pandas>=2.3.1
 Requires-Dist: ipython>=9.4.0