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

runbooks/inventory/list_lambda_functions.py

@@ -82,14 +82,12 @@ import boto3
 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 display_results, get_all_credentials
-from tqdm.auto import tqdm
+from runbooks.common.rich_utils import create_progress_bar
 
-init()
 __version__ = "2024.06.05"
 
-ERASE_LINE = "\x1b[2K"
 begin_time = time()
 
 
@@ -497,7 +495,6 @@ def check_accounts_for_functions(CredentialList, fFragments=None):
             while True:
                 # Retrieve account credentials and fragment filters from thread-safe work queue
                 c_account_credentials, c_fragment_list = self.queue.get()
-                pbar.update()  # Update progress bar for operational visibility
                 Functions = []
                 logging.info(f"De-queued info for account {c_account_credentials['AccountId']}")
                 try:
@@ -543,6 +540,9 @@ def check_accounts_for_functions(CredentialList, fFragments=None):
                         # Thread-safe aggregation of discovered Lambda functions
                         AllFuncs.extend(Functions)
 
+                    # Update progress bar for operational visibility
+                    progress.update(task, advance=1)
+
                     # Signal task completion for thread-safe work queue management
                     self.queue.task_done()
 
@@ -556,40 +556,40 @@ def check_accounts_for_functions(CredentialList, fFragments=None):
     checkqueue = Queue()
 
     # Initialize progress tracking for operational visibility during discovery
-    pbar = tqdm(
-        desc=f"Finding instances from {len(CredentialList)} accounts / regions",
-        total=len(CredentialList),
-        unit=" locations",
-    )
-
-    # Initialize multi-threaded Lambda function discovery worker pool
-    for x in range(WorkerThreads):
-        worker = FindFunctions(checkqueue)
-        # Enable graceful shutdown with main thread termination for enterprise operational safety
-        worker.daemon = True
-        worker.start()  # Begin concurrent Lambda function discovery processing
+    with create_progress_bar() as progress:
+        task = progress.add_task(
+            f"Finding instances from {len(CredentialList)} accounts / regions",
+            total=len(CredentialList)
+        )
 
