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

runbooks/inventory/drift_detection_cli.py

@@ -32,20 +32,20 @@ from typing import List, Optional
 from ..common.profile_utils import get_profile_for_operation, validate_profile_access
 from ..common.rich_utils import console, print_error, print_info, print_success
 from .mcp_inventory_validator import (
+
+
+# Terminal control constants
     create_inventory_mcp_validator,
     generate_drift_report,
     validate_inventory_results_with_mcp,
 )
 
 
-@click.group()
-def drift():
-    """Infrastructure drift detection and validation commands."""
-    pass
 
-
-@drift.command("detect")
-@click.option("--profile", help="AWS profile to use (overrides environment variables)")
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
+@click.command()
+@click.option("--profile", "-p", help="AWS profile to use (overrides environment variables)")
 @click.option("--profiles", help="Comma-separated list of AWS profiles for multi-account analysis")
 @click.option(
     "--terraform-dir",
@@ -60,7 +60,7 @@ def drift():
 )
 @click.option("--output-file", help="File path to save drift report (optional)")
 @click.option("--threshold", type=float, default=99.5, help="Accuracy threshold for drift detection (default: 99.5%)")
-def detect_drift(
+def drift(
     profile: Optional[str],
     profiles: Optional[str],
     terraform_dir: str,
@@ -152,66 +152,6 @@ def detect_drift(
         raise click.Abort()
 
 
-@drift.command("report")
-@click.option("--profile", help="AWS profile to use for single-account analysis")
-@click.option(
-    "--terraform-dir",
-    default="/Volumes/Working/1xOps/CloudOps-Runbooks/terraform-aws",
-    help="Path to terraform configuration directory",
-)
-@click.option(
-    "--format",
-    "report_format",
-    type=click.Choice(["json", "csv", "markdown"]),
-    default="json",
-    help="Report output format",
-)
-@click.option("--output", "output_file", required=True, help="Output file path for drift report")
-def generate_report(profile: Optional[str], terraform_dir: str, report_format: str, output_file: str):
-    """
-    Generate comprehensive infrastructure drift report.
-
-    Creates detailed drift analysis report with actionable recommendations
-    for infrastructure as code management and compliance.
-    """
-    try:
-        # Use default profile if none specified
-        if not profile:
-            profile = get_profile_for_operation("operational", None)
-
-        print_info(f"Generating drift report for profile: {profile}")
-
-        # Validate profile
-        if not validate_profile_access(profile, "drift-reporting"):
-            print_error(f"Profile '{profile}' validation failed")
-            return
-
-        # Create mock inventory for demonstration
-        mock_inventory = _create_mock_inventory_data([profile])
-
-        # Generate comprehensive drift report
-        drift_report = generate_drift_report([profile], mock_inventory, terraform_dir)
-
-        # Export report
-        _export_drift_report(drift_report, output_file, report_format)
-
-        print_success(f"Drift report generated: {output_file}")
-
-        # Display summary
-        accounts_analyzed = drift_report.get("accounts_analyzed", 0)
-        overall_accuracy = drift_report.get("overall_accuracy", 0)
-        drift_detected = drift_report.get("drift_detected", False)
-
-        console.print(f"[dim]📊 Analysis Summary:[/]")
-        console.print(f"[dim]  Accounts analyzed: {accounts_analyzed}[/]")
-        console.print(f"[dim]  Overall accuracy: {overall_accuracy:.1f}%[/]")
-        console.print(f"[dim]  Drift detected: {'Yes' if drift_detected else 'No'}[/]")
-
-    except Exception as e:
-        print_error(f"Report generation failed: {str(e)}")
-        raise click.Abort()
-
-
 def _create_mock_inventory_data(profiles: List[str]) -> dict:
     """Create mock inventory data for demonstration purposes."""
     mock_data = {}

runbooks/inventory/find_cfn_drift_detection.py

@@ -66,13 +66,13 @@ Future Enhancements:
 
 import logging
 
-import Inventory_Modules
-from account_class import aws_acct_access
-from ArgumentsClass import CommonArguments
+from runbooks.inventory import inventory_modules as Inventory_Modules
+from runbooks.inventory.account_class import aws_acct_access
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
 from runbooks.common.rich_utils import console
+from runbooks import __version__
 
-__version__ = "2023.05.04"
 
 # Configure comprehensive argument parsing for CloudFormation drift detection operations
 parser = CommonArguments()
@@ -174,6 +174,16 @@ if aws_acct.AccountType == "Root":
                 "AccountStatus": aws_acct.AccountStatus,  # Account operational status
             }
         ]
+else:
+    # Non-root account: Initialize ChildAccounts with single account entry
+    ChildAccounts = [
+        {
+            "MgmtAccount": aws_acct.acct_number,  # Management account identifier
+            "AccountId": aws_acct.acct_number,  # Account number for single account scope
+            "AccountEmail": aws_acct.MgmtEmail if hasattr(aws_acct, 'MgmtEmail') else "N/A",  # Management email
+            "AccountStatus": aws_acct.AccountStatus if hasattr(aws_acct, 'AccountStatus') else "ACTIVE",  # Account status
+        }
+    ]
 
 # Initialize drift detection operation tracking and regional scope configuration
 NumStacksFound = 0  # Counter for tracking total stacks processed for drift detection

runbooks/inventory/find_cfn_orphaned_stacks.py

@@ -71,13 +71,13 @@ import sys
 from os.path import split
 from time import time
 
-from account_class import aws_acct_access
-from ArgumentsClass import CommonArguments
+from runbooks.inventory.account_class import aws_acct_access
+from runbooks.inventory.ArgumentsClass import CommonArguments
 
 # import simplejson as json
 from botocore.exceptions import ClientError
 from runbooks.common.rich_utils import console
-from Inventory_Modules import (
+from runbooks.inventory.inventory_modules import (
     display_results,
     find_stack_instances3,
     find_stacks2,
@@ -86,8 +86,11 @@ from Inventory_Modules import (
     get_regions3,
     print_timings,
 )
+from runbooks import __version__
+
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
 
-__version__ = "2024.05.18"
 begin_time = time()
 
 
@@ -650,7 +653,6 @@ if __name__ == "__main__":
     logging.getLogger("s3transfer").setLevel(logging.CRITICAL)
     logging.getLogger("urllib3").setLevel(logging.CRITICAL)
 
-    ERASE_LINE = "\x1b[2K"
     begin_time = time()
 
     # Setup credentials and regions (filtered by what they wanted to check)

runbooks/inventory/find_cfn_stackset_drift.py

@@ -66,15 +66,15 @@ from datetime import datetime
 from os.path import split
 from time import time
 
-import Inventory_Modules
-from account_class import aws_acct_access
-from ArgumentsClass import CommonArguments
+from runbooks.inventory import inventory_modules as Inventory_Modules
+from runbooks.inventory.account_class import aws_acct_access
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
 from runbooks.common.rich_utils import console
-from Inventory_Modules import display_results
+from runbooks.inventory.inventory_modules import display_results
+from runbooks import __version__
 
 # Initialize colorama for cross-platform colored terminal output
-__version__ = "2024.03.06"
 begin_time = time()  # Script execution timing for performance monitoring
 sleep_interval = 5  # Default wait interval for drift detection operations
 

runbooks/inventory/find_ec2_security_groups.py

@@ -60,19 +60,22 @@ from queue import Queue
 from threading import Thread
 from time import time
 
-from ArgumentsClass import CommonArguments
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
 from runbooks.common.rich_utils import console
-from Inventory_Modules import (
+from runbooks.inventory.inventory_modules import (
     display_results,
     find_references_to_security_groups2,
     find_security_groups2,
     get_all_credentials,
 )
+from runbooks import __version__
+
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
 # Migrated to Rich.Progress - see rich_utils.py for enterprise UX standards
 # from tqdm.auto import tqdm
 
-__version__ = "2024.09.24"
 begin_time = time()
 
 

runbooks/inventory/find_landingzone_versions.py

@@ -73,14 +73,14 @@ License: MIT
 import logging
 
 import boto3
-import Inventory_Modules
-from ArgumentsClass import CommonArguments
+from runbooks.inventory import inventory_modules as Inventory_Modules
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError, CredentialRetrievalError, InvalidConfigError
-# colorama removed - migrated to Rich
+from runbooks.common.rich_utils import console
+from runbooks import __version__
 
-# Initialize colorama for cross-platform colored terminal output
+# colorama removed - migrated to Rich
 
-__version__ = "2023.05.31"
 
 # Configure comprehensive CLI argument parsing for Landing Zone discovery operations
 parser = CommonArguments()

runbooks/inventory/find_vpc_flow_logs.py

@@ -88,16 +88,16 @@ from time import sleep, time
 from typing import Any, List
 
 import boto3
-import Inventory_Modules
-from account_class import aws_acct_access
-from ArgumentsClass import CommonArguments
+from runbooks.inventory import inventory_modules as Inventory_Modules
+from runbooks.inventory.account_class import aws_acct_access
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.config import Config
 from botocore.exceptions import ClientError
 from runbooks.common.rich_utils import console
-from Inventory_Modules import RemoveCoreAccounts, display_results, get_all_credentials, get_regions3
+from runbooks.inventory.inventory_modules import RemoveCoreAccounts, display_results, get_all_credentials, get_regions3
+from runbooks import __version__
 
 # Initialize colorama for cross-platform colored terminal output
-__version__ = "2024.03.10"
 begin_time = time()  # Script execution timing for performance monitoring
 sleep_interval = 5  # Default wait interval for CloudWatch Logs query processing
 

runbooks/inventory/inventory.sh

@@ -66,7 +66,7 @@ fi
 
 # Test execution settings
 MAX_CONCURRENT_TESTS=5
-TEST_TIMEOUT=300  # 5 minutes per test
+TEST_TIMEOUT=540  # 540 seconds per test (68 accounts × regions: list_cfn_stacks/list_vpcs timeout at 489s, need 540s with 10% headroom)
 RETRY_ATTEMPTS=2
 
 # Logging and output configuration
@@ -77,6 +77,9 @@ ERROR_ANALYSIS_FILE="error_analysis_$(date +%Y%m%d_%H%M%S).txt"
 # Create test output directory
 mkdir -p "$TEST_LOG_DIR"
 
+# Initialize results temp file for IPC (counter persistence across subshells)
+: > "$TEST_LOG_DIR/results.tmp"
+
 # Test result tracking (using arrays compatible with older bash versions)
 TEST_RESULTS_KEYS=()
 TEST_RESULTS_VALUES=()
@@ -205,11 +208,11 @@ function log_test_result() {
     # Determine test status
     if [ "$exit_code" -eq 0 ]; then
         status="PASSED"
-        TESTS_PASSED=$((TESTS_PASSED + 1))
+        echo "PASS:$script_name" >> "$TEST_LOG_DIR/results.tmp"
     else
         status="FAILED"
-        TESTS_FAILED=$((TESTS_FAILED + 1))
-        
+        echo "FAIL:$script_name" >> "$TEST_LOG_DIR/results.tmp"
+
         # Perform error analysis
         analyze_test_errors "$script_name" "$log_file"
     fi
@@ -339,9 +342,9 @@ function execute_test() {
     echo "========================================" >> "$output_file"
     
     # Execute test with timeout (macOS compatible)
-    # Set Python path to include inventory directory for local module imports
+    # Use module execution pattern for package imports (python -m runbooks.inventory.script)
     # Start the command in background and track its PID
-    (cd "$INVENTORY_DIR" && PYTHONPATH=".:$(pwd):$PYTHONPATH" uv run python "$script_name" $test_parameters) >> "$output_file" 2>&1 &
+    (cd "$INVENTORY_DIR" && uv run python -m runbooks.inventory.$(basename "$script_name" .py) $test_parameters) >> "$output_file" 2>&1 &
     test_cmd_pid=$!
     
     # Wait for process completion or timeout
@@ -393,7 +396,8 @@ scripts_to_not_test="Inventory_Modules.py cfn_recover_stack_ids.py cfn_lockdown_
 account_class.py org_check_alz_readiness.py controltower_check_account_readiness.py s3_delete_objects.py cfn_enable_drift_detection.py \
 org_describe_landingzone_versions.py cfn_move_stack_instances.py multi_account_runner.py iam_update_roles_cross_account.py ec2_vpc_utils.py \
 cfn_recover_stack_ids.py setup.py aws_decorators.py cfn_list_stack_set_operation_results.py __pycache__ tests \
-update_aws_actions.py update_iam_roles_cross_accounts.py run_on_multi_accounts.py"
+update_aws_actions.py update_iam_roles_cross_accounts.py run_on_multi_accounts.py vpc_architecture_validator.py vpc_dependency_analyzer.py mcp_vpc_validator.py \
+check_controltower_readiness.py"
 
 # Scripts that require interactive responses (cannot be tested autonomously)
 # These scripts need manual input and are skipped in automated testing
@@ -588,6 +592,8 @@ echo "==========================================================================
     echo "\nTEST EXECUTION SUMMARY"
     echo "======================"
     echo "Total Tests Executed: ${#arrScripts[@]}"
+    TESTS_PASSED=$(grep -c "^PASS:" "$TEST_LOG_DIR/results.tmp" 2>/dev/null || echo 0)
+    TESTS_FAILED=$(grep -c "^FAIL:" "$TEST_LOG_DIR/results.tmp" 2>/dev/null || echo 0)
     echo "Tests Passed: $TESTS_PASSED"
     echo "Tests Failed: $TESTS_FAILED"
     echo "Tests Skipped: $TESTS_SKIPPED"
@@ -649,10 +655,17 @@ echo "==========================================================================
     
 } | tee -a "$TEST_LOG_DIR/$SUMMARY_FILE"
 
+# Read final counts from temp file for exit code logic
+TESTS_PASSED=$(grep -c "^PASS:" "$TEST_LOG_DIR/results.tmp" 2>/dev/null || echo 0)
+TESTS_FAILED=$(grep -c "^FAIL:" "$TEST_LOG_DIR/results.tmp" 2>/dev/null || echo 0)
+
 # Set exit code based on test results
 if [[ $TESTS_FAILED -gt 0 ]]; then
     echo "\nWARNING: $TESTS_FAILED tests failed. Review logs for details."
     exit 1
+elif [[ $TESTS_PASSED -eq 0 && $TESTS_FAILED -eq 0 ]]; then
+    echo "\nERROR: No tests executed or counter error detected."
+    exit 1
 else
     echo "\nSUCCESS: All tests passed successfully."
     exit 0

runbooks/inventory/inventory_mcp_cli.py

@@ -24,6 +24,10 @@ from ..common.rich_utils import console, print_error, print_info, print_success,
 from .mcp_inventory_validator import create_inventory_mcp_validator
 
 
+
+
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
 @click.command()
 @click.option("--profile", help="AWS profile name (takes precedence over environment variables)")
 @click.option(

runbooks/inventory/inventory_modules.py

@@ -1,6 +1,6 @@
 import logging
+from runbooks import __version__
 
-__version__ = "2025.04.03"
 
 """
 ** Why are some functions "function" vs. "function2" vs. "function3"?**
@@ -457,8 +457,6 @@ def print_timings(fTiming: bool = False, fverbose: int = 50, fbegin_time=None, f
 
     from runbooks.common.rich_utils import console
 
-    init()
-
     if fTiming and fverbose < 50 and fbegin_time is not None:
         print(f"[green]{fmessage}\nThis script has taken {time() - fbegin_time:.6f} seconds so far")
 
@@ -2652,8 +2650,12 @@ def find_account_policies2(
     from botocore.exceptions import ClientError
 
     # Handle both profile-based and credential-based authentication
+    # Priority: Profile > ParentProfile > AccessKeyId > default credential chain
     if "Profile" in ocredentials and ocredentials["Profile"]:
         session_iam = boto3.Session(profile_name=ocredentials["Profile"], region_name=fRegion)
+    elif "ParentProfile" in ocredentials and ocredentials["ParentProfile"]:
+        # Use ParentProfile from get_all_credentials output
+        session_iam = boto3.Session(profile_name=ocredentials["ParentProfile"], region_name=fRegion)
     elif "AccessKeyId" in ocredentials and ocredentials["AccessKeyId"]:
         session_iam = boto3.Session(
             aws_access_key_id=ocredentials["AccessKeyId"],
@@ -5080,8 +5082,12 @@ def find_ssm_parameters2(ocredentials):
     region = ocredentials["Region"]
     logging.info(f"Finding ssm parameters for account {ocredentials['AccountNumber']} in Region {region}")
     # Handle both profile-based and credential-based authentication
+    # Priority: Profile > ParentProfile > AccessKeyId > default credential chain
     if "Profile" in ocredentials and ocredentials["Profile"]:
         session_ssm = boto3.Session(profile_name=ocredentials["Profile"], region_name=region)
+    elif "ParentProfile" in ocredentials and ocredentials["ParentProfile"]:
+        # Use ParentProfile from get_all_credentials output
+        session_ssm = boto3.Session(profile_name=ocredentials["ParentProfile"], region_name=region)
     elif "AccessKeyId" in ocredentials and ocredentials["AccessKeyId"]:
         session_ssm = boto3.Session(
             aws_access_key_id=ocredentials["AccessKeyId"],
@@ -5345,7 +5351,6 @@ def display_results(
 
     from runbooks.common.rich_utils import console
 
-    init()
     """
 	Note that this function simply formats the output of the data within the list provided
 	@param: results_list: This should be a list of dictionaries, matching to the fields in fdisplay_dict
@@ -5760,8 +5765,6 @@ def get_all_credentials(
 
     # from time import time
     from runbooks.common.rich_utils import console
-
-    init()
     # ERASE_LINE = '\x1b[2K'
     # begin_time = time()
     print(f"[green]Timing is enabled") if fTiming else None
@@ -5853,7 +5856,6 @@ def get_credentials_for_accounts_in_org(
     from runbooks.common.rich_utils import console
     from runbooks.common.rich_utils import create_progress_bar
 
-    init()
     begin_time = time()
 
     class AssembleCredentials(Thread):

runbooks/inventory/list_cfn_stacks.py

@@ -2,12 +2,19 @@
 """
 AWS CloudFormation Stack Inventory Collection
 
-A comprehensive CloudFormation stack discovery and management tool for multi-account 
-AWS Organizations. Provides detailed stack inventory with advanced filtering capabilities 
+A comprehensive CloudFormation stack discovery and management tool for multi-account
+AWS Organizations. Provides detailed stack inventory with advanced filtering capabilities
 and optional stack deletion functionality.
 
 **AWS API Mapping**: `cloudformation.describe_stacks()`, `cloudformation.list_stacks()`
 
+.. TODO v1.1.11: Performance optimization for large-scale CloudFormation stack discovery
+   - Current: Timeouts at 540s for large AWS Organizations with 100+ accounts
+   - Root Cause: Sequential API calls with pagination bottlenecks
+   - Improvement: Implement concurrent pagination (40-80% speedup expected)
+   - Target: Complete discovery in <180s for 100+ accounts across 16 regions
+   - Reference: FinOps proven pattern (docs/development/finops-performance-optimization.md)
+
 Features:
     - Multi-account CloudFormation stack discovery
     - Advanced status filtering (CREATE_COMPLETE, UPDATE_FAILED, etc.)
@@ -63,15 +70,19 @@ from os.path import split
 from pprint import pprint
 from time import time
 
-import Inventory_Modules
-from account_class import aws_acct_access
-from ArgumentsClass import CommonArguments
+from runbooks.inventory import inventory_modules as Inventory_Modules
+from runbooks.inventory.account_class import aws_acct_access
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
 from runbooks.common.rich_utils import console
-from Inventory_Modules import display_results, get_all_credentials
+from runbooks.inventory.inventory_modules import display_results, get_all_credentials
+from runbooks import __version__
+
+
 
 
-__version__ = "2024.05.31"
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
 
 ###########################
 
@@ -529,7 +540,6 @@ if __name__ == "__main__":
     begin_time = time()
 
     ##########################
-    ERASE_LINE = "\x1b[2K"
 
     print()
     # Setup the aws_acct object

runbooks/inventory/list_cfn_stackset_operation_results.py

@@ -75,10 +75,10 @@ Output:
 import logging
 import re
 
-from ArgumentsClass import CommonArguments
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from runbooks.common.rich_utils import console
+from runbooks import __version__
 
-__version__ = "2024.06.20"
 
 # Configure CLI argument parsing for StackSet results analysis and correlation
 parser = CommonArguments()

runbooks/inventory/list_cfn_stackset_operations.py

@@ -73,17 +73,21 @@ from queue import Queue
 from threading import Thread
 from time import time
 
-import Inventory_Modules
-from account_class import aws_acct_access
-from ArgumentsClass import CommonArguments
+from runbooks.inventory import inventory_modules as Inventory_Modules
+from runbooks.inventory.account_class import aws_acct_access
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
 from runbooks.common.rich_utils import console
-from Inventory_Modules import display_results, find_stacksets3, get_regions3
+from runbooks.inventory.inventory_modules import display_results, find_stacksets3, get_regions3
+from runbooks import __version__
+
 # Migrated to Rich.Progress - see rich_utils.py for enterprise UX standards
 # from tqdm.auto import tqdm
 
 
-__version__ = "2024.05.18"
+
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
 begin_time = time()
 DefaultMaxWorkerThreads = 5
 
@@ -679,21 +683,29 @@ def find_last_operations(faws_acct: aws_acct_access, fStackSetNames: list):
         )
 
         for stacksetname in fStackSetNames:
-            # Retrieve most recent operation for the current StackSet
-            StackSetOps = StackSetOps_client.list_stack_set_operations(
-                StackSetName=stacksetname, MaxResults=1, CallAs="SELF"
-            )["Summaries"]
-
-            # Extract and aggregate operation metadata for analysis
-            AllStackSetOps.append(
-                {
-                    "StackSetName": stacksetname,  # StackSet identifier for correlation
-                    "Operation": StackSetOps[0]["Action"],  # Operation type for lifecycle tracking
-                    "LatestStatus": StackSetOps[0]["Status"],  # Current operation status
-                    "LatestDate": StackSetOps[0]["EndTimestamp"],  # Completion timestamp
-                    "Details": StackSetOps[0]["StatusDetails"]["FailedStackInstancesCount"],  # Failure count for analysis
-                }
-            )
+            try:
+                # Retrieve most recent operation for the current StackSet
+                StackSetOps = StackSetOps_client.list_stack_set_operations(
+                    StackSetName=stacksetname, MaxResults=1, CallAs="SELF"
+                )["Summaries"]
+
+                # Extract and aggregate operation metadata for analysis
+                if StackSetOps:  # Only process if operations exist
+                    AllStackSetOps.append(
+                        {
+                            "StackSetName": stacksetname,  # StackSet identifier for correlation
+                            "Operation": StackSetOps[0]["Action"],  # Operation type for lifecycle tracking
+                            "LatestStatus": StackSetOps[0]["Status"],  # Current operation status
+                            "LatestDate": StackSetOps[0]["EndTimestamp"],  # Completion timestamp
+                            "Details": StackSetOps[0]["StatusDetails"]["FailedStackInstancesCount"],  # Failure count for analysis
+                        }
+                    )
+            except StackSetOps_client.exceptions.StackSetNotFoundException:
+                logging.warning(f"StackSet {stacksetname} not found or inaccessible - skipping")
+                continue  # Skip this StackSet, continue with others
+            except ClientError as e:
+                logging.error(f"Error querying StackSet {stacksetname}: {e}")
+                continue
 
             # Update progress after processing each StackSet
             progress.update(task, advance=1)

runbooks/inventory/list_cfn_stacksets.py

@@ -86,10 +86,10 @@ import sys
 from os.path import split
 from time import time
 
-from account_class import aws_acct_access
-from ArgumentsClass import CommonArguments
+from runbooks.inventory.account_class import aws_acct_access
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from runbooks.common.rich_utils import console
-from Inventory_Modules import (
+from runbooks.inventory.inventory_modules import (
     RemoveCoreAccounts,
     display_results,
     find_stack_instances2,
@@ -97,9 +97,12 @@ from Inventory_Modules import (
     get_credentials_for_accounts_in_org,
     get_regions3,
 )
+from runbooks import __version__
+
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
 
 
-__version__ = "2024.06.20"
 begin_time = time()
 
 #####################

runbooks/inventory/list_config_recorders_delivery_channels.py

@@ -90,15 +90,15 @@ from queue import Queue
 from threading import Thread
 from time import time
 
-import Inventory_Modules
-from ArgumentsClass import CommonArguments
+from runbooks.inventory import inventory_modules as Inventory_Modules
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
 from runbooks.common.rich_utils import console
-from Inventory_Modules import del_config_recorder_or_delivery_channel2, display_results, get_all_credentials
+from runbooks.inventory.inventory_modules import del_config_recorder_or_delivery_channel2, display_results, get_all_credentials
+from runbooks import __version__
 # Migrated to Rich.Progress - see rich_utils.py for enterprise UX standards
 # from tqdm.auto import tqdm
 
-__version__ = "2024.05.31"
 
 
 ##################

runbooks/inventory/list_ds_directories.py

@@ -58,14 +58,14 @@ import logging
 import sys
 from time import time
 
-from ArgumentsClass import CommonArguments
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
 from runbooks.common.rich_utils import console
-from Inventory_Modules import display_results, find_directories2, get_all_credentials
+from runbooks.inventory.inventory_modules import display_results, find_directories2, get_all_credentials
+from runbooks import __version__
 # Migrated to Rich.Progress - see rich_utils.py for enterprise UX standards
 # from tqdm.auto import tqdm
 
-__version__ = "2024.05.31"
 
 
 def parse_args(f_arguments):

runbooks/inventory/list_ec2_availability_zones.py

@@ -66,11 +66,15 @@ import logging
 import sys
 from time import time
 
-from ArgumentsClass import CommonArguments
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from runbooks.common.rich_utils import console
-from Inventory_Modules import display_results, get_all_credentials, get_region_azs2
+from runbooks.inventory.inventory_modules import display_results, get_all_credentials, get_region_azs2
+from runbooks import __version__
 
-__version__ = "2024.03.06"
+
+
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
 begin_time = time()