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

runbooks/cli/commands/vpc.py

@@ -60,11 +60,33 @@ def create_vpc_group():
     @click.option("--cost-optimization", is_flag=True, help="Include cost optimization analysis")
     @click.option("--topology-analysis", is_flag=True, help="Include network topology analysis")
     @click.option("--security-assessment", is_flag=True, help="Include security configuration review")
-    @click.option("--savings-target", type=click.FloatRange(0.1, 0.8), default=0.3,
-                  help="Target savings percentage for optimization")
+    @click.option(
+        "--savings-target",
+        type=click.FloatRange(0.1, 0.8),
+        default=0.3,
+        help="Target savings percentage for optimization",
+    )
     @click.option("--all", is_flag=True, help="Use all available AWS profiles for multi-account VPC analysis")
+    @click.option(
+        "--config",
+        type=click.Path(exists=True),
+        help="Path to YAML campaign configuration file (config-driven analysis)",
+    )
     @click.pass_context
-    def analyze(ctx, profile, region, dry_run, output_format, output_file, cost_optimization, topology_analysis, security_assessment, savings_target, all):
+    def analyze(
+        ctx,
+        profile,
+        region,
+        dry_run,
+        output_format,
+        output_file,
+        cost_optimization,
+        topology_analysis,
+        security_assessment,
+        savings_target,
+        all,
+        config,
+    ):
         """
         Comprehensive VPC analysis with cost optimization and security assessment with universal profile support.
 
@@ -74,28 +96,53 @@ def create_vpc_group():
         • NAT Gateway and VPC endpoint optimization
         • Multi-account network topology mapping
         • Cross-account VPC analysis with --all flag
+        • Config-driven campaign analysis with --config (NEW)
 
         Examples:
             runbooks vpc analyze --cost-optimization --savings-target 0.25
             runbooks vpc analyze --topology-analysis --security-assessment
             runbooks vpc analyze --export-format pdf --cost-optimization
             runbooks vpc analyze --all --cost-optimization  # Multi-account analysis
+            runbooks vpc analyze --config campaign.yaml --profile billing-profile  # Config-driven campaign
         """
         try:
-            from runbooks.vpc.analyzer import VPCAnalyzer
             from runbooks.common.profile_utils import get_profile_for_operation
             from runbooks.common.rich_utils import handle_output_format
 
             # Use ProfileManager for dynamic profile resolution
             resolved_profile = get_profile_for_operation("operational", profile)
 
+            # NEW: Config-driven campaign analysis
+            if config:
+                from runbooks.vpc import VPCCleanupFramework
+                from runbooks.vpc.cleanup_wrapper import display_config_campaign_results
+
+                cleanup_framework = VPCCleanupFramework(profile=resolved_profile, region=region, safety_mode=True)
+
+                results = cleanup_framework.analyze_from_config(config)
+                display_config_campaign_results(results)
+
+                # Export if requested
+                if output_file:
+                    handle_output_format(
+                        data=results,
+                        output_format=output_format,
+                        output_file=output_file,
+                        title=f"Campaign {results.get('campaign_metadata', {}).get('campaign_id', 'Unknown')} Results",
+                    )
+
+                return results
+
+            # EXISTING: Standard VPC analysis (unchanged)
+            from runbooks.vpc.analyzer import VPCAnalyzer
+
             analyzer = VPCAnalyzer(
                 profile=resolved_profile,
                 region=region,
                 cost_optimization=cost_optimization,
                 topology_analysis=topology_analysis,
                 security_assessment=security_assessment,
-                savings_target=savings_target
+                savings_target=savings_target,
             )
 
             analysis_results = analyzer.run_comprehensive_analysis()
@@ -105,7 +152,7 @@ def create_vpc_group():
                 data=analysis_results,
                 output_format=output_format,
                 output_file=output_file,
-                title="VPC Analysis Results"
+                title="VPC Analysis Results",
             )
 
             return analysis_results
@@ -122,12 +169,23 @@ def create_vpc_group():
     @common_output_options
     @click.option("--analyze", is_flag=True, help="Analyze NAT Gateway usage and costs")
     @click.option("--optimize", is_flag=True, help="Generate optimization recommendations")
-    @click.option("--savings-target", type=click.FloatRange(0.1, 0.8), default=0.3,
-                  help="Target savings percentage")
+    @click.option("--savings-target", type=click.FloatRange(0.1, 0.8), default=0.3, help="Target savings percentage")
     @click.option("--include-alternatives", is_flag=True, help="Include NAT instance alternatives")
     @click.option("--all", is_flag=True, help="Use all available AWS profiles for multi-account NAT Gateway analysis")
     @click.pass_context
