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

runbooks/inventory/check_controltower_readiness.py

@@ -8,14 +8,17 @@ from queue import Queue
 from threading import Thread
 from time import time
 
-import Inventory_Modules
-from account_class import aws_acct_access
-from ArgumentsClass import CommonArguments
+from runbooks.inventory import inventory_modules as Inventory_Modules
+from runbooks.inventory.account_class import aws_acct_access
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
-from runbooks.common.rich_utils import console, print_success, print_error, print_info
-from runbooks.common.rich_utils import console, create_table
+from runbooks.common.rich_utils import console, print_success, print_error, print_info, create_table
+from runbooks import __version__
 
-__version__ = "2024.05.18"
+
+
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
 
 script_path, script_name = os.path.split(sys.argv[0])
 parser = CommonArguments()
@@ -210,7 +213,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
             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}"
             )
-            print(Fore.RED, CTRoles, Fore.RESET)
+            console.print(f"[red]{CTRoles}[/red]")
             logging.debug(account_credentials)
             ProcessStatus[Step]["Success"] = False
             sys.exit("Exiting due to cross-account access failure")
@@ -277,18 +280,18 @@ 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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 2
@@ -341,7 +344,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
         logging.warning(
             f"[red]Found a config recorder for account %s in region %s",
             ConfigList[_]["AccountID"],
-            ConfigList[_]["Region"] + Fore.RESET,
+            ConfigList[_]["Region"],
         )
         ProcessStatus[Step]["Success"] = False
         ProcessStatus[Step]["IssuesFound"] += 1
@@ -379,18 +382,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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** 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"
+            f"{ERASE_LINE}** 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"
+            f"{ERASE_LINE}** 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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** Step 2 completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 3
@@ -434,18 +437,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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     """ Step 4
@@ -453,11 +456,11 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
 	# 4. This section checks for a pending guard duty invite. You can also check from the Guard Duty Console
 	Step='Step4'
 	try:
-		print(Fore.BLUE + "{}:".format(Step) + Fore.RESET)
+		print("{}:".format(Step))
 		print(" Checking account {} for any GuardDuty invites".format(fChildAccountId))
 		GDinvites2=[]
 		for region in fRegionList:
-			logging.warning("Checking account %s in region %s for", fChildAccountId, region+Fore.RED+" GuardDuty"+Fore.RESET+" invitations")
+			logging.warning("Checking account %s in region %s for", fChildAccountId, region+" GuardDuty"+" invitations")
 			logging.warning("Checking account %s in region %s for GuardDuty invites", fChildAccountId, region)
 			GDinvites=Inventory_Modules.find_gd_invites(account_credentials, region)
 			if len(GDinvites) > 0:
@@ -475,7 +478,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
 		ProcessStatus[Step]['Success']=False
 
 	for i in range(len(GDinvites2)):
-		logging.warning(Fore.RED+"I found a GuardDuty invitation for account %s in region %s from account %s ", fChildAccountId, GDinvites2[i]['Region'], GDinvites2[i]['AccountId']+Fore.RESET)
+		logging.warning("I found a GuardDuty invitation for account %s in region %s from account %s ", fChildAccountId, GDinvites2[i]['Region'], GDinvites2[i]['AccountId'])
 		ProcessStatus[Step]['IssuesFound']+=1
 		ProcessStatus[Step]['Success']=False
 		if fFixRun:
@@ -489,14 +492,14 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
 					print(my_Error)
 
 	if ProcessStatus[Step]['Success']:
-		print(ERASE_LINE+Fore.GREEN+"** {} completed with no issues".format(Step)+Fore.RESET)
+		print(ERASE_LINE+"** {} completed with no issues".format(Step))
 	elif ProcessStatus[Step]['IssuesFound']-ProcessStatus[Step]['IssuesFixed']==0:
-		print(ERASE_LINE+Fore.GREEN+"** {} found {} guardduty invites, but they were deleted".format(Step,ProcessStatus[Step]['IssuesFound'])+Fore.RESET)
+		print(ERASE_LINE+"** {} found {} guardduty invites, but they were deleted".format(Step,ProcessStatus[Step]['IssuesFound']))
 		ProcessStatus[Step]['Success']=True
 	elif (ProcessStatus[Step]['IssuesFound']>ProcessStatus[Step]['IssuesFixed']):
-		print(ERASE_LINE+Fore.RED+"** {} completed, but there were {} guardduty invites found that couldn't be deleted".format(Step,ProcessStatus[Step]['IssuesFound']-ProcessStatus[Step]['IssuesFixed'])+Fore.RESET)
+		print(ERASE_LINE+"** {} completed, but there were {} guardduty invites found that couldn't be deleted".format(Step,ProcessStatus[Step]['IssuesFound']-ProcessStatus[Step]['IssuesFixed']))
 	else:
-		print(ERASE_LINE+Fore.RED+"** {} completed with blockers found".format(Step)+Fore.RESET)
+		print(ERASE_LINE+"** {} completed with blockers found".format(Step))
 	print()
 	"""
 
