runbooks 1.1.4__py3-none-any.whl → 1.1.6__py3-none-any.whl

runbooks/inventory/check_controltower_readiness.py

@@ -12,10 +12,9 @@ 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 prettytable import PrettyTable
+from runbooks.common.rich_utils import console, print_success, print_error, print_info
+from runbooks.common.rich_utils import console, create_table
 
-init()
 __version__ = "2024.05.18"
 
 script_path, script_name = os.path.split(sys.argv[0])
@@ -86,32 +85,32 @@ def intersection(lst1, lst2):
 def explain_script():
     print("This script does the following... ")
     print(
-        f"{Fore.BLUE}  0.{Fore.RESET} Checks to ensure you have the necessary cross-account role access to the child account."
+        f"[blue]  0. Checks to ensure you have the necessary cross-account role access to the child account."
     )
-    print(f"{Fore.BLUE}  1.{Fore.RESET} This check previously checked for default VPCs, but has since been removed.")
-    print(f"{Fore.BLUE}  2.{Fore.RESET} Checks the child account in each of the regions")
-    print(f"     to see if there's already a {Fore.RED}Config Recorder and Delivery Channel {Fore.RESET}enabled...")
+    print(f"[blue]  1. This check previously checked for default VPCs, but has since been removed.")
+    print(f"[blue]  2. Checks the child account in each of the regions")
+    print(f"     to see if there's already a [red]Config Recorder and Delivery Channel enabled...")
     print(
-        f"{Fore.BLUE}  3.{Fore.RESET} Checks that there isn't a duplicate {Fore.RED}CloudTrail{Fore.RESET} trail in the account."
+        f"[blue]  3. Checks that there isn't a duplicate [red]CloudTrail trail in the account."
     )
     print(
-        f"{Fore.BLUE}  4.{Fore.RESET} This check previously checked for the presence of GuardDuty within this account, but has since been removed."
+        f"[blue]  4. This check previously checked for the presence of GuardDuty within this account, but has since been removed."
     )
     print(
-        f"{Fore.BLUE}  5.{Fore.RESET} This child account {Fore.RED}must exist{Fore.RESET} within the Parent Organization."
+        f"[blue]  5. This child account [red]must exist within the Parent Organization."
     )
     print("     If it doesn't - then you must move it into this Org - this script can't do that for you.")
     print(
-        f"{Fore.BLUE}  6.{Fore.RESET} The target account {Fore.RED}can't exist{Fore.RESET} within an already managed OU."
+        f"[blue]  6. The target account [red]can't exist within an already managed OU."
     )
     print("     If it does - then you're already managing this account with Control Tower and just don't know it.")
-    print(f"{Fore.BLUE}  7.{Fore.RESET} Looking for {Fore.RED}SNS Topics{Fore.RESET} with duplicate names.")
+    print(f"[blue]  7. Looking for [red]SNS Topics with duplicate names.")
     print("     If found, we can delete them, but you probably want to do that manually - to be sure.")
-    print(f"{Fore.BLUE}  8.{Fore.RESET} Looking for {Fore.RED}Lambda Functions{Fore.RESET} with duplicate names.")
+    print(f"[blue]  8. Looking for [red]Lambda Functions with duplicate names.")
     print("     If found, we can delete them, but you probably want to do that manually - to be sure.")
-    print(f"{Fore.BLUE}  9.{Fore.RESET} Looking for {Fore.RED}IAM Roles{Fore.RESET} with duplicate names.")
+    print(f"[blue]  9. Looking for [red]IAM Roles with duplicate names.")
     print("     If found, we can delete them, but you probably want to do that manually - to be sure.")
-    print(f"{Fore.BLUE}  10.{Fore.RESET} Looking for duplicate {Fore.RED}CloudWatch Log Groups.{Fore.RESET}")
+    print(f"[blue]  10. Looking for duplicate [red]CloudWatch Log Groups.")
     print("     If found, we can delete them, but you probably want to do that manually - to be sure.")
     print()
     print("Since this script is fairly new - All comments or suggestions are enthusiastically encouraged")