-    def nat_gateway_operations(ctx, profile, region, dry_run, output_format, output_file, analyze, optimize, savings_target, include_alternatives, all):
+    def nat_gateway_operations(
+        ctx,
+        profile,
+        region,
+        dry_run,
+        output_format,
+        output_file,
+        analyze,
+        optimize,
+        savings_target,
+        include_alternatives,
+        all,
+    ):
         """
         NAT Gateway cost analysis and optimization recommendations with universal profile support.
 
@@ -158,7 +216,7 @@ def create_vpc_group():
                 analyze=analyze,
                 optimize=optimize,
                 savings_target=savings_target,
-                include_alternatives=include_alternatives
+                include_alternatives=include_alternatives,
             )
 
             optimization_results = optimizer.run_nat_gateway_optimization()
@@ -168,7 +226,7 @@ def create_vpc_group():
                 data=optimization_results,
                 output_format=output_format,
                 output_file=output_file,
-                title="NAT Gateway Optimization Results"
+                title="NAT Gateway Optimization Results",
             )
 
             return optimization_results
@@ -184,12 +242,18 @@ def create_vpc_group():
     @common_aws_options
     @common_output_options
     @click.option("--include-costs", is_flag=True, help="Include cost analysis in topology")
-    @click.option("--detail-level", type=click.Choice(['basic', 'detailed', 'comprehensive']),
-                  default='detailed', help="Topology detail level")
+    @click.option(
+        "--detail-level",
+        type=click.Choice(["basic", "detailed", "comprehensive"]),
+        default="detailed",
+        help="Topology detail level",
+    )
     @click.option("--output-dir", default="./vpc_topology", help="Output directory")
     @click.option("--all", is_flag=True, help="Use all available AWS profiles for multi-account topology generation")
     @click.pass_context
-    def topology(ctx, profile, region, dry_run, output_format, output_file, include_costs, detail_level, output_dir, all):
+    def topology(
+        ctx, profile, region, dry_run, output_format, output_file, include_costs, detail_level, output_dir, all
+    ):
         """
         Generate network topology diagrams with cost correlation and universal profile support.
 
@@ -218,7 +282,7 @@ def create_vpc_group():
                 region=region,
                 include_costs=include_costs,
                 detail_level=detail_level,
-                output_dir=output_dir
+                output_dir=output_dir,
             )
 
             topology_results = topology_generator.generate_network_topology()
@@ -228,7 +292,7 @@ def create_vpc_group():
                 data=topology_results,
                 output_format=output_format,
                 output_file=output_file,
-                title="Network Topology Analysis"
+                title="Network Topology Analysis",
             )
 
             console.print(f"[green]✅ Network topology generated successfully[/green]")
@@ -243,4 +307,4 @@ def create_vpc_group():
             console.print(f"[red]❌ VPC topology generation failed: {e}[/red]")
             raise click.ClickException(str(e))
 
-    return vpc
+    return vpc

runbooks/cli/registry.py

@@ -49,15 +49,27 @@ class DRYCommandRegistry:
         try:
             from .commands import inventory, operate, finops, security, cfat, vpc, validation
 
-            cls._commands.update({
-                'inventory': inventory.create_inventory_group(),
-                'operate': operate.create_operate_group(),
-                'finops': finops.create_finops_group(),
-                'security': security.create_security_group(),
-                'cfat': cfat.create_cfat_group(),
-                'vpc': vpc.create_vpc_group(),
-                'validation': validation.create_validation_group(),
-            })
+            # Core production commands
+            cls._commands.update(
+                {
+                    "inventory": inventory.create_inventory_group(),
+                    "operate": operate.create_operate_group(),
+                    "finops": finops.create_finops_group(),
+                    "security": security.create_security_group(),
+                    "cfat": cfat.create_cfat_group(),
+                    "vpc": vpc.create_vpc_group(),
+                    "validation": validation.create_validation_group(),
+                }
+            )
+
+            # Optional TDD framework - load separately to avoid breaking core CLI
+            try:
+                from runbooks.tdd.cli import tdd_group
+
+                cls._commands["tdd"] = tdd_group
+            except ImportError:
+                # TDD framework not available - continue with core commands
+                pass
 
             cls._loaded = True
 
@@ -92,4 +104,4 @@ class DRYCommandRegistry:
     def reset(cls):
         """Reset registry for testing purposes."""
         cls._commands.clear()
-        cls._loaded = False
+        cls._loaded = False

runbooks/cloudops/__init__.py

@@ -19,7 +19,7 @@ NEW: Business Interface Layer for Notebook Usage
 
 # Core async API classes (for advanced users)
 from .cost_optimizer import CostOptimizer
-from .security_enforcer import SecurityEnforcer  
+from .security_enforcer import SecurityEnforcer
 from .lifecycle_manager import ResourceLifecycleManager
 from .infrastructure_optimizer import InfrastructureOptimizer
 from .monitoring_automation import MonitoringAutomation
@@ -31,16 +31,11 @@ from .interfaces import (
     optimize_unused_resources,
     governance_campaign,
     security_incident_response,
-    optimize_infrastructure
+    optimize_infrastructure,
 )
 
 # Enterprise Notebook Framework (NEW in latest version)