@@ -528,18 +531,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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 6
@@ -572,7 +575,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
         ) if verbose < 50 else None
         SNSTopics2 = []
         logging.warning(
-            "Checking account %s in region %s for", fChildAccountId, f"{fRegion + Fore.RED} SNS Topics"
+            "Checking account %s in region %s for SNS Topics", fChildAccountId, fRegion
         )
         print(
             ERASE_LINE, f"Checking account {fChildAccountId} in region {fRegion} for SNS Topics", end="\r"
@@ -595,18 +598,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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 8
@@ -650,18 +653,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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 9
@@ -694,18 +697,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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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"
+            f"{ERASE_LINE}** {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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     # Step 10
@@ -741,7 +744,7 @@ 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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {Step} completed with no issues") if verbose < 50 else None
     elif ProcessStatus[Step]["IssuesFound"] - ProcessStatus[Step]["IssuesFixed"] == 0:
         print(
             f"{ERASE_LINE}[green]** {Step} found {ProcessStatus[Step]['IssuesFound']} issues, but we were able to remove the offending CW Log groups"
@@ -752,7 +755,7 @@ def DoAccountSteps(fChildAccountId, aws_account, fFixRun, fRegion):
             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") if verbose < 50 else None
+        print(f"{ERASE_LINE}** {Step} completed with blockers found") if verbose < 50 else None
     print() if verbose < 50 else None
 
     """ Function Summary """
@@ -977,7 +980,7 @@ def display_results():
                 )
             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']}:")
+                    print(f"[red]Issues Found for {step} in account {account['AccountId']}:[/red]")
                     pprint(account[step]["ProblemsFound"])
 
 

runbooks/inventory/check_landingzone_readiness.py

@@ -3,15 +3,19 @@
 import logging
 import sys
 
-import ec2_vpc_utils as vpc_modules
-import Inventory_Modules
-from account_class import aws_acct_access
-from ArgumentsClass import CommonArguments
+from runbooks.inventory import ec2_vpc_utils as vpc_modules
+from runbooks.inventory import inventory_modules as Inventory_Modules
+from runbooks.inventory.account_class import aws_acct_access
+from runbooks.inventory.ArgumentsClass import CommonArguments
 from botocore.exceptions import ClientError
 from runbooks.common.rich_utils import console, print_success, print_error, print_info
 from runbooks.common.rich_utils import console, create_table
+from runbooks import __version__
 
-__version__ = "2023.05.04"
+
+
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
 
 parser = CommonArguments()
 parser.singleprofile()
@@ -222,11 +226,11 @@ if aws_account.AccountType.lower() == "root" and pChildAccountId is None:
     )
 elif pChildAccountId is None:
     sys.exit(
-        f"Account {aws_account.acct_number} is a {aws_account.AccountType} account. This script should be run with Management Account credentials."
+        f"Account {aws_account.acct_num} is a {aws_account.AccountType} account. This script should be run with Management Account credentials."
     )
 else:
     print(
-        f"Account {aws_account.acct_number} is a {aws_account.AccountType} account."
+        f"Account {aws_account.acct_num} is a {aws_account.AccountType} account."
         f"We're checking to validate that account {pChildAccountId} can be adopted into the Landing Zone"
     )
     ChildAccountList = [pChildAccountId]
@@ -285,7 +289,7 @@ for childaccount in ChildAccountList:
             continue
         else:
             logging.error(
-                f"Was able to successfully connect to account {childaccount} using credentials from account {aws_account.acct_number}... "
+                f"Was able to successfully connect to account {childaccount} using credentials from account {aws_account.acct_num}... "
             )
             print()
             print(f"[green]** Step 0 completed without issues")
@@ -362,18 +366,18 @@ for childaccount in ChildAccountList:
 
     print()
     if ProcessStatus[childaccount]["Step1"]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** Step 1 completed with no issues")
+        print(f"{ERASE_LINE}** Step 1 completed with no issues")
     elif ProcessStatus[childaccount]["Step1"]["IssuesFound"] - ProcessStatus[childaccount]["Step1"]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** Step 1 found {ProcessStatus[childaccount]['Step1']['IssuesFound']} issues, but they were fixed by deleting the default vpcs"