@@ -166,7 +165,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
     ]
     # TODO: I don't use this next variable, but eventually I intend to supply the JSON code needed to update a role with.
     json_formatted_str_TP = ""
-    print(f"{Fore.BLUE}{Step}:{Fore.RESET}") if verbose < 50 else None
+    print(f"[blue]{Step}:") if verbose < 50 else None
     print(
         f"Confirming we have the necessary cross-account access to account {fChildAccountId} in region {fRegion}"
     ) if verbose < 50 else None
@@ -206,7 +205,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
     finally:
         if account_credentials["AccessError"]:
             print(
-                f"{Fore.RED}We weren't able to connect to the Child Account {fChildAccountId} from this Management Account {aws_account.acct_number}. Please check the role Trust Policy and re-run this script.{Fore.RESET}"
+                f"[red]We weren't able to connect to the Child Account {fChildAccountId} from this Management Account {aws_account.acct_number}. Please check the role Trust Policy and re-run this script."
             )
             print(
                 f"The following list of roles were tried, but none were allowed access to account {fChildAccountId} using the {aws_account.acct_number} account in region {fRegion}"
@@ -219,10 +218,10 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
     logging.info("Was able to successfully connect using the credentials... ")
     print() if verbose < 50 else None
     print(
-        f"Confirmed the role {Fore.GREEN}{account_credentials['Role']}{Fore.RESET}"
-        f" exists in account {Fore.GREEN}{fChildAccountId}{Fore.RESET} and trusts the Management Account"
+        f"Confirmed the role [green]{account_credentials['Role']}"
+        f" exists in account [green]{fChildAccountId} and trusts the Management Account"
     ) if verbose < 50 else None
-    print(f"{Fore.GREEN}** Step 0 completed without issues{Fore.RESET}") if verbose < 50 else None
+    print(f"[green]** Step 0 completed without issues") if verbose < 50 else None
     print() if verbose < 50 else None
 
     """
@@ -231,7 +230,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
 	"""
     Step = "Step1"
     serviceName = "config.amazonaws.com"
-    print(f"{Fore.BLUE}{Step}:{Fore.RESET}") if verbose < 50 else None
+    print(f"[blue]{Step}:") if verbose < 50 else None
     print(
         f"Checking Org Account {fChildAccountId} to see if Config is enabled at the Org Level\n"
         f"Which means we only run this step if this is the Root Account\n"
@@ -256,7 +255,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
 
     if fFixRun:
         logging.warning(
-            f"{Fore.RED}Found {serviceName} is enabled as an Organizational Service and you've requested that we remedy that for you... {Fore.RESET}"
+            f"[red]Found {serviceName} is enabled as an Organizational Service and you've requested that we remedy that for you... "
         )
         ProcessStatus[Step]["Success"] = False
         ProcessStatus[Step]["IssuesFound"] += 1
@@ -278,25 +277,25 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
             logging.error(DelConfigService["ErrorMessage"])
 
     if ProcessStatus[Step]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues") if verbose < 50 else None
     elif ProcessStatus[Step]["IssuesFound"] - ProcessStatus[Step]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issue, but we were able to fix it{Fore.RESET}"
+            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issue, but we were able to fix it"
         ) if verbose < 50 else None
         ProcessStatus[Step]["Success"] = True
     elif ProcessStatus[Step]["IssuesFound"] > ProcessStatus[Step]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there was {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blocker found that wasn't fixed{Fore.RESET}"
+            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there was {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blocker found that wasn't fixed"
         ) if verbose < 50 else None
     else:
-        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 2
     # This part will check the Config Recorder and  Delivery Channel. If they have one, we need to delete it, so we can create another. We'll ask whether this is ok before we delete.
     Step = "Step2"
     try:
-        print(f"{Fore.BLUE}{Step}:{Fore.RESET}") if verbose < 50 else None
+        print(f"[blue]{Step}:") if verbose < 50 else None
         print(
             f" Checking account {fChildAccountId} for a Config Recorders and Delivery Channels in any region"
         ) if verbose < 50 else None
@@ -340,7 +339,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
 
     for _ in range(len(ConfigList)):
         logging.warning(
-            f"{Fore.RED}Found a config recorder for account %s in region %s",
+            f"[red]Found a config recorder for account %s in region %s",
             ConfigList[_]["AccountID"],
             ConfigList[_]["Region"] + Fore.RESET,
         )
@@ -361,7 +360,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
             ProcessStatus[Step]["IssuesFixed"] += 1
     for _ in range(len(DeliveryChanList)):
         logging.warning(
-            f"{Fore.RED}Found a delivery channel for account {DeliveryChanList[_]['AccountID']} in region {DeliveryChanList[_]['Region']}{Fore.RESET}"
+            f"[red]Found a delivery channel for account {DeliveryChanList[_]['AccountID']} in region {DeliveryChanList[_]['Region']}"
         )
         ProcessStatus[Step]["Success"] = False
         ProcessStatus[Step]["IssuesFound"] += 1
@@ -380,18 +379,18 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
             ProcessStatus[Step]["IssuesFixed"] += 1
 
     if ProcessStatus[Step]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** Step 2 completed with no issues{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.GREEN}** Step 2 completed with no issues") if verbose < 50 else None
     elif ProcessStatus[Step]["IssuesFound"] - ProcessStatus[Step]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** Step 2 found {ProcessStatus[Step]['IssuesFound']} issues, but they were fixed by deleting the existing Config Recorders and Delivery Channels{Fore.RESET}"
+            f"{ERASE_LINE + Fore.GREEN}** Step 2 found {ProcessStatus[Step]['IssuesFound']} issues, but they were fixed by deleting the existing Config Recorders and Delivery Channels"
         ) if verbose < 50 else None
         ProcessStatus[Step]["Success"] = True
     elif ProcessStatus[Step]["IssuesFound"] > ProcessStatus[Step]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** Step 2 completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} items found that weren't deleted{Fore.RESET}"
