runbooks 1.1.6__py3-none-any.whl → 1.1.7__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.5"
+__version__ = "1.1.7"
 
 # Fallback for legacy importlib.metadata usage during transition
 try:

runbooks/cli/commands/finops.py

@@ -14,8 +14,14 @@ import click
 # DRY Pattern Manager - eliminates duplication across CLI modules
 from runbooks.common.patterns import get_console, get_error_handlers, get_click_group_creator, get_common_decorators
 
-# Import common utilities and decorators
-from runbooks.common.decorators import common_aws_options
+# Import unified CLI decorators (v1.1.7 standardization)
+from runbooks.common.cli_decorators import (
+    common_aws_options,
+    common_output_options,
+    common_multi_account_options,
+    common_filter_options,
+    mcp_validation_option
+)
 
 # Single console instance shared across all modules (DRY principle)
 console = get_console()
@@ -47,9 +53,13 @@ def create_finops_group():
     """
 
     @click.group(invoke_without_command=True)
+    @common_filter_options
+    @common_multi_account_options
+    @common_output_options
     @common_aws_options
     @click.pass_context
-    def finops(ctx, profile, region, dry_run):
+    def finops(ctx, profile, region, dry_run, output_format, output_dir, export,
+               all_profiles, profiles, regions, all_regions, tags, accounts):
         """
         Financial operations and cost optimization for AWS resources.
 
@@ -64,13 +74,27 @@ def create_finops_group():
 
         Examples:
             runbooks finops dashboard --profile billing-profile
-            runbooks finops analyze --service ec2 --timeframe monthly
+            runbooks finops dashboard --all-profiles --timeframe monthly
+            runbooks finops dashboard --regions us-east-1 us-west-2
             runbooks finops export --format pdf --output-dir ./reports
         """
         # Ensure context object exists
         if ctx.obj is None:
             ctx.obj = {}
-        ctx.obj.update({"profile": profile, "region": region, "dry_run": dry_run})
+        ctx.obj.update({
+            "profile": profile,
+            "region": region,
+            "dry_run": dry_run,
+            "output_format": output_format,
+            "output_dir": output_dir,
+            "export": export,
+            "all_profiles": all_profiles,
+            "profiles": profiles,
+            "regions": regions,
+            "all_regions": all_regions,
+            "tags": tags,
+            "accounts": accounts
+        })
 
         if ctx.invoked_subcommand is None:
             click.echo(ctx.get_help())

runbooks/cli/commands/inventory.py

@@ -12,8 +12,14 @@ import click
 import os
 import sys
 
-# Import common utilities and decorators
-from runbooks.common.decorators import common_aws_options, common_output_options, common_filter_options
+# Import unified CLI decorators (v1.1.7 standardization)
+from runbooks.common.cli_decorators import (
+    common_aws_options,
+    common_output_options,
+    common_multi_account_options,
+    common_filter_options,
+    mcp_validation_option
+)
 
 # Test Mode Support: Disable Rich Console in test environments to prevent I/O conflicts
 # Issue: Rich Console writes to StringIO buffer that Click CliRunner closes, causing ValueError
@@ -60,11 +66,13 @@ def create_inventory_group():
     """
 
     @click.group(invoke_without_command=True)
-    @common_aws_options
-    @common_output_options
     @common_filter_options
+    @common_multi_account_options
+    @common_output_options
+    @common_aws_options
     @click.pass_context