+            f"{ERASE_LINE}** Step 1 found {ProcessStatus[childaccount]['Step1']['IssuesFound']} issues, but they were fixed by deleting the default vpcs"
         )
         ProcessStatus[childaccount]["Step1"]["Success"] = True
     elif ProcessStatus[childaccount]["Step1"]["IssuesFound"] > ProcessStatus[childaccount]["Step1"]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** Step 1 completed, but there were {ProcessStatus[childaccount]['Step1']['IssuesFound'] - ProcessStatus[childaccount]['Step1']['IssuesFixed']} vpcs that couldn't be fixed"
+            f"{ERASE_LINE}** Step 1 completed, but there were {ProcessStatus[childaccount]['Step1']['IssuesFound'] - ProcessStatus[childaccount]['Step1']['IssuesFixed']} vpcs that couldn't be fixed"
         )
     else:
-        print(f"{ERASE_LINE + Fore.RED}** Step 1 completed with blockers found")
+        print(f"{ERASE_LINE}** Step 1 completed with blockers found")
 
     # 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.
@@ -422,7 +426,7 @@ for childaccount in ChildAccountList:
         logging.error(
             f"[red]Found a config recorder for account %s in region %s",
             ConfigList[i]["AccountID"],
-            ConfigList[i]["Region"] + Fore.RESET,
+            ConfigList[i]["Region"],
         )
         ProcessStatus[childaccount]["Step2"]["IssuesFound"] += 1
         config_deliv_channels_found = True
@@ -442,7 +446,7 @@ for childaccount in ChildAccountList:
         logging.error(
             f"[red]I found a delivery channel for account %s in region %s",
             DeliveryChanList[i]["AccountID"],
-            DeliveryChanList[i]["Region"] + Fore.RESET,
+            DeliveryChanList[i]["Region"],
         )
         ProcessStatus[childaccount]["Step2"]["IssuesFound"] += 1
         config_deliv_channels_found = True
@@ -464,18 +468,18 @@ for childaccount in ChildAccountList:
         ProcessStatus[childaccount]["Step2"]["Success"] = True
 
     if ProcessStatus[childaccount]["Step2"]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** Step 2 completed with no issues")
+        print(f"{ERASE_LINE}** Step 2 completed with no issues")
     elif ProcessStatus[childaccount]["Step2"]["IssuesFound"] - ProcessStatus[childaccount]["Step2"]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** Step 2 found {ProcessStatus[childaccount]['Step2']['IssuesFound']} issues, but they were fixed by deleting the existing Config Recorders and Delivery Channels"
+            f"{ERASE_LINE}** Step 2 found {ProcessStatus[childaccount]['Step2']['IssuesFound']} issues, but they were fixed by deleting the existing Config Recorders and Delivery Channels"
         )
         ProcessStatus[childaccount]["Step2"]["Success"] = True
     elif ProcessStatus[childaccount]["Step2"]["IssuesFound"] > ProcessStatus[childaccount]["Step2"]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** Step 2 completed, but there were {ProcessStatus[childaccount]['Step2']['IssuesFound'] - ProcessStatus[childaccount]['Step2']['IssuesFixed']} items found that couldn't be deleted"
+            f"{ERASE_LINE}** Step 2 completed, but there were {ProcessStatus[childaccount]['Step2']['IssuesFound'] - ProcessStatus[childaccount]['Step2']['IssuesFixed']} items found that couldn't be deleted"
         )
     else:
-        print(f"{ERASE_LINE + Fore.RED}** Step 2 completed with blockers found")
+        print(f"{ERASE_LINE}** Step 2 completed with blockers found")
     print()
 
     # Step 3
@@ -521,18 +525,18 @@ for childaccount in ChildAccountList:
         ProcessStatus[childaccount]["Step3"]["Success"] = True
 
     if ProcessStatus[childaccount]["Step3"]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** Step 3 completed with no issues")
+        print(f"{ERASE_LINE}** Step 3 completed with no issues")
     elif ProcessStatus[childaccount]["Step3"]["IssuesFound"] - ProcessStatus[childaccount]["Step3"]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** Step 3 found {ProcessStatus[childaccount]['Step3']['IssuesFound']} issues, but they were fixed by deleting the existing CloudTrail trail names"
+            f"{ERASE_LINE}** Step 3 found {ProcessStatus[childaccount]['Step3']['IssuesFound']} issues, but they were fixed by deleting the existing CloudTrail trail names"
         )
         ProcessStatus[childaccount]["Step3"]["Success"] = True
     elif ProcessStatus[childaccount]["Step3"]["IssuesFound"] > ProcessStatus[childaccount]["Step3"]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** Step 3 completed, but there were {ProcessStatus[childaccount]['Step3']['IssuesFound'] - ProcessStatus[childaccount]['Step3']['IssuesFixed']} trail names found that couldn't be deleted"