+            f"{ERASE_LINE + Fore.RED}** Step 2 completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} items found that weren't deleted"
         ) if verbose < 50 else None
     else:
-        print(f"{ERASE_LINE + Fore.RED}** Step 2 completed with blockers found{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.RED}** Step 2 completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 3
@@ -399,7 +398,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
     Step = "Step3"
     CTtrails2 = []
     try:
-        print(f"{Fore.BLUE}{Step}:{Fore.RESET}") if verbose < 50 else None
+        print(f"[blue]{Step}:") if verbose < 50 else None
         print(
             f" Checking account {fChildAccountId} for a specially named CloudTrail in all regions"
         ) if verbose < 50 else None
@@ -422,7 +421,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
 
     for _ in range(len(CTtrails2)):
         logging.warning(
-            f"{Fore.RED}Found a CloudTrail trail for account {fChildAccountId} in region {CTtrails2[_]['HomeRegion']} named {CTtrails2[_]['Name']}{Fore.RESET}"
+            f"[red]Found a CloudTrail trail for account {fChildAccountId} in region {CTtrails2[_]['HomeRegion']} named {CTtrails2[_]['Name']}"
         )
         ProcessStatus[Step]["IssuesFound"] += 1
         ProcessStatus[Step]["ProblemsFound"].extend(CTtrails2)
@@ -435,18 +434,18 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
                 print(my_Error)
 
     if ProcessStatus[Step]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues") if verbose < 50 else None
     elif ProcessStatus[Step]["IssuesFound"] - ProcessStatus[Step]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but they were fixed by deleting the existing CloudTrail trail names{Fore.RESET}"
+            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but they were fixed by deleting the existing CloudTrail trail names"
         ) if verbose < 50 else None
         ProcessStatus[Step]["Success"] = True
     elif ProcessStatus[Step]["IssuesFound"] > ProcessStatus[Step]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} trail names found that wasn't deleted{Fore.RESET}"
