runbooks 1.0.3__py3-none-any.whl → 1.1.0__py3-none-any.whl

runbooks/main.py

@@ -104,7 +104,18 @@ from runbooks.common.rich_utils import console, create_table, print_banner, prin
 from runbooks.config import load_config, save_config
 from runbooks.inventory.core.collector import InventoryCollector
 from runbooks.utils import setup_logging, setup_enhanced_logging
-from runbooks.finops.business_case_config import get_business_case_config, format_business_achievement
+# PERFORMANCE FIX: Lazy load business case config to avoid MCP initialization
+# from runbooks.finops.business_case_config import get_business_case_config, format_business_achievement
+
+def lazy_get_business_case_config():
+    """Lazy load business case config only when needed."""
+    from runbooks.finops.business_case_config import get_business_case_config
+    return get_business_case_config
+
+def lazy_format_business_achievement():
+    """Lazy load business achievement formatter only when needed."""
+    from runbooks.finops.business_case_config import format_business_achievement
+    return format_business_achievement
 
 console = Console()
 
@@ -6093,7 +6104,7 @@ def comprehensive_analysis(profile, region, dry_run, all_scenarios, output_dir):
         console.print(f"\n[blue]📊 Scenario 3: Commvault EC2 Investigation (FinOps-25)[/blue]")
         ctx.invoke(commvault_ec2,
                   profile=profile, region=region, dry_run=dry_run,
-                  account="637423383469", investigate_utilization=True,
+                  account=get_account_id_for_context(profile), investigate_utilization=True,
                   output_file=f"{output_dir}/commvault_ec2_analysis.csv")
         
         # Summary report
@@ -6110,7 +6121,7 @@ def comprehensive_analysis(profile, region, dry_run, all_scenarios, output_dir):
         )
         
         # Use dynamic configuration for summary table
-        config = get_business_case_config()
+        config = lazy_get_business_case_config()()
         workspaces_scenario = config.get_scenario('workspaces')
         rds_scenario = config.get_scenario('rds-snapshots')
         backup_scenario = config.get_scenario('backup-investigation')
@@ -6198,43 +6209,22 @@ def _parse_profiles_parameter(profiles_tuple):
 @click.option(
     "--export-markdown", "--markdown", is_flag=True, help="Generate Rich-styled markdown export with 10-column format"
 )