+            f"{ERASE_LINE}** Step 3 completed, but there were {ProcessStatus[childaccount]['Step3']['IssuesFound'] - ProcessStatus[childaccount]['Step3']['IssuesFixed']} trail names found that couldn't be deleted"
         )
     else:
-        print(f"{ERASE_LINE + Fore.RED}** Step 3 completed with blockers found")
+        print(f"{ERASE_LINE}** Step 3 completed with blockers found")
     print()
 
     # Step 4
@@ -571,7 +575,7 @@ for childaccount in ChildAccountList:
             f"[red]I found a GuardDuty invitation for account %s in region %s from account %s ",
             childaccount,
             GDinvites2[i]["Region"],
-            GDinvites2[i]["AccountId"] + Fore.RESET,
+            GDinvites2[i]["AccountId"],
         )
         ProcessStatus[childaccount]["Step4"]["IssuesFound"] += 1
         if FixRun:
@@ -591,18 +595,18 @@ for childaccount in ChildAccountList:
         ProcessStatus[childaccount]["Step4"]["Success"] = True
 
     if ProcessStatus[childaccount]["Step4"]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** Step 4 completed with no issues")
+        print(f"{ERASE_LINE}** Step 4 completed with no issues")
     elif ProcessStatus[childaccount]["Step4"]["IssuesFound"] - ProcessStatus[childaccount]["Step4"]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** Step 4 found {ProcessStatus[childaccount]['Step4']['IssuesFound']} guardduty invites, but they were deleted"
+            f"{ERASE_LINE}** Step 4 found {ProcessStatus[childaccount]['Step4']['IssuesFound']} guardduty invites, but they were deleted"
         )
         ProcessStatus[childaccount]["Step4"]["Success"] = True
     elif ProcessStatus[childaccount]["Step4"]["IssuesFound"] > ProcessStatus[childaccount]["Step4"]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** Step 4 completed, but there were {ProcessStatus[childaccount]['Step4']['IssuesFound'] - ProcessStatus[childaccount]['Step4']['IssuesFixed']} guardduty invites found that couldn't be deleted"
+            f"{ERASE_LINE}** Step 4 completed, but there were {ProcessStatus[childaccount]['Step4']['IssuesFound'] - ProcessStatus[childaccount]['Step4']['IssuesFixed']} guardduty invites found that couldn't be deleted"
         )
     else:
-        print(f"{ERASE_LINE + Fore.RED}** Step 4 completed with blockers found")
+        print(f"{ERASE_LINE}** Step 4 completed with blockers found")
     print()
 
     """
@@ -629,18 +633,18 @@ for childaccount in ChildAccountList:
         ProcessStatus[childaccount]["Step5"]["IssuesFound"] += 1
 
     if ProcessStatus[childaccount]["Step5"]["Success"]:
-        print(f"{ERASE_LINE + Fore.GREEN}** Step 5 completed with no issues")
+        print(f"{ERASE_LINE}** Step 5 completed with no issues")
     elif ProcessStatus[childaccount]["Step5"]["IssuesFound"] - ProcessStatus[childaccount]["Step5"]["IssuesFixed"] == 0:
         print(
-            f"{ERASE_LINE + Fore.GREEN}** Step 5 found {ProcessStatus[childaccount]['Step5']['IssuesFound']} issues, but we were able to move the account into the they were able to be fixed"
+            f"{ERASE_LINE}** Step 5 found {ProcessStatus[childaccount]['Step5']['IssuesFound']} issues, but we were able to move the account into the they were able to be fixed"
         )
         ProcessStatus[childaccount]["Step5"]["Success"] = True
     elif ProcessStatus[childaccount]["Step5"]["IssuesFound"] > ProcessStatus[childaccount]["Step5"]["IssuesFixed"]:
         print(
-            f"{ERASE_LINE + Fore.RED}** Step 5 completed, but there were {ProcessStatus[childaccount]['Step5']['IssuesFound'] - ProcessStatus[childaccount]['Step5']['IssuesFixed']} blockers found that couldn't be fixed"
+            f"{ERASE_LINE}** Step 5 completed, but there were {ProcessStatus[childaccount]['Step5']['IssuesFound'] - ProcessStatus[childaccount]['Step5']['IssuesFixed']} blockers found that couldn't be fixed"
         )
     else:
-        print(f"{ERASE_LINE + Fore.RED}** Step 5 completed with blockers found")
+        print(f"{ERASE_LINE}** Step 5 completed with blockers found")
     print()
 
     print(f"[cyan]Account {childaccount} is complete. {accountsleft} more to go!!")

runbooks/inventory/cloud_foundations_integration.py

@@ -28,6 +28,8 @@ from botocore.exceptions import ClientError, ProfileNotFound
 
 # Import runbooks enterprise standards
 from runbooks.common.rich_utils import (
+
+# Terminal control constants
     console,
     print_header,
     print_success,
@@ -37,9 +39,11 @@ from runbooks.common.rich_utils import (
     create_progress_bar,
     create_panel,
 )
-from runbooks.common.profile_utils import get_profile_for_operation
 
-__version__ = "1.0.0"
+# Terminal control constants
+ERASE_LINE = '\x1b[2K'
+from runbooks.common.profile_utils import get_profile_for_operation
+from runbooks import __version__
 
 
 @dataclass
@@ -368,7 +372,8 @@ Organizational Units: {len(structured_accounts)}
 Session Cache: {len(self.session_cache)} active sessions
         """
 
