runbooks 1.1.9__py3-none-any.whl → 1.1.10__py3-none-any.whl

runbooks/__init__.py

@@ -61,7 +61,7 @@ s3_ops = S3Operations()
 
 # Centralized Version Management - Single Source of Truth
 # All modules MUST import __version__ from this location
-__version__ = "1.1.9"
+__version__ = "1.1.10"
 
 # Fallback for legacy importlib.metadata usage during transition
 try:

runbooks/__init___optimized.py

@@ -10,7 +10,8 @@ This should reduce startup time from 5.6s to <0.5s for basic operations.
 """
 
 # Centralized Version Management - Single Source of Truth
-__version__ = "1.0.0"
+# This file is optimized variant - must sync with main __init__.py
+__version__ = "1.1.9"
 
 # Fallback for legacy importlib.metadata usage during transition
 try:

runbooks/_platform/__init__.py

@@ -6,7 +6,7 @@ and the FinOps notebook interfaces, enabling business-friendly access
 to technical cost optimization capabilities.
 """
 
-__version__ = "1.0.0"
+from runbooks import __version__
 
 from .core.runbooks_wrapper import RunbooksWrapper
 from .finops.unit_economics import UnitEconomicsCalculator

runbooks/cfat/cli.py

@@ -14,7 +14,6 @@ import click
 from loguru import logger
 
 from runbooks.cfat import __version__ as cfat_version
-from runbooks.main import assess as main_assess
 
 
 @click.group(invoke_without_command=True)
@@ -56,9 +55,11 @@ def main(ctx, debug, profile, region):
         click.echo(ctx.get_help())
 
 
-# Import and register the assess command from main CLI
+# Import and register the assess command from modular commands
 # This reuses the enhanced assess command with all its features
-main.add_command(main_assess, name="assess")
+from runbooks.cli.commands.cfat import create_cfat_group
+cfat_group = create_cfat_group()
+main.add_command(cfat_group.commands['assess'], name="assess")
 
 
 @main.command()

runbooks/cfat/cloud_foundations_assessment.py

@@ -41,8 +41,7 @@ from runbooks.common.rich_utils import (
     create_panel,
 )
 from runbooks.common.profile_utils import get_profile_for_operation
-
-__version__ = "1.0.0"
+from runbooks import __version__
 
 
 @dataclass

runbooks/cfat/tests/test_cli.py

@@ -14,7 +14,10 @@ import pytest
 from click.testing import CliRunner
 
 from runbooks.cfat.tests import create_sample_assessment_report
-from runbooks.main import assess, cfat, main
+# Updated import for slim main.py architecture (DRYCommandRegistry pattern)
+# Old: from runbooks.main import assess, cfat, main
+# New: Import main CLI entry point only - commands are dynamically registered
+from runbooks.main import main
 
 
 @pytest.mark.cli

runbooks/cli/commands/finops.py

@@ -96,13 +96,33 @@ def create_finops_group():
             "accounts": accounts
         })
 
+        # Auto-execute dashboard when no subcommand provided (eliminates "only logs" pattern)
         if ctx.invoked_subcommand is None:
-            click.echo(ctx.get_help())
+            # Invoke dashboard with default parameters
+            ctx.invoke(dashboard,
+                      profile=profile,
+                      all_profiles=all_profiles,
+                      timeframe='monthly',
+                      services=None,
+                      accounts=None,
+                      validate=False,
+                      validate_mcp=False,
+                      mcp_validate=False,
+                      csv=False,
+                      markdown=False,
+                      pdf=False,
+                      json=False,
+                      export_format=None,
+                      unblended=False,
+                      amortized=False,
+                      dual_metrics=False,
+                      dry_run=dry_run)
 
     @finops.command()
     @click.option("--profile", help="AWS profile to use for authentication")
     @click.option(
-        "--all-profiles", help="Enable multi-account Landing Zone analysis using specified management profile"
+        "--all-profile", type=str, default=None,
+        help="Management profile for Organizations API auto-discovery (MANAGEMENT_PROFILE, BILLING_PROFILE, or CENTRALISED_OPS_PROFILE)"
     )
     @click.option(
         "--timeframe",
@@ -132,7 +152,7 @@ def create_finops_group():
     def dashboard(
         ctx,
         profile,
-        all_profiles,
+        all_profile,
         timeframe,
         services,
         accounts,
@@ -163,33 +183,61 @@ def create_finops_group():
             # Single account analysis
             runbooks finops dashboard --profile BILLING_PROFILE --timeframe monthly --validate
 
-            # Multi-account Landing Zone analysis
-            runbooks finops dashboard --all-profiles MANAGEMENT_PROFILE --mcp-validate
+            # Multi-account Landing Zone analysis (Organizations auto-discovery)
+            runbooks finops dashboard --all-profile MANAGEMENT_PROFILE --mcp-validate
 
-            # Service-specific analysis across all accounts
-            runbooks finops dashboard --all-profiles MANAGEMENT_PROFILE --services ec2,s3
+            # Service-specific analysis across all organization accounts
+            runbooks finops dashboard --all-profile MANAGEMENT_PROFILE --services ec2,s3
 
             # Export multi-account analysis
-            runbooks finops dashboard --all-profiles MANAGEMENT_PROFILE --export-format pdf
+            runbooks finops dashboard --all-profile MANAGEMENT_PROFILE --export-format pdf
         """
-        # Handle multi-account Landing Zone analysis
-        if all_profiles:
+        # Handle multi-account Landing Zone analysis with Organizations API discovery
+        if all_profile:
             try:
                 from runbooks.finops.dashboard_runner import MultiAccountDashboard, DashboardRouter
                 from runbooks.common.rich_utils import print_header, print_success, print_error, print_info
+                from runbooks.inventory.inventory_modules import get_org_accounts_from_profiles, get_profiles
                 import argparse
 
-                print_header("Multi-Account Landing Zone Dashboard", all_profiles)
-                console.print("[cyan]🏢 Activating enterprise multi-account consolidated billing analysis[/cyan]")
-                console.print(f"[dim]Management Profile: {all_profiles}[/dim]")
-                console.print(f"[dim]Analysis Scope: Organization-wide with Landing Zone support[/dim]\n")
+                print_header("Multi-Account Landing Zone Dashboard", all_profile)
+                console.print("[cyan]🏢 Discovering AWS Organization accounts via Organizations API...[/cyan]")
+
+                # CORRECTED: Use management profile TEXT parameter for Organizations API access
+                try:
+                    # Use management profile specified by user (MANAGEMENT_PROFILE, BILLING_PROFILE, or CENTRALISED_OPS_PROFILE)
+                    mgmt_profile_list = get_profiles(fprofiles=[all_profile])
+                    console.print(f"[dim]Querying Organizations API with profile: {all_profile}[/dim]")
+
+                    org_accounts = get_org_accounts_from_profiles(mgmt_profile_list)
+
+                    # Extract account IDs from discovered organization accounts
+                    discovered_account_ids = []
+                    for acct in org_accounts:
+                        if acct.get("Success") and acct.get("RootAcct") and acct.get("aws_acct"):
+                            # Root account found - extract all child accounts
+                            for child in acct["aws_acct"].ChildAccounts:
+                                discovered_account_ids.append(child["AccountId"])
+
+                    if discovered_account_ids:
+                        console.print(f"[green]✅ Discovered {len(discovered_account_ids)} organization accounts[/green]")
+                        console.print(f"[dim]Analysis Scope: Organization-wide with Landing Zone support[/dim]\n")
+                    else:
+                        console.print(f"[yellow]⚠️  No organization accounts discovered - using single account mode[/yellow]")
+                        console.print(f"[dim]Tip: Ensure {profile} has AWS Organizations permissions[/dim]\n")
+
+                except Exception as org_error:
+                    console.print(f"[yellow]⚠️  Organizations discovery failed: {str(org_error)}[/yellow]")
+                    console.print(f"[dim]Falling back to single account mode[/dim]\n")
+                    discovered_account_ids = []  # Empty list for fallback
 
                 # Create mock args object for multi-dashboard compatibility
                 args = argparse.Namespace()
-                args.profile = all_profiles
+                args.profile = all_profile  # Use management profile for AWS Organizations access
                 args.timeframe = timeframe
                 args.services = services
-                args.accounts = accounts
+                # PHASE 2 ENHANCEMENT: Use Organizations-discovered accounts if available
+                args.accounts = tuple(discovered_account_ids) if discovered_account_ids else accounts
                 args.validate = validate or mcp_validate
                 # CRITICAL FIX: Handle multiple export format flags
                 export_formats = []
@@ -223,6 +271,7 @@ def create_finops_group():
                 args.top_accounts = 50  # Show many accounts for enterprise view
                 args.services_per_account = 3
                 args.time_range = None
+                args.audit = False  # Not audit mode
                 args.tag = None
                 args.regions = None
 
@@ -247,11 +296,11 @@ def create_finops_group():
                 console.print(f"[red]❌ Multi-account dashboard not available: {e}[/red]")
                 console.print("[yellow]💡 Falling back to single-account mode with specified profile[/yellow]")
                 # Fallback to single account with the specified profile
-                resolved_profile = all_profiles
+                resolved_profile = all_profile
             except Exception as e:
                 console.print(f"[red]❌ Multi-account analysis failed: {e}[/red]")
-                console.print("[yellow]💡 Falling back to single-account mode[/yellow]")
-                resolved_profile = all_profiles
+                console.print("[yellow]💡 Fallingback to single-account mode[/yellow]")
+                resolved_profile = all_profile
         else:
             resolved_profile = profile or ctx.obj.get("profile", "default")