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

runbooks/inventory/list_cfn_stackset_operations.py

@@ -77,14 +77,13 @@ import Inventory_Modules
 from account_class import aws_acct_access
 from ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 from Inventory_Modules import display_results, find_stacksets3, get_regions3
-from tqdm.auto import tqdm
+# Migrated to Rich.Progress - see rich_utils.py for enterprise UX standards
+# from tqdm.auto import tqdm
 
-init()
 
 __version__ = "2024.05.18"
-ERASE_LINE = "\x1b[2K"
 begin_time = time()
 DefaultMaxWorkerThreads = 5
 
@@ -268,8 +267,8 @@ def setup_auth_and_regions(
     if fRegion.lower() not in RegionList:
         print()
         print(
-            f"{Fore.RED}You specified '{fRegion}' as the region, but this script only works with a single region.\n"
-            f"Please run the command again and specify only a single, valid region{Fore.RESET}"
+            f"[red]You specified '{fRegion}' as the region, but this script only works with a single region.\n"
+            f"Please run the command again and specify only a single, valid region"
         )
         print()
         raise ValueError(f"You specified '{fRegion}' as the region, but this script only works with a single region.")
@@ -283,7 +282,7 @@ def setup_auth_and_regions(
 
     # Display fragment matching configuration for search transparency
     if fExact:
-        print(f"\t\tFor stacksets that {Fore.RED}exactly match{Fore.RESET} these fragments: {fStackfrag}")
+        print(f"\t\tFor stacksets that [red]exactly match these fragments: {fStackfrag}")
     else:
         print(f"\t\tFor stacksets that contains these fragments: {fStackfrag}")
 
@@ -557,7 +556,7 @@ def find_stack_set_instances(fStackSetNames: list, fRegion: str) -> list:
                     logging.info(
                         f"{ERASE_LINE}Finished finding stack instances in stackset {c_stacksetname} in region {c_region} - {c_PlaceCount} / {len(fStackSetNames)}"
                     )
-                    pbar.update()  # Update progress bar for operational visibility
+                    pbar.update(pbar_task, advance=1)  # Update Rich progress bar for operational visibility
                     self.queue.task_done()  # Mark queue item as completed
 
     ###########
@@ -573,40 +572,50 @@ def find_stack_set_instances(fStackSetNames: list, fRegion: str) -> list:
     # Configure optimal worker thread count based on StackSet count and system limits
     WorkerThreads = min(len(fStackSetNames), DefaultMaxWorkerThreads)
 
+    # Import Rich display utilities for professional progress tracking
+    from runbooks.common.rich_utils import create_progress_bar
+
     # Initialize progress tracking for operational visibility during discovery
-    pbar = tqdm(
-        desc=f"Finding Stackset instances from {len(fStackSetNames)} stacksets",
-        total=len(fStackSetNames),
-        unit=" stacksets",
-    )
+    with create_progress_bar() as progress:
+        task = progress.add_task(
+            f"[cyan]Finding Stackset instances from {len(fStackSetNames)} stacksets...",
+            total=len(fStackSetNames)
+        )
+
+        # Make progress object available to worker threads via global (multi-threaded pattern)
+        global pbar
+        pbar = progress
+        global pbar_task
+        pbar_task = task
+
+        # Create and start worker thread pool for concurrent StackSet instance discovery
+        for x in range(WorkerThreads):
+            worker = FindStackSets(checkqueue)
+            # Daemon threads allow main thread exit even if workers are still processing
+            worker.daemon = True
+            worker.start()
+
+        # Queue StackSet discovery work items for worker thread processing
+        for stacksetname in fStackSetNames:
+            logging.debug(f"Beginning to queue data - starting with {stacksetname}")
+            try:
+                # Queue StackSet information for worker thread processing
+                # Note: Tuple structure is critical for proper parameter expansion in worker threads
+                PlaceCount += 1
+                checkqueue.put((stacksetname, fRegion, stacksetname, PlaceCount))
+            except ClientError as my_Error:
+                # Handle authorization failures with informative error messaging
+                if "AuthFailure" in str(my_Error):
+                    logging.error(
+                        f"Authorization Failure accessing stack set {stacksetname['StackSetName']} in {fRegion} region"
+                    )
+                    logging.warning(f"It's possible that the region {fRegion} hasn't been opted-into")
+                    pass
+
+        # Wait for all worker threads to complete processing
+        checkqueue.join()
+        # Progress bar auto-closes when exiting context manager
 
-    # Create and start worker thread pool for concurrent StackSet instance discovery
-    for x in range(WorkerThreads):
-        worker = FindStackSets(checkqueue)
-        # Daemon threads allow main thread exit even if workers are still processing
-        worker.daemon = True
-        worker.start()
-
-    # Queue StackSet discovery work items for worker thread processing
-    for stacksetname in fStackSetNames:
-        logging.debug(f"Beginning to queue data - starting with {stacksetname}")
-        try:
-            # Queue StackSet information for worker thread processing
-            # Note: Tuple structure is critical for proper parameter expansion in worker threads
-            PlaceCount += 1
-            checkqueue.put((stacksetname, fRegion, stacksetname, PlaceCount))
-        except ClientError as my_Error:
-            # Handle authorization failures with informative error messaging
-            if "AuthFailure" in str(my_Error):
-                logging.error(
-                    f"Authorization Failure accessing stack set {stacksetname['StackSetName']} in {fRegion} region"
-                )
-                logging.warning(f"It's possible that the region {fRegion} hasn't been opted-into")
-                pass
-
-    # Wait for all worker threads to complete processing
-    checkqueue.join()
-    pbar.close()  # Close progress bar after completion
     return f_combined_stack_set_instances
 
 
@@ -659,23 +668,36 @@ def find_last_operations(faws_acct: aws_acct_access, fStackSetNames: list):
     StackSetOps_client = faws_acct.session.client("cloudformation")
     AllStackSetOps = []
 
+    # Import Rich display utilities for professional progress tracking
+    from runbooks.common.rich_utils import create_progress_bar
+
     # Discover last operation for each StackSet with progress tracking
-    for stacksetname in tqdm(fStackSetNames, desc="Checking stackset operations"):
-        # 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
-            }
+    with create_progress_bar() as progress:
+        task = progress.add_task(
+            "[cyan]Checking stackset operations...",
+            total=len(fStackSetNames)
         )
+
+        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
+                }
+            )
+
+            # Update progress after processing each StackSet
+            progress.update(task, advance=1)
+
     return AllStackSetOps
 
 