-    def inventory(ctx, profile, region, dry_run, output_format, output_file, tags, accounts, regions):
+    def inventory(ctx, profile, region, dry_run, output_format, output_dir, export,
+                  all_profiles, profiles, regions, all_regions, tags, accounts):
         """
         Universal AWS resource discovery and inventory - works with ANY AWS environment.
 
@@ -95,10 +103,14 @@ def create_inventory_group():
                 "region": region,
                 "dry_run": dry_run,
                 "output_format": output_format,
-                "output_file": output_file,
+                "output_dir": output_dir,
+                "export": export,
+                "all_profiles": all_profiles,
+                "profiles": profiles,
+                "regions": regions,
+                "all_regions": all_regions,
                 "tags": tags,
                 "accounts": accounts,
-                "regions": regions,
             }
         )
 

runbooks/common/cli_decorators.py

@@ -193,3 +193,64 @@ def all_standard_options(f: Callable) -> Callable:
         return f(*args, **kwargs)
 
     return wrapper
+
+
+def common_multi_account_options(f: Callable) -> Callable:
+    """
+    Multi-account and multi-region AWS options for enterprise operations.
+
+    Provides:
+    - --all-profiles: Process all configured AWS profiles (multi-account)
+    - --profiles: [LEGACY] Specific profiles (use --all-profiles for all)
+    - --regions: Specific AWS regions (space-separated)
+    - --all-regions: Process all enabled AWS regions
+
+    Note: --profile is provided by common_aws_options decorator
+
+    Usage:
+        @common_multi_account_options
+        @common_aws_options
+        @click.command()
+        def my_command(profile, all_profiles, profiles, regions, all_regions, **kwargs):
+            # Multi-account command logic
+    """
+
+    @click.option('--all-profiles', is_flag=True, default=False,
+                  help='Process all configured AWS profiles (multi-account)')
+    @click.option('--profiles', type=str, multiple=True,
+                  help='[LEGACY] Specific profiles (use --all-profiles for all)')
+    @click.option('--regions', type=str, multiple=True,
+                  help='Specific AWS regions (space-separated)')
+    @click.option('--all-regions', is_flag=True, default=False,
+                  help='Process all enabled AWS regions')
+    @wraps(f)
+    def wrapper(*args, **kwargs):
+        return f(*args, **kwargs)
+
+    return wrapper
+
+
+def common_filter_options(f: Callable) -> Callable:
+    """
+    Common filtering options for resource discovery.
+
+    Provides:
+    - --tags: Filter by tags (key=value format)
+    - --accounts: Filter by specific account IDs
+
+    Usage:
+        @common_filter_options
+        @click.command()
+        def my_command(tags, accounts, **kwargs):
+            # Filtering logic
+    """
+
+    @click.option('--tags', type=str, multiple=True,
+                  help='Filter by tags (key=value format)')
+    @click.option('--accounts', type=str, multiple=True,
+                  help='Filter by specific account IDs')
+    @wraps(f)
+    def wrapper(*args, **kwargs):
+        return f(*args, **kwargs)
+
+    return wrapper

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runbooks
-Version: 1.1.6
+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

{runbooks-1.1.6.dist-info → runbooks-1.1.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 conftest.py,sha256=HTnQMw9wxefkvX5q4yG8EUH2qVLJBnC9QCt3UCltw7I,586
-runbooks/__init__.py,sha256=XIJ23w169HRg3H6-fTWnNQJxPYeEgT0lvBm5BWquER8,6260
+runbooks/__init__.py,sha256=bY1oPPtiOXi-yHA1UJeOr6gwQqcxSZPl0FWSsgNU2qE,6260
 runbooks/__init__.py.backup,sha256=RN_n1T2it_7bBXlA4dl8GCWAUz8XBpp5FGjGbq8uQaI,4983
 runbooks/__init___optimized.py,sha256=ao5SdjsJ0T-ZsOFtEqOeEM4hnI8kgIs-8laJZsHEjp0,4011
 runbooks/__main__.py,sha256=0hTPUA9KkLm_H_COqaIpNzXvC4Lv5b_XYYBV6fUFDrM,241
@@ -84,8 +84,8 @@ runbooks/cfat/tests/test_weight_configuration.ts,sha256=1IfMR0NCvONdprsDv0l24chd
 runbooks/cli/__init__.py,sha256=9yb8r0P9ipQzaZZPD-NDPeQRtDVWqG7_v_2ru5wPdPU,446
 runbooks/cli/registry.py,sha256=1hCARcKay2B6atgYSC7X3xGjfXC65_Ep1hJb6buJRJI,3441
 runbooks/cli/commands/cfat.py,sha256=xL1WG4DmQTOwLL4I8cmnEy5Z82D91iHj0vB7FokTXbg,11041
-runbooks/cli/commands/finops.py,sha256=xkfbZgZqfqYJX5l_KMmyTFtxMWvdf6iRYrW9l5N3F4o,55451
-runbooks/cli/commands/inventory.py,sha256=68sqYvjES-EzmFvVz9CbEX1TeJDsKJ4ojHmsgW8qGo8,13708
+runbooks/cli/commands/finops.py,sha256=7orBGnTMbnTf_btnBHdtlaeggcQGU3u6c0f-bT6LChQ,56231
+runbooks/cli/commands/inventory.py,sha256=qL3q8Cw4C6vMA9Bx25BQBShsAIIFCKO4zLrDHPRAAQs,14061
 runbooks/cli/commands/operate.py,sha256=kkSDws1U4SC-5ers6nanBQbsxC6F0xY9--hicr33a3c,10235
 runbooks/cli/commands/security.py,sha256=Yv3JFqfT4WNulOGtYvhhaxwZtTUOxPwCGDbaCax_KYc,10307
 runbooks/cli/commands/validation.py,sha256=Vc8y7TcRkrFtdsZZoDkjZ2taS5UuH1e2hSGpRD9Q2_4,38530
@@ -108,7 +108,7 @@ runbooks/common/aws_pricing_api.py,sha256=jTpcGiZHIEBxo2hmrfQtTNNHgWSkPQelQcm-Yy
 runbooks/common/aws_profile_manager.py,sha256=jJX2FqssFAcmLf6zRaLGShnSJpN1XK07w3nudUmNYXY,11865
 runbooks/common/aws_utils.py,sha256=voptyeaD7E5W82vW_4yY6M5NICGF3MM7hMz3s00waqM,13190
 runbooks/common/business_logic.py,sha256=D949mmH_OsMYRTuUcHvcNAaXF35KBB7D6QRQkV5q4A8,20629
-runbooks/common/cli_decorators.py,sha256=3RdWVSNyduCLsMweOIFewY6JghqKKr5wuxudJGqVNsw,6302
+runbooks/common/cli_decorators.py,sha256=F8ejBBuD5fDZZStDe0cTjqqGQd4x0WC4Tm-4u6lZh18,8365
 runbooks/common/comprehensive_cost_explorer_integration.py,sha256=DEIjPW3X4N9B_DCmit3RvGZEgsDtxjDVgQ_eS6TR5ag,43488
 runbooks/common/context_logger.py,sha256=is72Mvw2QgIp-z9FXNSL-pceDhEsSklH_7QbNmGR6lQ,14757
 runbooks/common/cross_account_manager.py,sha256=6-b8wfhN4MN8khjBglrqH-LvyzMmrF3VGHpRTJtLZCc,24576
@@ -481,9 +481,9 @@ runbooks/vpc/tests/test_cli_integration.py,sha256=OvsSNd9gFlkzdyDf8tUZGES93TTZR6
 runbooks/vpc/tests/test_config.py,sha256=GIX7cFnj7xUxxrYX49mV9hYmx60Dcd_Bu-cpb90oXdE,17484
 runbooks/vpc/tests/test_cost_engine.py,sha256=dR7HTRKDrTduRg5Mr-T7MbP47D67jbKggZ7gyBirfK4,20941
 runbooks/vpc/tests/test_networking_wrapper.py,sha256=gmxnVzQJ-7rTsghzNLmIM-QZo9GUGyIhHqE1g8gkEkw,20623
-runbooks-1.1.6.dist-info/licenses/LICENSE,sha256=WAQUYGIkLJh6CPrlZgr0IsbRODa0EZ6fboBXGjfWggs,11375
-runbooks-1.1.6.dist-info/METADATA,sha256=oKpQUak9Mq32RQwKEAtKQH8mrUTjlKNMOag-khDzYp4,12970
-runbooks-1.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-runbooks-1.1.6.dist-info/entry_points.txt,sha256=WahHUYcgE2syXEc0MkoUdctLMxs0zjBWi_vWb5dRK8M,295
-runbooks-1.1.6.dist-info/top_level.txt,sha256=A0zTBjuF7THC6vnJU7StN7ihtUoh31lZSfwyWpWP2YE,18
-runbooks-1.1.6.dist-info/RECORD,,
+runbooks-1.1.7.dist-info/licenses/LICENSE,sha256=WAQUYGIkLJh6CPrlZgr0IsbRODa0EZ6fboBXGjfWggs,11375
+runbooks-1.1.7.dist-info/METADATA,sha256=r_S6VEAZfwYo59N_AulPX7l0_BkAyhodAZ80LMvhXPs,12970
+runbooks-1.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+runbooks-1.1.7.dist-info/entry_points.txt,sha256=WahHUYcgE2syXEc0MkoUdctLMxs0zjBWi_vWb5dRK8M,295
+runbooks-1.1.7.dist-info/top_level.txt,sha256=A0zTBjuF7THC6vnJU7StN7ihtUoh31lZSfwyWpWP2YE,18
+runbooks-1.1.7.dist-info/RECORD,,