+            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} trail names found that wasn't deleted"
         ) if verbose < 50 else None
     else:
-        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     """ Step 4
@@ -515,7 +514,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
 	"""
     # try:
     Step = "Step5"
-    print(f"{Fore.BLUE}{Step}:{Fore.RESET}") if verbose < 50 else None
+    print(f"[blue]{Step}:") if verbose < 50 else None
     print(" Checking that the account is part of the AWS Organization.") if verbose < 50 else None
     if not (fChildAccountId in OrgAccountList):
         print() if verbose < 50 else None
@@ -529,18 +528,18 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
         print("Which it is - so ...") if verbose < 50 else None
 
     if ProcessStatus[Step]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues") if verbose < 50 else None
     elif ProcessStatus[Step]["IssuesFound"] - ProcessStatus[Step]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issue, but we were able to fix it{Fore.RESET}"
+            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issue, but we were able to fix it"
         ) if verbose < 50 else None
         ProcessStatus[Step]["Success"] = True
     elif ProcessStatus[Step]["IssuesFound"] > ProcessStatus[Step]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there was {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blocker found that wasn't fixed{Fore.RESET}"
+            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there was {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blocker found that wasn't fixed"
         ) if verbose < 50 else None
     else:
-        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 6
@@ -550,7 +549,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
 
     Step = "Step6"
     try:
-        print(f"{Fore.BLUE}{Step}:{Fore.RESET}") if verbose < 50 else None
+        print(f"[blue]{Step}:") if verbose < 50 else None
         print(
             f" Checking account {fChildAccountId} to make sure it's not already in a Control-Tower managed OU"
         ) if verbose < 50 else None
@@ -567,13 +566,13 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
     # Checking for SNS Topics
     Step = "Step7"
     try:
-        print(f"{Fore.BLUE}{Step}:{Fore.RESET}") if verbose < 50 else None
+        print(f"[blue]{Step}:") if verbose < 50 else None
         print(
             f" Checking account {fChildAccountId} for any SNS topics containing the 'controltower' string"
         ) if verbose < 50 else None
         SNSTopics2 = []
         logging.warning(
-            "Checking account %s in region %s for", fChildAccountId, f"{fRegion + Fore.RED} SNS Topics{Fore.RESET}"
+            "Checking account %s in region %s for", fChildAccountId, f"{fRegion + Fore.RED} SNS Topics"
         )
         print(
             ERASE_LINE, f"Checking account {fChildAccountId} in region {fRegion} for SNS Topics", end="\r"
@@ -596,31 +595,31 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
         ProcessStatus[Step]["Success"] = False
 
     if ProcessStatus[Step]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues") if verbose < 50 else None
     elif ProcessStatus[Step]["IssuesFound"] - ProcessStatus[Step]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but we were able to remove the offending SNS Topics{Fore.RESET}"
+            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but we were able to remove the offending SNS Topics"
         ) if verbose < 50 else None
         ProcessStatus[Step]["Success"] = True
     elif ProcessStatus[Step]["IssuesFound"] > ProcessStatus[Step]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blockers found that wasn't fixed{Fore.RESET}"
+            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blockers found that wasn't fixed"
         ) if verbose < 50 else None
     else:
-        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 8
     # Checking for Lambda functions
     Step = "Step8"
     try:
-        print(f"{Fore.BLUE}{Step}:{Fore.RESET}") if verbose < 50 else None
+        print(f"[blue]{Step}:") if verbose < 50 else None
         print(
             f" Checking account {fChildAccountId} for any Lambda functions containing the 'controltower' string"
         ) if verbose < 50 else None
         LambdaFunctions2 = []
         logging.warning(
-            f"Checking account %s in region %s for {Fore.RED}Lambda functions{Fore.RESET}", fChildAccountId, fRegion
+            f"Checking account %s in region %s for [red]Lambda functions", fChildAccountId, fRegion
         )
         print(
             ERASE_LINE, f"Checking account {fChildAccountId} in region {fRegion} for Lambda Functions", end="\r"
@@ -651,18 +650,18 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
         ProcessStatus[Step]["Success"] = False
 
     if ProcessStatus[Step]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues") if verbose < 50 else None
     elif ProcessStatus[Step]["IssuesFound"] - ProcessStatus[Step]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but we were able to remove the offending Lambda Functions{Fore.RESET}"
+            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but we were able to remove the offending Lambda Functions"
         ) if verbose < 50 else None
         ProcessStatus[Step]["Success"] = True
     elif ProcessStatus[Step]["IssuesFound"] > ProcessStatus[Step]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blockers found that wasn't fixed{Fore.RESET}"
+            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blockers found that wasn't fixed"
         ) if verbose < 50 else None
     else:
-        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 9
@@ -670,12 +669,12 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
     # TODO: Need to find a way to only run this once, instead of for every region.
     Step = "Step9"
     try:
-        print(f"{Fore.BLUE}{Step}:{Fore.RESET}") if verbose < 50 else None
+        print(f"[blue]{Step}:") if verbose < 50 else None
         print(
             f" Checking account {fChildAccountId} for any Role names containing the 'controltower' string"
         ) if verbose < 50 else None
         RoleNames2 = []
-        logging.warning(f"Checking account {Fore.RED}{fChildAccountId}{Fore.RESET} for Role names")
+        logging.warning(f"Checking account [red]{fChildAccountId} for Role names")
         RoleNames = Inventory_Modules.find_role_names2(
             account_credentials, "us-east-1", ["controltower", "ControlTower"]
         )
@@ -695,18 +694,18 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
         ProcessStatus[Step]["Success"] = False
 
     if ProcessStatus[Step]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues") if verbose < 50 else None
     elif ProcessStatus[Step]["IssuesFound"] - ProcessStatus[Step]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but we were able to remove the offending IAM roles{Fore.RESET}"
+            f"{ERASE_LINE + Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but we were able to remove the offending IAM roles"
         ) if verbose < 50 else None
         ProcessStatus[Step]["Success"] = True
     elif ProcessStatus[Step]["IssuesFound"] > ProcessStatus[Step]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blockers found that remain to be fixed{Fore.RESET}"
+            f"{ERASE_LINE + Fore.RED}** {Step} completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blockers found that remain to be fixed"
         ) if verbose < 50 else None
     else:
-        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 10
@@ -715,13 +714,13 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
 
     Step = "Step10"
     try:
-        print(f"{Fore.BLUE}{Step}:{Fore.RESET}") if verbose < 50 else None
+        print(f"[blue]{Step}:") if verbose < 50 else None
         print(
             f"Checking account {fChildAccountId} to make sure there are no duplicate CloudWatch Log Groups"
         ) if verbose < 50 else None
         LogGroupNames2 = []
         logging.warning(
-            f"Checking account {fChildAccountId} for {Fore.RED}duplicate CloudWatch Log Group names{Fore.RESET}"
+            f"Checking account {fChildAccountId} for [red]duplicate CloudWatch Log Group names"
         )
         LogGroupNames = Inventory_Modules.find_cw_log_group_names2(
             account_credentials, fRegion, ["controltower", "ControlTower"]
@@ -742,18 +741,18 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
         ProcessStatus[Step]["Success"] = False
 
     if ProcessStatus[Step]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.GREEN}** {Step} completed with no issues") if verbose < 50 else None
     elif ProcessStatus[Step]["IssuesFound"] - ProcessStatus[Step]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE}{Fore.GREEN}** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but we were able to remove the offending CW Log groups{Fore.RESET}"