@@ -724,11 +746,11 @@ if __name__ == "__main__":
     print()
     print(ERASE_LINE)
     print(
-        f"{Fore.RED}Found {len(StackSets['StackSetsList'])} Stacksets across {len(Accounts)} accounts across {len(Regions)} regions{Fore.RESET}"
+        f"[red]Found {len(StackSets['StackSetsList'])} Stacksets across {len(Accounts)} accounts across {len(Regions)} regions"
     )
     print()
     if pTiming:
         print(ERASE_LINE)
-        print(f"{Fore.GREEN}This script took {time() - begin_time:.2f} seconds{Fore.RESET}")
+        print(f"[green]This script took {time() - begin_time:.2f} seconds")
     print("Thanks for using this script...")
     print()

runbooks/inventory/list_cfn_stacksets.py

@@ -88,7 +88,7 @@ from time import time
 
 from account_class import aws_acct_access
 from ArgumentsClass import CommonArguments
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 from Inventory_Modules import (
     RemoveCoreAccounts,
     display_results,
@@ -98,11 +98,9 @@ from Inventory_Modules import (
     get_regions3,
 )
 
-init()
 
 __version__ = "2024.06.20"
 begin_time = time()
-ERASE_LINE = "\x1b[2K"
 
 #####################
 # Functions
@@ -270,13 +268,13 @@ def setup_auth_accounts_and_regions(fProfile: str) -> (aws_acct_access, list, li
     if pRootOnly:
         print(f"\tIn only the root account: {aws_acct.acct_number}")
     else:
-        print(f"\tin these accounts: {Fore.RED}{AccountList}{Fore.RESET}")
-    print(f"\tin these regions: {Fore.RED}{RegionList}{Fore.RESET}")
+        print(f"\tin these accounts: [red]{AccountList}")
+    print(f"\tin these regions: [red]{RegionList}")
     print(
         f"\tContaining {'this ' + Fore.RED + 'exact fragment' + Fore.RESET if pExact else 'one of these fragments'}: {pFragments}"
     )
     if pSkipAccounts is not None:
-        print(f"\tWhile skipping these accounts: {Fore.RED}{pSkipAccounts}{Fore.RESET}")
+        print(f"\tWhile skipping these accounts: [red]{pSkipAccounts}")
 
     return aws_acct, AccountList, RegionList
 
@@ -343,7 +341,7 @@ def find_all_cfnstacksets(f_All_Credentials: list, f_Fragments: list, f_Status)
         # logging.info(f"Account Creds: {account_credentials}")
         # Display progress for operational visibility during StackSet discovery
         print(
-            f"{ERASE_LINE}{Fore.RED}Checking Account: {credential['AccountId']} Region: {credential['Region']} for stacksets matching {f_Fragments} with status: {f_Status}{Fore.RESET}",
+            f"{ERASE_LINE}[red]Checking Account: {credential['AccountId']} Region: {credential['Region']} for stacksets matching {f_Fragments} with status: {f_Status}",
             end="\r",
         )
 
@@ -361,7 +359,7 @@ def find_all_cfnstacksets(f_All_Credentials: list, f_Fragments: list, f_Status)
             ) if verbose < 50 else ""
         else:
             print(
-                f"{ERASE_LINE}{Fore.RED}Account: {credential['AccountId']} Region: {credential['Region']} Found {len(StackSets)} Stacksets{Fore.RESET}",
+                f"{ERASE_LINE}[red]Account: {credential['AccountId']} Region: {credential['Region']} Found {len(StackSets)} Stacksets",
                 end="\r",
             ) if verbose < 50 else ""
 
@@ -443,11 +441,11 @@ if __name__ == "__main__":
 
     print(ERASE_LINE)
     print(
-        f"{Fore.RED}Found {len(All_Results)} Stacksets across {len(AccountList)} accounts across {len(RegionList)} regions{Fore.RESET}"
+        f"[red]Found {len(All_Results)} Stacksets across {len(AccountList)} accounts across {len(RegionList)} regions"
     )
     print()
     if pTiming:
         print(ERASE_LINE)
-        print(f"{Fore.GREEN}This script took {time() - begin_time:.2f} seconds{Fore.RESET}")
+        print(f"[green]This script took {time() - begin_time:.2f} seconds")
     print("Thanks for using this script...")
     print()

runbooks/inventory/list_config_recorders_delivery_channels.py

@@ -93,11 +93,11 @@ from time import time
 import Inventory_Modules
 from ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 from Inventory_Modules import del_config_recorder_or_delivery_channel2, display_results, get_all_credentials
-from tqdm.auto import tqdm
+# Migrated to Rich.Progress - see rich_utils.py for enterprise UX standards
+# from tqdm.auto import tqdm
 
-init()
 __version__ = "2024.05.31"
 
 
@@ -409,7 +409,7 @@ def check_accounts_for_delivery_channels_and_config_recorders(CredentialList, fF
                     logging.info(
                         f"{ERASE_LINE}Finished finding items in account {c_account_credentials['AccountId']} in region {c_account_credentials['Region']} - {c_PlaceCount} / {c_PlacesToLook}"
                     )
-                    pbar.update()  # Update progress bar for operational visibility
+                    pbar.update(pbar_task, advance=1)  # Update Rich progress bar for operational visibility
                     self.queue.task_done()  # Mark queue item as completed
 
     # Initialize processing context and data structures for Config discovery
@@ -421,40 +421,50 @@ def check_accounts_for_delivery_channels_and_config_recorders(CredentialList, fF
 
     checkqueue = Queue()  # Queue for work distribution across worker threads
 
+    # Import Rich display utilities for professional progress tracking
+    from runbooks.common.rich_utils import create_progress_bar
+
     # Initialize progress tracking for operational visibility during Config discovery
-    pbar = tqdm(
-        desc=f"Finding config recorders / delivery channels from {len(AllCredentials)} accounts and regions",
-        total=len(AllCredentials),
-        unit=" accounts & regions",
-    )
+    with create_progress_bar() as progress:
+        task = progress.add_task(
+            f"[cyan]Finding config recorders / delivery channels from {len(AllCredentials)} accounts and regions...",
+            total=len(AllCredentials)
+        )
 
-    # Create and start worker thread pool for concurrent Config component discovery
-    for x in range(WorkerThreads):
-        worker = Find_Config_Recorders_and_Delivery_Channels(checkqueue)
-        # Daemon threads allow main thread exit even if workers are still processing
-        worker.daemon = True
-        worker.start()
-
-    # Queue Config discovery work items for worker thread processing
-    # Note: Credential list already includes regional context, eliminating need for nested region iteration
-    for credential in CredentialList:
-        logging.info(f"Connecting to account {credential['AccountId']} in region {credential['Region']}")
-        try:
-            # Queue account and region combination for worker thread processing
-            # Note: Tuple structure is critical for proper parameter expansion in worker threads
-            checkqueue.put((credential, fFixRun, fFragments, len(CredentialList), PlaceCount))
-        except ClientError as my_Error:
-            # Handle authorization failures with informative error messaging
-            if "AuthFailure" in str(my_Error):
-                logging.error(
-                    f"Authorization Failure accessing account {credential['AccountId']} in {credential['Region']} region"
-                )
-                logging.warning(f"It's possible that the region {credential['Region']} hasn't been opted-into")
-                pass
+        # Make progress object available to worker threads via global (multi-threaded pattern)
+        global pbar
+        pbar = progress
+        global pbar_task
+        pbar_task = task
+
+        # Create and start worker thread pool for concurrent Config component discovery
+        for x in range(WorkerThreads):
+            worker = Find_Config_Recorders_and_Delivery_Channels(checkqueue)
+            # Daemon threads allow main thread exit even if workers are still processing
+            worker.daemon = True
+            worker.start()
+
+        # Queue Config discovery work items for worker thread processing
+        # Note: Credential list already includes regional context, eliminating need for nested region iteration
+        for credential in CredentialList:
+            logging.info(f"Connecting to account {credential['AccountId']} in region {credential['Region']}")
+            try:
+                # Queue account and region combination for worker thread processing
+                # Note: Tuple structure is critical for proper parameter expansion in worker threads
+                checkqueue.put((credential, fFixRun, fFragments, len(CredentialList), PlaceCount))
+            except ClientError as my_Error:
+                # Handle authorization failures with informative error messaging
+                if "AuthFailure" in str(my_Error):
+                    logging.error(
+                        f"Authorization Failure accessing account {credential['AccountId']} in {credential['Region']} region"
+                    )
+                    logging.warning(f"It's possible that the region {credential['Region']} hasn't been opted-into")
+                    pass
+
+        # Wait for all worker threads to complete processing
+        checkqueue.join()
+        # Progress bar auto-closes when exiting context manager
 
-    # Wait for all worker threads to complete processing
-    checkqueue.join()
-    pbar.close()  # Close progress bar after completion
     return account_crs_and_dcs
 
 
@@ -619,7 +629,7 @@ if __name__ == "__main__":
         print()
         milestone_time1 = time()
         print(
-            f"{Fore.GREEN}\t\tFiguring out what regions are available to your accounts, and capturing credentials for all accounts in those regions took: {(milestone_time1 - begin_time):.3f} seconds{Fore.RESET}"
+            f"[green]\t\tFiguring out what regions are available to your accounts, and capturing credentials for all accounts in those regions took: {(milestone_time1 - begin_time):.3f} seconds"
         )
         print()
     print(f"Now running through all accounts and regions identified to find resources...")
@@ -631,7 +641,7 @@ if __name__ == "__main__":
         print()
         milestone_time2 = time()
         print(
-            f"{Fore.GREEN}\t\tChecking {len(AllCredentials)} places took: {(milestone_time2 - milestone_time1):.3f} seconds{Fore.RESET}"
+            f"[green]\t\tChecking {len(AllCredentials)} places took: {(milestone_time2 - milestone_time1):.3f} seconds"
         )
         print()
     cr = 0
@@ -650,7 +660,7 @@ if __name__ == "__main__":
         print()
         milestone_time3 = time()
         print(
-            f"{Fore.GREEN}\t\tSorting the list of places took: {(milestone_time3 - milestone_time2):.3f} seconds{Fore.RESET}"
+            f"[green]\t\tSorting the list of places took: {(milestone_time3 - milestone_time2):.3f} seconds"
         )
         print()
     display_results(all_sorted_config_recorders_and_delivery_channels, display_dict, None, pFilename)
@@ -675,7 +685,7 @@ if __name__ == "__main__":
 
     if pTiming:
         print(ERASE_LINE)
-        print(f"{Fore.GREEN}This whole script took {time() - begin_time:.3f} seconds{Fore.RESET}")
+        print(f"[green]This whole script took {time() - begin_time:.3f} seconds")
     print()
     print("Thank you for using this tool")
     print()

runbooks/inventory/list_ds_directories.py

@@ -60,11 +60,11 @@ from time import time
 
 from ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 from Inventory_Modules import display_results, find_directories2, get_all_credentials
-from tqdm.auto import tqdm
+# Migrated to Rich.Progress - see rich_utils.py for enterprise UX standards
+# from tqdm.auto import tqdm
 
-init()
 __version__ = "2024.05.31"
 
 
@@ -193,54 +193,66 @@ def find_all_directories(f_credentials, f_fragments, f_exact):
     """
     AllDirectories = []  # Aggregated list for all discovered directories
 
+    # Import Rich display utilities for professional progress tracking
+    from runbooks.common.rich_utils import create_progress_bar
+
     # TODO: Need to use multi-threading here for improved performance
     # Sequential processing with progress tracking for operational visibility
-    for credential in tqdm(
-        f_credentials, desc=f"Looking through {len(f_credentials)} accounts and regions", unit="credentials"
-    ):
-        logging.info(f"{ERASE_LINE}Looking in account: {credential['AccountId']} in region {credential['Region']}")
-
-        # Skip failed credentials to avoid API errors
-        if not credential["Success"]:
-            continue
-
-        try:
-            # Discover directories using Directory Service API with fragment filtering
-            directories = find_directories2(credential, credential["Region"], f_fragments, f_exact)
-            logging.info(f"directories: {directories}")
-            logging.info(
-                f"{ERASE_LINE}Account: {credential['AccountId']} Region: {credential['Region']} Found {len(directories)} directories"
-            )
-
-            # Process and aggregate discovered directories with organizational context
-            if directories:
-                for directory in directories:
-                    # Enhance directory metadata with organizational and regional context
-                    # Available directory metadata includes:
-                    # - DirectoryName: Human-readable directory identifier
-                    # - DirectoryId: Unique AWS Directory Service identifier
-                    # - HomeRegion: Primary directory service region
-                    # - Status: Operational status (Active, Creating, etc.)
-                    # - Type: Directory type (SimpleAD, MicrosoftAD, etc.)
-                    # - Owner: Directory ownership context
-
-                    directory.update(
-                        {
-                            "MgmtAccount": credential["MgmtAccount"],  # Management account context
-                            "Region": credential["Region"],  # Regional deployment information
-                            "AccountId": credential["AccountId"],  # Account ownership details
-                        }
-                    )
-                    AllDirectories.append(directory)
-
-        except TypeError as my_Error:
-            # Handle type errors from malformed Directory Service API responses
-            logging.info(f"Error: {my_Error}")
-            continue
-        except ClientError as my_Error:
-            # Handle AWS API authorization failures with informative logging
-            if "AuthFailure" in str(my_Error):
-                logging.error(f"{ERASE_LINE} Account {credential['AccountId']} : Authorization Failure")
+    with create_progress_bar() as progress:
+        task = progress.add_task(
+            f"[cyan]Looking through {len(f_credentials)} accounts and regions...",
+            total=len(f_credentials)
+        )
+
+        for credential in f_credentials:
+            logging.info(f"Looking in account: {credential['AccountId']} in region {credential['Region']}")
+
+            # Skip failed credentials to avoid API errors
+            if not credential["Success"]:
+                progress.update(task, advance=1)
+                continue
+
+            try:
+                # Discover directories using Directory Service API with fragment filtering
+                directories = find_directories2(credential, credential["Region"], f_fragments, f_exact)
+                logging.info(f"directories: {directories}")
+                logging.info(
+                    f"Account: {credential['AccountId']} Region: {credential['Region']} Found {len(directories)} directories"
+                )
+
+                # Process and aggregate discovered directories with organizational context
+                if directories:
+                    for directory in directories:
+                        # Enhance directory metadata with organizational and regional context
+                        # Available directory metadata includes:
+                        # - DirectoryName: Human-readable directory identifier
+                        # - DirectoryId: Unique AWS Directory Service identifier
+                        # - HomeRegion: Primary directory service region
+                        # - Status: Operational status (Active, Creating, etc.)
+                        # - Type: Directory type (SimpleAD, MicrosoftAD, etc.)
+                        # - Owner: Directory ownership context
+
+                        directory.update(
+                            {
+                                "MgmtAccount": credential["MgmtAccount"],  # Management account context
+                                "Region": credential["Region"],  # Regional deployment information
+                                "AccountId": credential["AccountId"],  # Account ownership details
+                            }
+                        )
+                        AllDirectories.append(directory)
+
+            except TypeError as my_Error:
+                # Handle type errors from malformed Directory Service API responses
+                logging.info(f"Error: {my_Error}")
+                progress.update(task, advance=1)
+                continue
+            except ClientError as my_Error:
+                # Handle AWS API authorization failures with informative logging
+                if "AuthFailure" in str(my_Error):
+                    logging.error(f" Account {credential['AccountId']} : Authorization Failure")
+
+            # Update progress after processing each credential
+            progress.update(task, advance=1)
 
     return AllDirectories
 
@@ -293,7 +305,7 @@ if __name__ == "__main__":
     # Display credential retrieval timing for performance optimization
     if pTiming:
         print(
-            f"{Fore.GREEN}\tAfter getting credentials, this script took {time() - begin_time:.3f} seconds{Fore.RESET}"
+            f"[green]\tAfter getting credentials, this script took {time() - begin_time:.3f} seconds"
         )
         print()
 
@@ -304,7 +316,7 @@ if __name__ == "__main__":
     # Display credential parsing timing for operational metrics
     if pTiming:
         print(
-            f"{Fore.GREEN}\tAfter parsing out all Regions, Account and Profiles, this script took {time() - begin_time:.3f} seconds{Fore.RESET}"
+            f"[green]\tAfter parsing out all Regions, Account and Profiles, this script took {time() - begin_time:.3f} seconds"
         )
         print()
 
@@ -340,7 +352,7 @@ if __name__ == "__main__":
     display_results(sorted_Results, display_dict, "None")
 
     # Provide operational summary with discovery metrics and performance timing
-    print(ERASE_LINE)
+    console.print()
     print(
         f"Found {len(all_directories)} directories across {len(AccountList)} accounts across {len(RegionList)} regions"
     )
@@ -348,7 +360,7 @@ if __name__ == "__main__":
 
     # Display total execution timing for performance analysis and optimization
     if pTiming:
-        print(f"{Fore.GREEN}\tThis script took {time() - begin_time:.3f} seconds{Fore.RESET}")
+        print(f"[green]\tThis script took {time() - begin_time:.3f} seconds")
         print()
     print("Thank you for using this script")
     print()

runbooks/inventory/list_ec2_availability_zones.py

@@ -67,12 +67,10 @@ import sys
 from time import time
 
 from ArgumentsClass import CommonArguments
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 from Inventory_Modules import display_results, get_all_credentials, get_region_azs2
 
-init()
 __version__ = "2024.03.06"
-ERASE_LINE = "\x1b[2K"
 begin_time = time()
 
 
@@ -281,6 +279,6 @@ if __name__ == "__main__":
 
     print()
     if pTiming:
-        print(f"{Fore.GREEN}This script took {time() - begin_time:.2f} seconds{Fore.RESET}")
+        print(f"[green]This script took {time() - begin_time:.2f} seconds")
     print("Thanks for using this script")
     print()