-    # Populate work queue with account credentials for distributed serverless discovery
-    for credential in CredentialList:
-        logging.info(f"Connecting to account {credential['AccountId']}")
-        try:
-            # Log work queue population for operational audit trail
-            logging.info(
-                f"{ERASE_LINE}Queuing account {credential['AccountId']} in region {credential['Region']}", end="\r"
-            )
-            # Add credential and fragment filter to processing queue
-            checkqueue.put((credential, fFragments))
-        except ClientError as my_Error:
-            # Handle AWS API authorization failures during queue population
-            if "AuthFailure" in str(my_Error):
-                logging.error(
-                    f"Authorization Failure accessing account {credential['AccountId']} in {credential['Region']} region"
+        # Initialize multi-threaded Lambda function discovery worker pool
+        for x in range(WorkerThreads):
+            worker = FindFunctions(checkqueue)
+            # Enable graceful shutdown with main thread termination for enterprise operational safety
+            worker.daemon = True
+            worker.start()  # Begin concurrent Lambda function discovery processing
+
+        # Populate work queue with account credentials for distributed serverless discovery
+        for credential in CredentialList:
+            logging.info(f"Connecting to account {credential['AccountId']}")
+            try:
+                # Log work queue population for operational audit trail
+                logging.info(
+                    f"{ERASE_LINE}Queuing account {credential['AccountId']} in region {credential['Region']}", end="\r"
                 )
-                logging.error(f"It's possible that the region {credential['Region']} hasn't been opted-into")
-                pass  # Continue processing remaining accounts despite individual failures
+                # Add credential and fragment filter to processing queue
+                checkqueue.put((credential, fFragments))
+            except ClientError as my_Error:
+                # Handle AWS API authorization failures during queue population
+                if "AuthFailure" in str(my_Error):
+                    logging.error(
+                        f"Authorization Failure accessing account {credential['AccountId']} in {credential['Region']} region"
+                    )
+                    logging.error(f"It's possible that the region {credential['Region']} hasn't been opted-into")
+                    pass  # Continue processing remaining accounts despite individual failures
 
-    # Wait for all Lambda function discovery tasks to complete before result aggregation
-    checkqueue.join()
+        # Wait for all Lambda function discovery tasks to complete before result aggregation
+        checkqueue.join()
 
     # Return comprehensive Lambda function inventory with enterprise serverless metadata
     return AllFuncs
@@ -744,7 +744,7 @@ def fix_my_functions(fAllFunctions, fRuntime, fNewRuntime, fForceDelete, fTiming
         if fTiming:
             print(ERASE_LINE)
             print(
-                f"{Fore.GREEN}Fixing {len(return_response)} functions took {time() - begin_fix_time:.3f} seconds{Fore.RESET}"
+                f"[green]Fixing {len(return_response)} functions took {time() - begin_fix_time:.3f} seconds"
             )
 
     # Return operation results for enterprise reporting and audit trail
@@ -869,7 +869,7 @@ if __name__ == "__main__":
     # Display performance timing metrics for operational optimization and SLA compliance
     if pTiming:
         print(ERASE_LINE)
-        print(f"{Fore.GREEN}This script took {time() - begin_time:.3f} seconds{Fore.RESET}")
+        print(f"[green]This script took {time() - begin_time:.3f} seconds")
 
     print(ERASE_LINE)
 

runbooks/inventory/list_org_accounts.py

@@ -71,12 +71,10 @@ from time import time
 from ArgumentsClass import CommonArguments
 
 # from botocore.exceptions import ClientError, NoCredentialsError, InvalidConfigError
-from colorama import Fore, Style, init
+from runbooks.common.rich_utils import console
 from Inventory_Modules import display_results, get_org_accounts_from_profiles, get_profiles
 
-init()
 __version__ = "2024.05.08"
-ERASE_LINE = "\x1b[2K"
 begin_time = time()
 
 
@@ -251,7 +249,7 @@ def all_my_orgs(
     # Print out the results
     if f_Timing:
         print()
-        print(f"It's taken {Fore.GREEN}{time() - begin_time:.2f}{Fore.RESET} seconds to find profile accounts...")
+        print(f"It's taken [green]{time() - begin_time:.2f} seconds to find profile accounts...")
         print()
     fmt = "%-23s %-15s %-15s %-12s %-10s"
     print("<------------------------------------>")
@@ -278,7 +276,7 @@ def all_my_orgs(
                 else:
                     logging.info(f"{item['profile']} was successful.")
                     print(
-                        f"{Fore.RED if item['RootAcct'] else ''}{item['profile']:23s} {item['aws_acct'].acct_number:15s} {item['MgmtAccount']:15s} {str(item['OrgId']):12s} {item['RootAcct']}{Fore.RESET}"
+                        f"{Fore.RED if item['RootAcct'] else ''}{item['profile']:23s} {item['aws_acct'].acct_number:15s} {item['MgmtAccount']:15s} {str(item['OrgId']):12s} {item['RootAcct']}"
                     )
             except TypeError as my_Error:
                 logging.error(f"Error - {my_Error} on {item}")
@@ -339,14 +337,14 @@ def all_my_orgs(
             for item in AllProfileAccounts:
                 if item["Success"] and item["RootAcct"]:
                     print(
-                        f"{item['profile']:{ProfileNameLength}s} {Style.BRIGHT}{item['MgmtAccount']:15s}{Style.RESET_ALL}"
+                        f"{item['profile']:{ProfileNameLength}s} [bold]{item['MgmtAccount']:15s}"
                     )
                     print(
                         f"\t{'Child Account Number':{len('Child Account Number')}s} {'Child Account Status':{len('Child Account Status')}s} {'Child Email Address'}"
                     )
                     for child_acct in item["aws_acct"].ChildAccounts:
                         print(
-                            f"\t{Fore.RED if not child_acct['AccountStatus'] == 'ACTIVE' else ''}{child_acct['AccountId']:{len('Child Account Number')}s} {child_acct['AccountStatus']:{len('Child Account Status')}s} {child_acct['AccountEmail']}{Fore.RESET}"
+                            f"\t{Fore.RED if not child_acct['AccountStatus'] == 'ACTIVE' else ''}{child_acct['AccountId']:{len('Child Account Number')}s} {child_acct['AccountStatus']:{len('Child Account Status')}s} {child_acct['AccountEmail']}"
                         )
 
         elif f_SaveFilename is not None:
@@ -440,7 +438,7 @@ 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()
     print("Thanks for using this script")
     print()

runbooks/inventory/list_org_accounts_users.py

@@ -97,7 +97,7 @@ 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_iam_users2,
@@ -105,11 +105,10 @@ from Inventory_Modules import (
     find_idc_users2,
     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.09"
-ERASE_LINE = "\x1b[2K"
 begin_time = time()
 
 
@@ -253,46 +252,58 @@ def find_all_org_users(f_credentials, f_IDC: bool, f_IAM: bool) -> list:
     User_List = []
     directories_seen = set()
 
+    # Import Rich display utilities for professional progress tracking
+    from runbooks.common.rich_utils import create_progress_bar
+
     # TODO: Enhance with multi-threading for improved performance across large organizations
-    for credential in tqdm(
-        f_credentials, desc=f"Looking for users across {len(f_credentials)} Accounts", unit=" accounts"
-    ):
-        # Skip credentials that failed validation
-        if not credential["Success"]:
-            logging.info(f"{credential['ErrorMessage']} with roles: {credential['RolesTried']}")
-            continue
-
-        # Discover traditional IAM users if requested
-        if f_IAM:
-            try:
-                # Call inventory module to discover IAM users in this account
-                User_List.extend(find_iam_users2(credential))
-                # Optional verbose logging for user discovery progress (currently commented)
-                # logging.info(f"{ERASE_LINE}Account: {credential['AccountId']} Found {len(User_List)} users")
-            except ClientError as my_Error:
-                # Handle IAM API authorization failures gracefully
-                if "AuthFailure" in str(my_Error):
-                    logging.error(f"{ERASE_LINE}{credential}: Authorization Failure")
-
-        # Discover AWS Identity Center users if requested
-        if f_IDC:
-            try:
-                # Find out if this account hosts an Identity Center with a user directory
-                directory_ids = find_idc_directory_id2(credential)
-                for directory_instance_id in directory_ids:
-                    # Directory deduplication: if we've already interrogated this directory, skip it
-                    if directory_instance_id in directories_seen:
-                        continue
-                    else:
-                        # Mark this directory as processed and discover users
-                        directories_seen.update(directory_ids)
-                        User_List.extend(find_idc_users2(credential, directory_instance_id))
-                # Optional verbose logging for user discovery progress (currently commented)
-                # logging.info(f"{ERASE_LINE}Account: {credential['AccountId']} Found {len(User_List)} users")
-            except ClientError as my_Error:
-                # Handle Identity Center API authorization failures gracefully
-                if "AuthFailure" in str(my_Error):
-                    logging.error(f"{ERASE_LINE}{credential}: Authorization Failure")
+    with create_progress_bar() as progress:
+        task = progress.add_task(
+            f"[cyan]Looking for users across {len(f_credentials)} Accounts...",
+            total=len(f_credentials)
+        )
+
+        for credential in f_credentials:
+            # Skip credentials that failed validation
+            if not credential["Success"]:
+                logging.info(f"{credential['ErrorMessage']} with roles: {credential['RolesTried']}")
+                progress.update(task, advance=1)
+                continue
+
+            # Discover traditional IAM users if requested
+            if f_IAM:
+                try:
+                    # Call inventory module to discover IAM users in this account
+                    User_List.extend(find_iam_users2(credential))
+                    # Optional verbose logging for user discovery progress (currently commented)
+                    # logging.info(f"{ERASE_LINE}Account: {credential['AccountId']} Found {len(User_List)} users")
+                except ClientError as my_Error:
+                    # Handle IAM API authorization failures gracefully
+                    if "AuthFailure" in str(my_Error):
+                        logging.error(f"{ERASE_LINE}{credential}: Authorization Failure")
+
+            # Discover AWS Identity Center users if requested
+            if f_IDC:
+                try:
+                    # Find out if this account hosts an Identity Center with a user directory
+                    directory_ids = find_idc_directory_id2(credential)
+                    for directory_instance_id in directory_ids:
+                        # Directory deduplication: if we've already interrogated this directory, skip it
+                        if directory_instance_id in directories_seen:
+                            continue
+                        else:
+                            # Mark this directory as processed and discover users
+                            directories_seen.update(directory_ids)
+                            User_List.extend(find_idc_users2(credential, directory_instance_id))
+                    # Optional verbose logging for user discovery progress (currently commented)
+                    # logging.info(f"{ERASE_LINE}Account: {credential['AccountId']} Found {len(User_List)} users")
+                except ClientError as my_Error:
+                    # Handle Identity Center API authorization failures gracefully
+                    if "AuthFailure" in str(my_Error):
+                        logging.error(f"{ERASE_LINE}{credential}: Authorization Failure")
+
+            # Update progress after processing each credential
+            progress.update(task, advance=1)
+
     return User_List
 
 
@@ -344,7 +355,7 @@ if __name__ == "__main__":
     display_results(sorted_UserListing, display_dict, "N/A", pFilename)
     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(ERASE_LINE)
     print(
         f"Found {len(UserListing)} users across {len(SuccessfulAccountAccesses)} account{'' if len(SuccessfulAccountAccesses) == 1 else 's'}"

runbooks/inventory/list_rds_db_instances.py

@@ -65,11 +65,10 @@ 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 display_results, find_account_rds_instances2, get_all_credentials
-from tqdm.auto import tqdm
+from runbooks.common.rich_utils import create_progress_bar
 
-init()
 
 __version__ = "2025.04.09"
 
@@ -289,7 +288,7 @@ def check_accounts_for_instances(fAllCredentials: list) -> list:
                         logging.warning(my_Error)
                         continue
                 finally:
-                    pbar.update()
+                    progress.update(task, advance=1)
                     self.queue.task_done()
 
     checkqueue = Queue()
@@ -297,32 +296,31 @@ def check_accounts_for_instances(fAllCredentials: list) -> list:
     AllRDSInstances = []
     WorkerThreads = min(len(fAllCredentials), 25)
 
-    pbar = tqdm(
-        desc=f"Finding RDS instances from {len(fAllCredentials)} locations",
-        total=len(fAllCredentials),
-        unit=" location",
-    )
-
-    for x in range(WorkerThreads):
-        worker = FindRDSInstances(checkqueue)
-        # Setting daemon to True will let the main thread exit even though the workers are blocking
-        worker.daemon = True
-        worker.start()
-
-    for credential in fAllCredentials:
-        logging.info(f"Beginning to queue data - starting with {credential['AccountId']}")
-        try:
-            # I don't know why - but double parens are necessary below. If you remove them, only the first parameter is queued.
-            checkqueue.put((credential))
-        except ClientError as my_Error:
-            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
-    checkqueue.join()
-    pbar.close()
+    with create_progress_bar() as progress:
+        task = progress.add_task(
+            f"Finding RDS instances from {len(fAllCredentials)} locations",
+            total=len(fAllCredentials)
+        )
+
+        for x in range(WorkerThreads):
+            worker = FindRDSInstances(checkqueue)
+            # Setting daemon to True will let the main thread exit even though the workers are blocking
+            worker.daemon = True
+            worker.start()
+
+        for credential in fAllCredentials:
+            logging.info(f"Beginning to queue data - starting with {credential['AccountId']}")
+            try:
+                # I don't know why - but double parens are necessary below. If you remove them, only the first parameter is queued.
+                checkqueue.put((credential))
+            except ClientError as my_Error:
+                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
+        checkqueue.join()
     return AllRDSInstances
 
 
@@ -396,11 +394,11 @@ if __name__ == "__main__":
     # Display results
     display_results(sorted_results, display_dict, None, pFilename)
 
-    print(ERASE_LINE)
+    console.print()
     print(f"Found {len(InstancesFound)} instances across {AccountNum} accounts across {RegionNum} regions")
     if pTiming:
-        print(ERASE_LINE)
-        print(f"{Fore.GREEN}This script took {time() - begin_time:.2f} seconds{Fore.RESET}")
+        console.print()
+        print(f"[green]This script took {time() - begin_time:.2f} seconds")
     print()
     print("Thank you for using this script")
     print()

runbooks/inventory/list_route53_hosted_zones.py

@@ -57,12 +57,10 @@ 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_private_hosted_zones2, get_all_credentials
 
-init()
 __version__ = "2023.11.08"
-ERASE_LINE = "\x1b[2K"
 
 ########################
 
@@ -307,12 +305,12 @@ if __name__ == "__main__":
     display_results(sorted_results, display_dict, None, pFilename)
 
     print(
-        f"{Fore.RED}Found {len(AllHostedZones)} Hosted Zones across {len(AllAccountList)} accounts across {len(AllRegionList)} regions{Fore.RESET}"
+        f"[red]Found {len(AllHostedZones)} Hosted Zones across {len(AllAccountList)} accounts across {len(AllRegionList)} 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(ERASE_LINE)
     print("Thanks for using this script...")
     print()

runbooks/inventory/list_servicecatalog_provisioned_products.py

@@ -97,11 +97,10 @@ import Inventory_Modules
 from account_class import aws_acct_access
 from ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError, ProfileNotFound, UnknownCredentialError, UnknownRegionError
-from colorama import Fore, init
+from runbooks.common.rich_utils import console
 from Inventory_Modules import display_results
-from tqdm.auto import tqdm
+from runbooks.common.rich_utils import create_progress_bar
 
-init()
 __version__ = "2023.08.09"
 
 parser = CommonArguments()
@@ -175,7 +174,7 @@ def find_account_stacksets(faws_acct, f_SCProducts, fRegion=None, fstacksetname=
                 # Get the work from the queue and expand the tuple
                 c_sc_product, c_region, c_fstacksetname, c_PlacesToLook, c_PlaceCount = self.queue.get()
                 logging.info(f"De-queued info for SC Product: {c_sc_product['SCPName']}")
-                logging.info(f"{Fore.RED}Checking {PlaceCount} of {len(f_SCProducts)} products{Fore.RESET}")
+                logging.info(f"[red]Checking {PlaceCount} of {len(f_SCProducts)} products")
                 CFNresponse = Inventory_Modules.find_stacks3(faws_acct, pRegion, c_sc_product["SCPId"])
                 logging.info(
                     f"There are {len(CFNresponse)} matches for SC Provisioned Product Name {c_sc_product['SCPName']}"
@@ -206,10 +205,10 @@ def find_account_stacksets(faws_acct, f_SCProducts, fRegion=None, fstacksetname=
                                         AccountStatus = AccountHistogram[AccountID]
                                     else:
                                         AccountStatus = "Closed"
-                                    logging.info(f"{Fore.RED}Found the Account ID: {AccountID}{Fore.RESET}")
+                                    logging.info(f"[red]Found the Account ID: {AccountID}")
                                     if AccountID in SuspendedAccounts:
                                         logging.error(
-                                            f"{Fore.RED}Account ID {AccountID} has been suspended{Fore.RESET}"
+                                            f"[red]Account ID {AccountID} has been suspended"
                                         )
                                     break
                                 else:
@@ -258,7 +257,7 @@ def find_account_stacksets(faws_acct, f_SCProducts, fRegion=None, fstacksetname=
                     logging.info(
                         f"Finished finding product {c_sc_product['SCPName']} - {c_PlaceCount} / {c_PlacesToLook}"
                     )
-                    pbar.update()
+                    progress.update(task, advance=1)
                     self.queue.task_done()
 
     if fRegion is None:
@@ -269,33 +268,31 @@ def find_account_stacksets(faws_acct, f_SCProducts, fRegion=None, fstacksetname=
     PlaceCount = 0
     PlacesToLook = WorkerThreads = min(len(f_SCProducts), 10)
 
-    pbar = tqdm(
-        desc=f"Reconciling SC Products with CloudFormation Stacks in accounts",
-        leave=True,
-        total=len(f_SCProducts),
-        unit=" products",
-    )
+    with create_progress_bar() as progress:
+        task = progress.add_task(
+            f"Reconciling SC Products with CloudFormation Stacks in accounts",
+            total=len(f_SCProducts)
+        )
 
-    # Create and start the worker threads
-    for x in range(WorkerThreads):
-        worker = CheckProducts(checkqueue)
-        # Setting daemon to True will let the main thread exit even though the workers are blocking
-        worker.daemon = True
-        worker.start()
-
-    for SCProduct in SCProducts:
-        logging.info(f"Checking service catalog product: {SCProduct['SCPName']}")
-        try:
-            # print(f"{ERASE_LINE}Queuing account {credential['AccountId']} in region {region}", end='\r')
-            checkqueue.put((SCProduct, fRegion, fstacksetname, PlacesToLook, PlaceCount))
-            PlaceCount += 1
-        except ClientError as my_Error:
-            if "AuthFailure" in str(my_Error):
-                logging.error(f"Authorization Failure accessing account {faws_acct.acct_number} in {fRegion} region")
-                logging.warning(f"It's possible that the region {fRegion} hasn't been opted-into")
-                pass
-    checkqueue.join()
-    pbar.close()
+        # Create and start the worker threads
+        for x in range(WorkerThreads):
+            worker = CheckProducts(checkqueue)
+            # Setting daemon to True will let the main thread exit even though the workers are blocking
+            worker.daemon = True
+            worker.start()
+
+        for SCProduct in SCProducts:
+            logging.info(f"Checking service catalog product: {SCProduct['SCPName']}")
+            try:
+                # print(f"{ERASE_LINE}Queuing account {credential['AccountId']} in region {region}", end='\r')
+                checkqueue.put((SCProduct, fRegion, fstacksetname, PlacesToLook, PlaceCount))
+                PlaceCount += 1
+            except ClientError as my_Error:
+                if "AuthFailure" in str(my_Error):
+                    logging.error(f"Authorization Failure accessing account {faws_acct.acct_number} in {fRegion} region")
+                    logging.warning(f"It's possible that the region {fRegion} hasn't been opted-into")
+                    pass
+        checkqueue.join()
     return SCP2Stacks
 
 
@@ -320,7 +317,6 @@ Significant Variable Explanation:
 """
 begin_time = time()
 
-ERASE_LINE = "\x1b[2K"
 
 print()
 
@@ -437,7 +433,7 @@ def main():
 
         if pTiming:
             print(
-                f"{Fore.GREEN}Finding stacks in your account has taken {time() - begin_time:.2f} seconds now...{Fore.RESET}"
+                f"[green]Finding stacks in your account has taken {time() - begin_time:.2f} seconds now..."
             )
             milestone1 = time()
 
@@ -454,7 +450,7 @@ def main():
 
         if pTiming:
             print(
-                f"{Fore.GREEN}Reconciling products to the CloudFormation stacks took {time() - milestone1:.2f} seconds{Fore.RESET}"
+                f"[green]Reconciling products to the CloudFormation stacks took {time() - milestone1:.2f} seconds"
             )
 
         # TODO: This might not be a good idea, if it misses the stacks which are associated with accounts no longer within the Org.
@@ -501,21 +497,21 @@ def main():
             pass  # This is the desired state, so no user output is needed.
         elif AccountHistogram[acctnum] == "SUSPENDED":
             print(
-                f"{Fore.RED}While there is no SC Product associated, account number {acctnum} appears to be a suspended account.{Fore.RESET}"
+                f"[red]While there is no SC Product associated, account number {acctnum} appears to be a suspended account."
             )
         elif (
             AccountHistogram[acctnum] == "ACTIVE"
         ):  # This compare needs to be separate from below, since we can't compare a string with a "<" operator
             print(
-                f"Account Number {Fore.RED}{acctnum}{Fore.RESET} appears to have no SC Product associated with it. This can be a problem"
+                f"Account Number [red]{acctnum} appears to have no SC Product associated with it. This can be a problem"
             )
         elif AccountHistogram[acctnum] < 1:
             print(
-                f"Account Number {Fore.RED}{acctnum}{Fore.RESET} appears to have no SC Product associated with it. This can be a problem"
+                f"Account Number [red]{acctnum} appears to have no SC Product associated with it. This can be a problem"
             )
         elif AccountHistogram[acctnum] > 1:
             print(
-                f"Account Number {Fore.RED}{acctnum}{Fore.RESET} appears to have multiple SC Products associated with it. This can be a problem"
+                f"Account Number [red]{acctnum} appears to have multiple SC Products associated with it. This can be a problem"
             )
 
     if ErroredSCProductExists:
@@ -561,7 +557,7 @@ def main():
     end_time = time()
     duration = end_time - begin_time
     if pTiming:
-        print(f"{Fore.GREEN}This script took {duration:.2f} seconds{Fore.RESET}")
+        print(f"[green]This script took {duration:.2f} seconds")
     print(f"We found {len(aws_acct.ChildAccounts)} accounts within the Org")
     print(f"We found {len(SCProducts)} Service Catalog Products")
     print(f"We found {len(SuspendedAccounts)} Suspended accounts")

runbooks/inventory/list_sns_topics.py

@@ -69,10 +69,9 @@ 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 display_results, get_all_credentials
 
-init()
 __version__ = "2023.11.08"
 begin_time = time()
 
@@ -317,7 +316,6 @@ def present_results(f_data_found: list):
 
 
 ##########################
-ERASE_LINE = "\x1b[2K"
 
 if __name__ == "__main__":
     args = parse_args(sys.argv[1:])
@@ -355,6 +353,6 @@ if __name__ == "__main__":
 
     print()
     if pTiming:
-        print(f"{Fore.GREEN}This script completed in {time() - begin_time:.2f} seconds{Fore.RESET}")
+        print(f"[green]This script completed in {time() - begin_time:.2f} seconds")
         print()
 print("Thank you for using this script.")