+            f"{ERASE_LINE}[green]** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but we were able to remove the offending CW Log groups"
         ) if verbose < 50 else None
         ProcessStatus[Step]["Success"] = True
     elif ProcessStatus[Step]["IssuesFound"] > ProcessStatus[Step]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE}{Fore.RED}** {Step} completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blockers found that remain to be fixed {Fore.RESET}"
+            f"{ERASE_LINE}[red]** {Step} completed, but there were {ProcessStatus[Step]['IssuesFound'] - ProcessStatus[Step]['IssuesFixed']} blockers found that remain to be fixed "
         ) if verbose < 50 else None
     else:
-        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found{Fore.RESET}") if verbose < 50 else None
+        print(f"{ERASE_LINE + Fore.RED}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     """ Function Summary """
@@ -852,36 +851,43 @@ def DoThreadedAccountSteps(fChildAccountList, aws_account, fFixRun, fRegionList=
 
 
 def display_results():
-    print()
-    x = PrettyTable()
-    y = PrettyTable()
-
-    x.field_names = ["Account", "# of Regions", "Issues Found", "Issues Fixed", "Ready?"]
-    y.field_names = [
-        "Account",
-        "Region",
-        "Account Access",
-        "Org Config",
-        "Config",
-        "CloudTrail",
-        "GuardDuty",
-        "Org Member",
-        "CT OU",
-        "SNS Topics",
-        "Lambda",
-        "Roles",
-        "CW Log Groups",
-        "Ready?",
-    ]
+    console.print()
+    x = create_table(
+        title="Account Readiness Summary",
+        columns=[
+            {"header": "Account", "justify": "left"},
+            {"header": "# of Regions", "justify": "center"},
+            {"header": "Issues Found", "justify": "center"},
+            {"header": "Issues Fixed", "justify": "center"},
+            {"header": "Ready?", "justify": "center"},
+        ]
+    )
+    y = create_table(
+        title="Account Issue Details by Region",
+        columns=[
+            {"header": "Account", "justify": "left"},
+            {"header": "Region", "justify": "left"},
+            {"header": "Account Access", "justify": "center"},
+            {"header": "Org Config", "justify": "center"},
+            {"header": "Config", "justify": "center"},
+            {"header": "CloudTrail", "justify": "center"},
+            {"header": "GuardDuty", "justify": "center"},
+            {"header": "Org Member", "justify": "center"},
+            {"header": "CT OU", "justify": "center"},
+            {"header": "SNS Topics", "justify": "center"},
+            {"header": "Lambda", "justify": "center"},
+            {"header": "Roles", "justify": "center"},
+            {"header": "CW Log Groups", "justify": "center"},
+            {"header": "Ready?", "justify": "center"},
+        ]
+    )
     for i in SummarizedOrgResults:
         x.add_row(
-            [
-                SummarizedOrgResults[i]["AccountId"],
-                len(SummarizedOrgResults[i]["Regions"]),
-                SummarizedOrgResults[i]["IssuesFound"],
-                SummarizedOrgResults[i]["IssuesFixed"],
-                SummarizedOrgResults[i]["Ready"],
-            ]
+            SummarizedOrgResults[i]["AccountId"],
+            str(len(SummarizedOrgResults[i]["Regions"])),
+            str(SummarizedOrgResults[i]["IssuesFound"]),
+            str(SummarizedOrgResults[i]["IssuesFixed"]),
+            str(SummarizedOrgResults[i]["Ready"]),
         )
 
     sorted_OrgResults = sorted(OrgResults, key=lambda k: (k["AccountId"], k["Region"]))
@@ -889,40 +895,37 @@ def display_results():
     for i in sorted_OrgResults:
         if pSkipAccounts is not None and i["AccountId"] in pSkipAccounts:
             y.add_row(
-                [
-                    i["AccountId"],
-                    i["Region"],
-                    "N/A",
-                    "N/A",
-                    "N/A",
-                    "N/A",
-                    "N/A",
-                    "N/A",
-                    "N/A",
-                    "N/A",
-                    "N/A",
-                    "N/A",
-                    "Skipped",
-                ]
+                i["AccountId"],
+                i["Region"],
+                "N/A",
+                "N/A",
+                "N/A",
+                "N/A",
+                "N/A",
+                "N/A",
+                "N/A",
+                "N/A",
+                "N/A",
+                "N/A",
+                "N/A",
+                "Skipped",
             )
         else:
-            # x.add_row([i['AccountId'], i['Region'], i['IssuesFound'], i['IssuesFixed'], i['Ready']])
             y.add_row(
-                [
-                    i["AccountId"],
-                    i["Region"],
-                    i["Step0"]["IssuesFound"] - i["Step0"]["IssuesFixed"],
-                    i["Step1"]["IssuesFound"] - i["Step1"]["IssuesFixed"],
-                    i["Step2"]["IssuesFound"] - i["Step2"]["IssuesFixed"],
-                    i["Step3"]["IssuesFound"] - i["Step3"]["IssuesFixed"],
-                    i["Step4"]["IssuesFound"] - i["Step4"]["IssuesFixed"],
-                    i["Step5"]["IssuesFound"] - i["Step5"]["IssuesFixed"],
-                    i["Step6"]["IssuesFound"] - i["Step6"]["IssuesFixed"],
-                    i["Step7"]["IssuesFound"] - i["Step7"]["IssuesFixed"],
-                    i["Step8"]["IssuesFound"] - i["Step8"]["IssuesFixed"],
-                    i["Step9"]["IssuesFound"] - i["Step9"]["IssuesFixed"],
-                    i["Step10"]["IssuesFound"] - i["Step10"]["IssuesFixed"],
-                    i["Step0"]["Success"]
+                i["AccountId"],
+                i["Region"],
+                str(i["Step0"]["IssuesFound"] - i["Step0"]["IssuesFixed"]),
+                str(i["Step1"]["IssuesFound"] - i["Step1"]["IssuesFixed"]),
+                str(i["Step2"]["IssuesFound"] - i["Step2"]["IssuesFixed"]),
+                str(i["Step3"]["IssuesFound"] - i["Step3"]["IssuesFixed"]),
+                str(i["Step4"]["IssuesFound"] - i["Step4"]["IssuesFixed"]),
+                str(i["Step5"]["IssuesFound"] - i["Step5"]["IssuesFixed"]),
+                str(i["Step6"]["IssuesFound"] - i["Step6"]["IssuesFixed"]),
+                str(i["Step7"]["IssuesFound"] - i["Step7"]["IssuesFixed"]),
+                str(i["Step8"]["IssuesFound"] - i["Step8"]["IssuesFixed"]),
+                str(i["Step9"]["IssuesFound"] - i["Step9"]["IssuesFixed"]),
+                str(i["Step10"]["IssuesFound"] - i["Step10"]["IssuesFixed"]),
+                str(i["Step0"]["Success"]
                     and i["Step1"]["Success"]
                     and i["Step2"]["Success"]
                     and i["Step3"]["Success"]
@@ -932,28 +935,27 @@ def display_results():
                     and i["Step7"]["Success"]
                     and i["Step8"]["Success"]
                     and i["Step9"]["Success"]
-                    and i["Step10"]["Success"],
-                ]
+                    and i["Step10"]["Success"]),
             )
-    print(
-        "The following table represents the accounts looked at, and whether they are ready to be incorporated into a Control Tower environment."
+    console.print(
+        "\n[bold cyan]The following table represents the accounts looked at, and whether they are ready to be incorporated into a Control Tower environment.[/bold cyan]"
     )
-    print()
+    console.print()
     if aws_acct.AccountType.lower() == "root" and (
         pChildAccountList is None or aws_acct.acct_number in pChildAccountList
     ):
-        print(
-            f"Please note that for the Org Root account {aws_acct.acct_number}, the number of issues found for 'Org Config' will mistakenly show as 1 per region, since these issues are checked on a per-region basis."
+        console.print(
+            f"[yellow]Please note that for the Org Root account {aws_acct.acct_number}, the number of issues found for 'Org Config' will mistakenly show as 1 per region, since these issues are checked on a per-region basis.[/yellow]"
         )
-        print(
-            f"Additionally, issues found with 'Roles', though global, will show as regional as well. This will be remedied in future versions of this script."
+        console.print(
+            f"[yellow]Additionally, issues found with 'Roles', though global, will show as regional as well. This will be remedied in future versions of this script.[/yellow]"
         )
-    print(x)
-    print()
-    print(
-        "The following table represents the accounts looked at, and gives details under each type of issue as to what might prevent a successful migration of this account into a Control Tower environment."
+    console.print(x)
+    console.print()
+    console.print(
+        "[bold cyan]The following table represents the accounts looked at, and gives details under each type of issue as to what might prevent a successful migration of this account into a Control Tower environment.[/bold cyan]"
     )
-    print(y)
+    console.print(y)
 
     if verbose < 50:
         for account in OrgResults:
@@ -961,21 +963,21 @@ def display_results():
             FixesWorked = account["IssuesFound"] - account["IssuesFixed"] == 0
             if account["Ready"] and account["IssuesFound"] == 0:
                 print(
-                    f"{Fore.GREEN}**** We've found NO issues that would hinder the adoption of account {account['AccountId']} ****{Fore.RESET}"
+                    f"[green]**** We've found NO issues that would hinder the adoption of account {account['AccountId']} ****"
                 )
             elif account["Ready"] and FixesWorked:
                 print(
-                    f"{Fore.GREEN}We've found and fixed{Fore.RED}",
-                    f"{account['IssuesFixed']}{Fore.RESET}",
-                    f"{Fore.GREEN}issues that would have otherwise blocked the adoption of account {account['AccountId']}{Fore.RESET}",
+                    f"[green]We've found and fixed[red]",
+                    f"{account['IssuesFixed']}",
+                    f"[green]issues that would have otherwise blocked the adoption of account {account['AccountId']}",
                 )
             else:
                 print(
-                    f"{Fore.RED}Account # {account['AccountId']} has {account['IssuesFound'] - account['IssuesFixed']} issues that would hinder the adoption of this account{Fore.RESET}"
+                    f"[red]Account # {account['AccountId']} has {account['IssuesFound'] - account['IssuesFixed']} issues that would hinder the adoption of this account"
                 )
             for step in account:
                 if step[:4] == "Step" and len(account[step]["ProblemsFound"]) > 0:
-                    print(f"{Fore.LIGHTRED_EX}Issues Found for {step} in account {account['AccountId']}:{Fore.RESET}")
+                    print(f"{Fore.LIGHTRED_EX}Issues Found for {step} in account {account['AccountId']}:")
                     pprint(account[step]["ProblemsFound"])
 
 
@@ -983,7 +985,7 @@ def setup(fProfile, fRegions):
     f_aws_acct = aws_acct_access(fProfile)
     if not f_aws_acct.Success:
         logging.error(f"Error: {f_aws_acct.ErrorType}")
-        print(f"{Fore.RED}\nThere was an error with profile {fProfile}. Unable to continue.\n{Fore.RESET}")
+        print(f"[red]\nThere was an error with profile {fProfile}. Unable to continue.\n")
         sys.exit(9)
 
     if Quick:
@@ -1092,7 +1094,6 @@ SNS topic created for AWS Config -- not yet implemented
 
 """
 
-ERASE_LINE = "\x1b[2K"
 begin_time = time()
 
 if __name__ == "__main__":
@@ -1102,6 +1103,6 @@ if __name__ == "__main__":
 
 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()