-from .notebook_framework import (
-    NotebookFramework,
-    NotebookMode,
-    AuthenticationStatus,
-    ScenarioMetadata
-)
+from .notebook_framework import NotebookFramework, NotebookMode, AuthenticationStatus, ScenarioMetadata
 
 # Type-safe models
 from .models import (
@@ -48,7 +43,7 @@ from .models import (
     CostOptimizationResult,
     SecurityEnforcementResult,
     BusinessScenario,
-    ResourceImpact
+    ResourceImpact,
 )
 
 # Import centralized version from main runbooks package
@@ -61,29 +56,26 @@ __all__ = [
     "BusinessResultSummary",
     "emergency_cost_response",
     "optimize_unused_resources",
-    "governance_campaign", 
+    "governance_campaign",
     "security_incident_response",
     "optimize_infrastructure",
-    
     # ENTERPRISE NOTEBOOK FRAMEWORK (latest version)
     "NotebookFramework",
-    "NotebookMode", 
+    "NotebookMode",
     "AuthenticationStatus",
     "ScenarioMetadata",
-    
     # ADVANCED: Core API Classes (async operations)
-    "CostOptimizer", 
+    "CostOptimizer",
     "SecurityEnforcer",
-    "ResourceLifecycleManager", 
+    "ResourceLifecycleManager",
     "InfrastructureOptimizer",
     "MonitoringAutomation",
-    
     # Type-Safe Models
     "CloudOpsExecutionResult",
-    "CostOptimizationResult", 
+    "CostOptimizationResult",
     "SecurityEnforcementResult",
     "BusinessScenario",
-    "ResourceImpact"
+    "ResourceImpact",
 ]
 
 # Enterprise Usage Examples - Business Interface Layer
@@ -91,35 +83,36 @@ BUSINESS_SCENARIO_EXAMPLES = {
     "notebook_consolidation": {
         "description": "Enterprise notebook framework for consolidated scenarios (NEW in latest version)",
         "simple_example": "from runbooks.cloudops import NotebookFramework, NotebookMode; framework = NotebookFramework(profile='default', mode=NotebookMode.EXECUTIVE)",
-        "advanced_example": "See notebooks/cloudops/consolidated-cost-optimization.ipynb for comprehensive example"
+        "advanced_example": "See notebooks/cloudops/consolidated-cost-optimization.ipynb for comprehensive example",
     },
     "cost_emergency": {
         "description": "Emergency cost optimization for $10K+ monthly spikes",
         "simple_example": "from runbooks.cloudops import emergency_cost_response; result = emergency_cost_response(profile='billing', cost_spike_threshold=25000)",
-        "advanced_example": "from runbooks.cloudops import CostOptimizer; optimizer = CostOptimizer(); optimizer.optimize_nat_gateways()"
+        "advanced_example": "from runbooks.cloudops import CostOptimizer; optimizer = CostOptimizer(); optimizer.optimize_nat_gateways()",
     },
     "unused_resources": {
         "description": "Find unused AWS resources for immediate cost savings",
         "simple_example": "from runbooks.cloudops import optimize_unused_resources; result = optimize_unused_resources(profile='operations', minimum_cost_threshold=50)",
-        "advanced_example": "from runbooks.cloudops import CostOptimizer; optimizer = CostOptimizer(); optimizer.optimize_idle_ec2_instances()"
+        "advanced_example": "from runbooks.cloudops import CostOptimizer; optimizer = CostOptimizer(); optimizer.optimize_idle_ec2_instances()",
     },
     "security_incident": {
-        "description": "Automated security compliance remediation", 
+        "description": "Automated security compliance remediation",
         "simple_example": "from runbooks.cloudops import security_incident_response; result = security_incident_response(profile='security', incident_type='s3_encryption')",
-        "advanced_example": "from runbooks.cloudops import SecurityEnforcer; enforcer = SecurityEnforcer(); enforcer.enforce_s3_encryption()"
+        "advanced_example": "from runbooks.cloudops import SecurityEnforcer; enforcer = SecurityEnforcer(); enforcer.enforce_s3_encryption()",
     },
     "governance_campaign": {
         "description": "Multi-account governance and cleanup operations",
         "simple_example": "from runbooks.cloudops import governance_campaign; result = governance_campaign(management_profile='org-management', scope='organization')",
-        "advanced_example": "from runbooks.cloudops import ResourceLifecycleManager; manager = ResourceLifecycleManager(); manager.enforce_tagging_standards()"
+        "advanced_example": "from runbooks.cloudops import ResourceLifecycleManager; manager = ResourceLifecycleManager(); manager.enforce_tagging_standards()",
     },
     "infrastructure_optimization": {
         "description": "Infrastructure optimization and performance recovery",
         "simple_example": "from runbooks.cloudops import optimize_infrastructure; result = optimize_infrastructure(profile='operations', cost_reduction_target=25)",
-        "advanced_example": "from runbooks.cloudops import InfrastructureOptimizer; optimizer = InfrastructureOptimizer(); optimizer.optimize_load_balancers()"
-    }
+        "advanced_example": "from runbooks.cloudops import InfrastructureOptimizer; optimizer = InfrastructureOptimizer(); optimizer.optimize_load_balancers()",
+    },
 }
 
+
 def get_business_scenarios():
     """Get available business scenarios with examples."""
-    return BUSINESS_SCENARIO_EXAMPLES
+    return BUSINESS_SCENARIO_EXAMPLES