-        summary_panel = create_panel(summary_text, title="Organization Summary", style="green")
+        from rich.panel import Panel
+        summary_panel = Panel(summary_text.strip(), title="[bold green]Organization Summary[/bold green]", border_style="green")
         console.print(summary_panel)
 
 

runbooks/inventory/collectors/aws_compute.py

@@ -114,24 +114,72 @@ class ComputeResourceCollector(BaseResourceCollector):
     def _collect_ec2_instances(
         self, ec2_client: boto3.client, context: CollectionContext, filters: Dict[str, Any]
     ) -> List[AWSResource]:
-        """Collect EC2 instances."""
+        """
+        Collect EC2 instances with optional state filtering.
+
+        Args:
+            ec2_client: boto3 EC2 client
+            context: Collection context
+            filters: Resource filters including optional 'status' for instance state
+
+        Returns:
+            List of EC2 instance resources
+        """
         resources = []
 
         try:
-            paginator = ec2_client.get_paginator("describe_instances")
+            # Build boto3 Filters parameter for AWS API call
+            api_filters = []
+            if filters.get("status"):
+                api_filters.append({
+                    "Name": "instance-state-name",
+                    "Values": [filters["status"]]  # "running" or "stopped"
+                })
+                logger.info(f"EC2 filtering: instance-state-name={filters['status']}")
 
-            for page in paginator.paginate():
-                for reservation in page["Reservations"]:
-                    for instance in reservation["Instances"]:
-                        resource = self._create_ec2_instance_resource(instance, context)
-                        if resource:
-                            resources.append(resource)
+            paginator = ec2_client.get_paginator("describe_instances")
 
-            logger.debug(f"Collected {len(resources)} EC2 instances")
+            # Apply filters to AWS API call if present
+            if api_filters:
+                logger.debug(f"Applying boto3 Filters to describe_instances: {api_filters}")
+                for page in paginator.paginate(Filters=api_filters):
+                    for reservation in page["Reservations"]:
+                        for instance in reservation["Instances"]:
+                            resource = self._create_ec2_instance_resource(instance, context)
+                            if resource:
+                                resources.append(resource)
+            else:
+                # Backward compatibility: No filters provided
+                for page in paginator.paginate():
+                    for reservation in page["Reservations"]:
+                        for instance in reservation["Instances"]:
+                            resource = self._create_ec2_instance_resource(instance, context)
+                            if resource:
+                                resources.append(resource)
+
+            logger.debug(f"Collected {len(resources)} EC2 instances (filtered: {bool(api_filters)})")
 
         except ClientError as e:
-            logger.error(f"Failed to collect EC2 instances: {e}")
-            raise
+            error_code = e.response.get('Error', {}).get('Code', 'Unknown')
+
+            # Graceful degradation for permission errors
+            if error_code in ['UnauthorizedOperation', 'AccessDenied']:
+                logger.warning(f"Insufficient permissions for EC2 filtering, collecting all instances: {error_code}")
+                # Fallback to unfiltered collection
+                try:
+                    for page in paginator.paginate():
+                        for reservation in page["Reservations"]:
+                            for instance in reservation["Instances"]:
+                                resource = self._create_ec2_instance_resource(instance, context)
+                                if resource:
+                                    resources.append(resource)
+                    logger.debug(f"Collected {len(resources)} EC2 instances (fallback mode)")
+                except Exception as fallback_error:
+                    logger.error(f"Fallback collection also failed: {fallback_error}")
+                    raise
+            else:
+                logger.error(f"Failed to collect EC2 instances: {e}")
+                raise
 
         return resources