runbooks 0.9.7__py3-none-any.whl → 0.9.8__py3-none-any.whl

runbooks/main.py

@@ -5850,8 +5850,8 @@ def _parse_profiles_parameter(profiles_tuple):
 )
 @click.option(
     "--scenario", 
-    type=click.Choice(["workspaces", "snapshots", "commvault", "nat-gateway", "elastic-ip", "ebs"], case_sensitive=False),
-    help="Business scenario analysis: workspaces (FinOps-24: $13,020 savings), snapshots (FinOps-23: $119,700 savings), commvault (FinOps-25: investigation), nat-gateway (FinOps-26: $8K-$12K potential), elastic-ip (FinOps-EIP: $3.65/month direct savings), ebs (FinOps-EBS: 15-20% storage optimization)"
+    type=click.Choice(["workspaces", "snapshots", "commvault", "nat-gateway", "elastic-ip", "ebs", "vpc-cleanup"], case_sensitive=False),
+    help="Business scenario analysis: workspaces (FinOps-24: $13,020 savings), snapshots (FinOps-23: $119,700 savings), commvault (FinOps-25: investigation), nat-gateway (FinOps-26: $8K-$12K potential), elastic-ip (FinOps-EIP: $3.65/month direct savings), ebs (FinOps-EBS: 15-20% storage optimization), vpc-cleanup (AWSO-05: $5,869.20 VPC cleanup savings)"
 )
 @click.pass_context
 def finops(
@@ -5891,13 +5891,14 @@ def finops(
     Comprehensive cost analysis supporting both UnblendedCost (technical) 
     and AmortizedCost (financial) perspectives for enterprise reporting.
 
-    BUSINESS SCENARIOS ($132,720+ proven savings):
+    BUSINESS SCENARIOS ($138,589+ proven savings):
         runbooks finops --scenario workspaces    # FinOps-24: WorkSpaces cleanup ($13,020 annual)
         runbooks finops --scenario snapshots     # FinOps-23: RDS snapshots ($119,700 annual)
         runbooks finops --scenario commvault     # FinOps-25: EC2 investigation framework
         runbooks finops --scenario nat-gateway   # FinOps-26: NAT Gateway optimization ($8K-$12K potential)
         runbooks finops --scenario elastic-ip    # FinOps-EIP: Elastic IP cleanup ($3.65/month per EIP)
         runbooks finops --scenario ebs           # FinOps-EBS: Storage optimization (15-20% cost reduction)
+        runbooks finops --scenario vpc-cleanup   # AWSO-05: VPC cleanup ($5,869.20 annual savings)
 
     GENERAL ANALYTICS:
         runbooks finops --audit --csv --report-name audit_report
@@ -5923,10 +5924,12 @@ def finops(
             import asyncio
             
             # Initialize CloudOps cost optimizer with enterprise patterns
-            execution_mode = ExecutionMode.ANALYSIS if dry_run else ExecutionMode.EXECUTION
+            execution_mode = ExecutionMode.DRY_RUN if dry_run else ExecutionMode.EXECUTE
+            # Ensure profile is a string, not a tuple
+            profile_str = profile[0] if isinstance(profile, (tuple, list)) and profile else profile or "default"
             cost_optimizer = CostOptimizer(
-                profile=primary_profile or "default",
-                region=region or "us-east-1", 
+                profile=profile_str,
+                dry_run=dry_run,
                 execution_mode=execution_mode
             )
             
@@ -6004,8 +6007,9 @@ def finops(
                 # Use dedicated NAT Gateway optimizer for specialized analysis
                 from runbooks.finops.nat_gateway_optimizer import NATGatewayOptimizer
                 
+                profile_str = profile[0] if isinstance(profile, (tuple, list)) and profile else profile or "default"
                 nat_optimizer = NATGatewayOptimizer(
-                    profile_name=primary_profile or "default",
+                    profile_name=profile_str,
                     regions=regions or ["us-east-1", "us-west-2", "eu-west-1"]
                 )
                 
@@ -6038,8 +6042,9 @@ def finops(
                 # Use dedicated Elastic IP optimizer for specialized analysis
                 from runbooks.finops.elastic_ip_optimizer import ElasticIPOptimizer
                 
+                profile_str = profile[0] if isinstance(profile, (tuple, list)) and profile else profile or "default"
                 eip_optimizer = ElasticIPOptimizer(
-                    profile_name=primary_profile or "default",
+                    profile_name=profile_str,
                     regions=regions or ["us-east-1", "us-west-2", "eu-west-1", "us-east-2"]
                 )
                 
@@ -6074,8 +6079,9 @@ def finops(
                 # Use dedicated EBS optimizer for specialized analysis
                 from runbooks.finops.ebs_optimizer import EBSOptimizer
                 
+                profile_str = profile[0] if isinstance(profile, (tuple, list)) and profile else profile or "default"
                 ebs_optimizer = EBSOptimizer(
-                    profile_name=primary_profile or "default",
+                    profile_name=profile_str,
                     regions=regions or ["us-east-1", "us-west-2", "eu-west-1"]
                 )
                 
@@ -6111,6 +6117,61 @@ def finops(
                     }
                 }
             
+            elif scenario.lower() == "vpc-cleanup":
+                print_info("AWSO-05: VPC Cleanup cost optimization ($5,869.20 annual savings)")
+                print_info("🚀 Enterprise three-bucket strategy with dependency validation")
+                
+                # Use dedicated VPC Cleanup optimizer for AWSO-05 analysis
+                from runbooks.finops.vpc_cleanup_optimizer import VPCCleanupOptimizer
+                
+                profile_str = profile[0] if isinstance(profile, (tuple, list)) and profile else profile or "default"
+                vpc_optimizer = VPCCleanupOptimizer(
+                    profile=profile_str
+                )
+                
+                vpc_result = vpc_optimizer.analyze_vpc_cleanup_opportunities()
+                
+                # Convert to legacy format for backward compatibility
+                results = {
+                    "scenario": "AWSO-05", 
+                    "business_case": "VPC Cleanup Cost Optimization",
+                    "annual_savings": vpc_result.total_annual_savings,
+                    "monthly_savings": vpc_result.total_annual_savings / 12,
+                    "total_vpcs_analyzed": vpc_result.total_vpcs_analyzed,
+                    "bucket_1_internal": len(vpc_result.bucket_1_internal),
+                    "bucket_2_external": len(vpc_result.bucket_2_external),
+                    "bucket_3_control": len(vpc_result.bucket_3_control),
+                    "cleanup_ready_vpcs": len([v for v in vpc_result.cleanup_candidates if v.cleanup_recommendation == "ready"]),
+                    "investigation_vpcs": len([v for v in vpc_result.cleanup_candidates if v.cleanup_recommendation == "investigate"]),
+                    "manual_review_vpcs": len([v for v in vpc_result.cleanup_candidates if v.cleanup_recommendation == "manual_review"]),
+                    "mcp_validation_accuracy": vpc_result.mcp_validation_accuracy,
+                    "evidence_hash": vpc_result.evidence_hash,
+                    "analysis_timestamp": vpc_result.analysis_timestamp.isoformat(),
+                    "success": True,
+                    "risk_level": "GRADUATED",  # Three-bucket graduated risk approach
+                    "safety_assessment": vpc_result.safety_assessment,
+                    "three_bucket_breakdown": {
+                        "internal_data_plane": {
+                            "count": len(vpc_result.bucket_1_internal),
+                            "annual_savings": sum(v.annual_savings for v in vpc_result.bucket_1_internal),
+                            "risk_level": "LOW",
+                            "status": "Ready for deletion"
+                        },
+                        "external_interconnects": {
+                            "count": len(vpc_result.bucket_2_external),
+                            "annual_savings": sum(v.annual_savings for v in vpc_result.bucket_2_external),
+                            "risk_level": "MEDIUM",
+                            "status": "Dependency analysis required"
+                        },
+                        "control_plane": {
+                            "count": len(vpc_result.bucket_3_control),
+                            "annual_savings": sum(v.annual_savings for v in vpc_result.bucket_3_control),
+                            "risk_level": "HIGH",
+                            "status": "Security enhancement focus"
+                        }
+                    }
+                }
+            
             # Handle output file if report_name specified
             if report_name:
                 import json

runbooks/operate/vpc_operations.py

@@ -116,7 +116,13 @@ class RichConsoleWrapper:
         return print_warning(message)
     
     def print_header(self, title, subtitle=None):
-        return print_header(title, subtitle)
+        """Print header with Rich CLI standards - convert subtitle to version parameter."""
+        if subtitle:
+            # Convert subtitle to version format for Rich CLI compatibility
+            version_text = subtitle if len(subtitle) <= 10 else subtitle[:10] + "..."
+            return print_header(title, version_text)
+        else:
+            return print_header(title)
 
 
 @dataclass

runbooks/vpc/__init__.py

@@ -22,6 +22,9 @@ from .heatmap_engine import NetworkingCostHeatMapEngine
 from .manager_interface import BusinessRecommendation, ManagerDashboardConfig, VPCManagerInterface
 from .networking_wrapper import VPCNetworkingWrapper
 from .rich_formatters import display_cost_table, display_heatmap, display_optimization_recommendations
+from .vpc_cleanup_integration import VPCCleanupFramework, VPCCleanupCandidate, VPCCleanupRisk, VPCCleanupPhase
+from .cleanup_wrapper import VPCCleanupCLI, analyze_cleanup_candidates, validate_cleanup_safety, generate_business_report
+from .runbooks_adapter import RunbooksAdapter
 
 __all__ = [
     "VPCNetworkingWrapper",
@@ -33,6 +36,15 @@ __all__ = [
     "display_cost_table",
     "display_heatmap",
     "display_optimization_recommendations",
+    "VPCCleanupFramework",
+    "VPCCleanupCandidate",
+    "VPCCleanupRisk",
+    "VPCCleanupPhase",
+    "VPCCleanupCLI",
+    "analyze_cleanup_candidates",
+    "validate_cleanup_safety",
+    "generate_business_report",
+    "RunbooksAdapter",
 ]
 
 # Import centralized version from main runbooks package