-@click.option(
-    "--profile-display-length",
-    type=int,
-    help="Maximum characters for profile name display (optional, no truncation if not specified)",
-)
-@click.option(
-    "--service-name-length",
-    type=int,
-    help="Maximum characters for service name display (optional, no truncation if not specified)",
-)
-@click.option(
-    "--max-services-text",
-    type=int,
-    help="Maximum number of services in text summaries (optional, no limit if not specified)",
-)
-@click.option(
-    "--high-cost-threshold", type=float, default=5000, help="High cost threshold for highlighting (default: 5000)"
-)
-@click.option(
-    "--medium-cost-threshold", type=float, default=1000, help="Medium cost threshold for highlighting (default: 1000)"
-)
 @click.option(
     "--validate", is_flag=True, help="Enable MCP cross-validation with real-time AWS API comparison for enterprise accuracy verification"
 )
 @click.option(
-    "--tech-focus", is_flag=True, help="Focus on technical analysis (UnblendedCost) for DevOps and SRE teams"
+    "--unblended", is_flag=True, help="AWS Cost Explorer UnblendedCost analysis for technical teams (DevOps/SRE focus)"
 )
 @click.option(
-    "--financial-focus", is_flag=True, help="Focus on financial reporting (AmortizedCost) for Finance and Executive teams"
+    "--amortized", is_flag=True, help="AWS Cost Explorer AmortizedCost analysis for financial teams (Finance/Executive focus)"
 )
 @click.option(
-    "--dual-metrics", is_flag=True, default=True, help="Show both technical and financial metrics (default behavior)"
+    "--dual-metrics", is_flag=True, default=True, help="Show both UnblendedCost and AmortizedCost metrics (comprehensive analysis, default)"
 )
 @click.option(
-    "--scenario", 
-    type=click.Choice(["workspaces", "snapshots", "commvault", "nat-gateway", "elastic-ip", "ebs", "vpc-cleanup"], case_sensitive=False),
-    help="Business scenario analysis with dynamic configuration - use 'runbooks finops --help-scenarios' for current scenario details"
+    "--scenario",
+    type=str,
+    help="Business scenario: workspaces, snapshots, commvault, nat-gateway, elastic-ip, ebs, vpc-cleanup"
 )
 @click.pass_context
 def finops(
@@ -6257,41 +6247,41 @@ def finops(
     json,
     pdf,
     export_markdown,
-    profile_display_length,
-    service_name_length,
-    max_services_text,
-    high_cost_threshold,
-    medium_cost_threshold,
     validate,
-    tech_focus,
-    financial_focus,
+    unblended,
+    amortized,
     dual_metrics,
     scenario,
 ):
     """
-    AWS FinOps - Cost and usage analytics with dual-metric system.
-
-    Comprehensive cost analysis supporting both UnblendedCost (technical) 
-    and AmortizedCost (financial) perspectives for enterprise reporting.
-
-    BUSINESS SCENARIOS (Dynamic Configuration):
-        runbooks finops --scenario workspaces    # WorkSpaces Resource Optimization
-        runbooks finops --scenario snapshots     # RDS Storage Optimization  
-        runbooks finops --scenario commvault     # Backup Infrastructure Analysis
-        runbooks finops --scenario nat-gateway   # Network Gateway Optimization
-        runbooks finops --scenario elastic-ip    # IP Address Resource Management
-        runbooks finops --scenario ebs           # Storage Volume Optimization
-        runbooks finops --scenario vpc-cleanup   # Network Infrastructure Cleanup
-        
-    Use --help-scenarios to see current configured targets and savings ranges.
-
-    GENERAL ANALYTICS:
-        runbooks finops --audit --csv --report-name audit_report
-        runbooks finops --trend --json --report-name cost_trend  
-        runbooks finops --time-range 30 --pdf --report-name monthly_costs
-        runbooks finops --tech-focus --profile my-profile  # Technical teams
-        runbooks finops --financial-focus --pdf --report-name exec_report  # Finance teams
-        runbooks finops --dual-metrics --csv --json  # Comprehensive analysis (default)
+    AWS FinOps - Cost and usage analytics.
+
+    📊 DEFAULT DASHBOARD:
+        runbooks finops --profile BILLING_PROFILE
+
+    🎯 BUSINESS SCENARIOS:
+        runbooks finops --scenario workspaces --profile PROFILE    # WorkSpaces optimization
+        runbooks finops --scenario snapshots --profile PROFILE     # RDS snapshots cleanup
+        runbooks finops --scenario commvault --profile PROFILE     # Backup analysis
+        runbooks finops --scenario nat-gateway --profile PROFILE   # NAT Gateway optimization
+        runbooks finops --scenario elastic-ip --profile PROFILE    # Elastic IP management
+        runbooks finops --scenario ebs --profile PROFILE           # EBS optimization
+        runbooks finops --scenario vpc-cleanup --profile PROFILE   # VPC cleanup
+
+    📊 ANALYTICS MODES:
+        runbooks finops --audit --profile PROFILE          # Cost anomaly analysis
+        runbooks finops --trend --profile PROFILE          # 6-month trend analysis
+        runbooks finops --unblended --profile PROFILE      # Technical cost view (DevOps/SRE)
+        runbooks finops --amortized --profile PROFILE      # Financial cost view (Finance)
+
+    📄 EXPORTS:
+        runbooks finops --csv --json --pdf --profile PROFILE       # Multiple formats
+        runbooks finops --report-name monthly --pdf --profile PROFILE
+
+    🌍 MULTIPLE PROFILES/REGIONS:
+        runbooks finops --profiles PROF1 PROF2 --regions us-east-1 eu-west-1
+
+    ⚠️  STATUS: Some business scenarios may require additional CloudOps dependencies.
     """
 
     # Handle group behavior: if no subcommand invoked, execute main functionality
@@ -6302,14 +6292,54 @@ def finops(
         # Subcommand will handle execution
         return
 
+    # Removed broken --help-scenarios logic - use main --help instead
+
     # Business Scenario Dispatch Logic (Strategic Objective #1: Unified CLI)
     if scenario:
-        from runbooks.common.rich_utils import console, print_header, print_success, print_info
+        from runbooks.common.rich_utils import console, print_header, print_success, print_info, print_error
         
+        # PHASE 2 PRIORITY 1: Unlimited Scenario Expansion Framework
+        # Dynamic scenario validation (replaces hardcoded choice list)
+        from runbooks.finops.unlimited_scenarios import get_dynamic_scenario_choices
+        valid_scenarios = get_dynamic_scenario_choices()
+
+        if scenario not in valid_scenarios:
+            print_error(f"Unknown scenario: '{scenario}'")
+            print_info("Available scenarios:")
+            for valid_scenario in valid_scenarios:
+                config = lazy_get_business_case_config()()
+                scenario_obj = config.get_scenario(valid_scenario)
+                if scenario_obj:
+                    print_info(f"  {valid_scenario} - {scenario_obj.display_name} ({scenario_obj.savings_range_display})")
+                else:
+                    print_info(f"  {valid_scenario}")
+            print_info("\nUse 'runbooks finops --help-scenarios' for comprehensive scenario information")
+            return
+
         # Unified scenario dispatcher with enterprise Rich CLI formatting
         print_header("FinOps Business Scenarios", "Manager Priority Cost Optimization")
-        print_info(f"Executing scenario: {scenario.upper()}")
-        
+        print_success(f"✅ Scenario validated: {scenario.upper()}")
+
+        # Display unlimited expansion capability info
+        from runbooks.finops.unlimited_scenarios import discover_scenarios_summary
+        summary = discover_scenarios_summary()
+        if summary["scenario_discovery"]["environment_discovered"] > 0:
+            print_info(f"🚀 Unlimited expansion: {summary['scenario_discovery']['environment_discovered']} environment-discovered scenarios active")
+
+        # Validate and suggest optimal parameters for scenario
+        from runbooks.finops.scenario_cli_integration import validate_and_suggest_parameters
+        cli_params = {
+            'time_range': time_range,
+            'unblended': unblended,
+            'amortized': amortized,
+            'dual_metrics': dual_metrics,
+            'pdf': pdf,
+            'csv': csv,
+            'json': json,
+            'export_markdown': export_markdown
+        }
+        validate_and_suggest_parameters(scenario, cli_params)
+
         try:
             # Import CloudOps cost optimizer for enhanced JIRA scenario integration
             from runbooks.cloudops.cost_optimizer import CostOptimizer
@@ -6327,7 +6357,7 @@ def finops(
             )
             
             if scenario.lower() == "workspaces":
-                config = get_business_case_config()
+                config = lazy_get_business_case_config()()
                 workspaces_scenario = config.get_scenario('workspaces')
                 scenario_info = f"{workspaces_scenario.display_name} ({workspaces_scenario.savings_range_display})" if workspaces_scenario else "WorkSpaces Resource Optimization"
                 print_info(f"{scenario_info}")
@@ -6352,7 +6382,7 @@ def finops(
                 }
                 
             elif scenario.lower() == "snapshots":
-                config = get_business_case_config()
+                config = lazy_get_business_case_config()()
                 rds_scenario = config.get_scenario('rds-snapshots')
                 scenario_info = f"{rds_scenario.display_name} ({rds_scenario.savings_range_display})" if rds_scenario else "RDS Storage Optimization"
                 print_info(f"{scenario_info}")
@@ -6377,15 +6407,17 @@ def finops(
                 }
                 
             elif scenario.lower() == "commvault":
-                config = get_business_case_config()
+                config = lazy_get_business_case_config()()
                 backup_scenario = config.get_scenario('backup-investigation')
                 scenario_info = f"{backup_scenario.display_name}" if backup_scenario else "Backup Infrastructure Analysis"
                 print_info(f"{scenario_info} (Real AWS integration)")
                 print_info("🚀 Enhanced with CloudOps enterprise integration")
                 
                 # Use CloudOps cost optimizer for enterprise-grade investigation
+                # Dynamically resolve account ID from current AWS profile context
+                current_account_id = get_account_id_for_context(profile if profile != "default" else "default")
                 commvault_result = asyncio.run(cost_optimizer.investigate_commvault_ec2(
-                    account_id="637423383469",  # From JIRA specification
+                    account_id=current_account_id,  # Dynamic account resolution
                     dry_run=True  # Always dry-run for investigations
                 ))
                 
@@ -6403,7 +6435,7 @@ def finops(
                 }
                 
             elif scenario.lower() == "nat-gateway":
-                config = get_business_case_config()
+                config = lazy_get_business_case_config()()
                 nat_scenario = config.get_scenario('nat-gateway')
                 scenario_info = f"{nat_scenario.display_name} ({nat_scenario.savings_range_display})" if nat_scenario else "Network Gateway Optimization"
                 print_info(f"{scenario_info}")
@@ -6441,7 +6473,7 @@ def finops(
                 }
                 
             elif scenario.lower() == "elastic-ip":
-                config = get_business_case_config()
+                config = lazy_get_business_case_config()()
                 eip_scenario = config.get_scenario('elastic-ip')
                 scenario_info = f"{eip_scenario.display_name} ({eip_scenario.savings_range_display})" if eip_scenario else "IP Address Resource Management"
                 print_info(f"{scenario_info}")
@@ -6481,7 +6513,7 @@ def finops(
                 }
             
             elif scenario.lower() == "ebs":
-                config = get_business_case_config()
+                config = lazy_get_business_case_config()()
                 ebs_scenario = config.get_scenario('ebs-optimization')
                 scenario_info = f"{ebs_scenario.display_name}" if ebs_scenario else "Storage Volume Optimization (15-20% cost reduction potential)"
                 print_info(f"{scenario_info}")
@@ -6529,7 +6561,7 @@ def finops(
                 }
             
             elif scenario.lower() == "vpc-cleanup":
-                config = get_business_case_config()
+                config = lazy_get_business_case_config()()
                 vpc_scenario = config.get_scenario('vpc-cleanup')
                 scenario_info = f"{vpc_scenario.display_name} ({vpc_scenario.savings_range_display})" if vpc_scenario else "Network Infrastructure Cleanup"
                 print_info(f"{scenario_info}")
@@ -6671,16 +6703,19 @@ def finops(
             report_name = f"finops_multi_format_export"
             click.echo(click.style(f"📝 Auto-generated report name: {report_name}", fg="blue"))
 
-    # Dual-Metric Configuration Logic (Enterprise Enhancement)
+    # AWS Terminology Alignment: Dual-Metric Configuration Logic (Enhanced Enterprise Implementation)
     metric_config = "dual"  # Default comprehensive analysis
-    if tech_focus:
+
+
+    # AWS native parameter processing
+    if unblended:
         metric_config = "technical"
-        click.echo(click.style("🔧 Technical Focus: UnblendedCost analysis for DevOps/SRE teams", fg="bright_blue", bold=True))
-    elif financial_focus:
-        metric_config = "financial" 
-        click.echo(click.style("📊 Financial Focus: AmortizedCost analysis for Finance/Executive teams", fg="bright_green", bold=True))
+        click.echo(click.style("🔧 AWS UnblendedCost Analysis: Technical cost view for DevOps/SRE teams", fg="bright_blue", bold=True))
+    elif amortized:
+        metric_config = "financial"
+        click.echo(click.style("📊 AWS AmortizedCost Analysis: Financial reporting view for Finance/Executive teams", fg="bright_green", bold=True))
     else:
-        click.echo(click.style("💰 Dual-Metrics: Both technical and financial perspectives (default)", fg="bright_cyan", bold=True))
+        click.echo(click.style("💰 Dual-Metrics: Both AWS UnblendedCost and AmortizedCost analysis (comprehensive, default)", fg="bright_cyan", bold=True))
 
     # Report name logic (separate from metric config)
     if report_types and not report_name:
@@ -6746,17 +6781,12 @@ def finops(
         audit=audit,
         export_markdown=export_markdown,  # Add export_markdown parameter
         config_file=None,  # Not exposed in Click interface yet
-        # Display configuration parameters
-        profile_display_length=profile_display_length,
-        service_name_length=service_name_length,
-        max_services_text=max_services_text,
-        high_cost_threshold=high_cost_threshold,
-        medium_cost_threshold=medium_cost_threshold,
+        # Display configuration parameters now managed via API-only config
         validate=validate,
-        # Dual-Metric Configuration (Enterprise Enhancement)
+        # AWS Terminology Alignment: Dual-Metric Configuration (Enterprise Enhancement)
         metric_config=metric_config,
-        tech_focus=tech_focus,
-        financial_focus=financial_focus,
+        unblended=unblended,
+        amortized=amortized,
         dual_metrics=dual_metrics,
     )
     # Route to appropriate dashboard implementation
@@ -6777,8 +6807,11 @@ def finops(
 @click.option("--output", type=click.Choice(["json", "csv", "pdf", "html"]), help="Output format")
 def dashboard(profile, region, dry_run, output):
     """
-    FinOps cost analytics dashboard.
-    
+    FinOps cost analytics dashboard (same as 'runbooks finops' default).
+
+    📊 This command provides identical functionality to running 'runbooks finops' without parameters.
+    Both commands launch the interactive cost dashboard with business scenario overview.
+
     Interactive cost analysis with Rich CLI formatting and enterprise-grade reporting.
     """
     from runbooks.common.rich_utils import console, print_header
@@ -6885,21 +6918,26 @@ def finops_23_rds_snapshots(profile, output_file):
 
 @main.command("finops-25")
 @click.option('--profile', help='AWS profile name')
-@click.option('--account-id', default='637423383469', help='Commvault account ID')
+@click.option('--account-id', help='Account ID for analysis (uses current AWS account if not specified)')
 @click.option('--output-file', help='Save results to file')
 def finops_25_commvault(profile, account_id, output_file):
     """FinOps-25: Commvault EC2 investigation framework (Real AWS integration).
-    
+
     UNIFIED CLI: Use 'runbooks finops --scenario commvault' for new unified interface.
     """
     from runbooks.common.rich_utils import console, print_warning, print_info
-    
+
     print_warning("Legacy command detected! Consider using unified interface:")
     print_info("runbooks finops --scenario commvault --profile [PROFILE]")
-    
+
+    # Resolve account ID dynamically if not provided
+    if not account_id:
+        account_id = get_account_id_for_context(profile or "default")
+        console.print(f"[dim]Using current AWS account: {account_id}[/dim]")
+
     try:
         from runbooks.finops.finops_scenarios import investigate_finops_25_commvault
-        results = investigate_finops_25_commvault(profile)
+        results = investigate_finops_25_commvault(profile, account_id=account_id)
         
         if output_file:
             import json