Cleanup fix - add ability to change AcceleratorName (#684)

* edited to support cleanup without directory services enabled
* added ability to change AcceleratorName in prefix
* corrected pattern matching for codecommit
* corrected repo name
* corrected to reference AccaleratorPrefix
* tweak readme.md

Co-authored-by: Charlie Llewellyn <cjl@amazon.co.uk>
Co-authored-by: Brian969 <56414362+Brian969@users.noreply.github.com>

Author: 3 people

reference-artifacts/Custom-Scripts/SEA-uninstall/README.md

@@ -72,7 +72,10 @@ The logic of the script is the following:
 
 3. Before running this script you must manually delete AWS SSO.
 
-4. Execute the script `python3 aws-sea-cleanup.py`
+4. Execute the script `python3 aws-sea-cleanup.py`.
+
+**Note: ** if you used a different AcceleratorPrefix you can use `python3 aws-sea-cleanup.py --AcceleratorPrefix YOUR_ACCELERATOR_PREFIX`.
+
 5. Manual steps (in the Organization Management account):
    - In Secrets Manager, set the Secret `accelerator/config/last-successful-commit` to an empty string;
    - In DynamoDB, delete the 3 `PBMMAccel-*` tables;

reference-artifacts/Custom-Scripts/SEA-uninstall/aws-sea-cleanup.py

@@ -9,13 +9,15 @@
 import sys
 import argparse
 import base64
+import re
 from tabulate import tabulate
 from os import path
 
 
 parser = argparse.ArgumentParser(
         description="A development script that cleans up resources deployed by the accelerator. Use Administrator AWS credentials in the master account when running this script."
 )
+parser.add_argument('--AcceleratorPrefix', default='PBMMAccel', help='The value set in AcceleratorPrefix')
 
 organizations = boto3.client("organizations")
 sts = boto3.client("sts")
@@ -243,7 +245,7 @@ def delete_scps(credentials, region):
 
     for scp in scps["Policies"]:
         scp_name = scp["Name"]
-        if scp_name.startswith("PBMMAccel"):
+        if scp_name.startswith(AcceleratorPrefix):
             print("Detaching SCP '{}'".format(scp["Name"]))
             targets = organizations.list_targets_for_policy(PolicyId=scp["Id"])
 
@@ -279,7 +281,7 @@ def master_cleanup(credentials, region):
 
     for stackset in stacksets["Summaries"]:
         name = stackset["StackSetName"]
-        if name.startswith("PBMMAccel"):
+        if name.startswith(AcceleratorPrefix):
             instances = cloudformation.list_stack_instances(StackSetName=name)
             instances_accounts = list(map(lambda x: x["Account"], instances["Summaries"]))
             instances_regions = list(set(map(lambda x: x["Region"], instances["Summaries"])))
@@ -309,7 +311,7 @@ def master_cleanup(credentials, region):
             print("Done. Stack {} deleted".format(name))
 
 
-    cloud_trail_name = "PBMMAccel-Org-Trail"
+    cloud_trail_name = AcceleratorPrefix + "-Org-Trail"
     cloudtrail = boto3.client("cloudtrail", 
             region_name=region,
             aws_access_key_id=credentials["Credentials"]["AccessKeyId"],
@@ -704,7 +706,7 @@ def thread_cwl_cleanup(region, admin_role_arn, accountId):
     while True:
 
         for log_group in log_groups["logGroups"]:
-            if "PBMMAccel-" in log_group["logGroupName"]:
+            if AcceleratorPrefix  in log_group["logGroupName"]:
                 print("Deleting log group '{}' in {} for {}".format(log_group["logGroupName"], region, accountId))
                 cwl.delete_log_group(logGroupName=log_group["logGroupName"])
                 print("Deleting log group '{}' in {} for {}".format(log_group["logGroupName"], region, accountId))
@@ -817,6 +819,9 @@ def cleanup_directory_sharing_load_config():
         mad_account =  config["mandatory-account-configs"][mad_account_name]["account-name"]
         if "mad" not in config["mandatory-account-configs"][mad_account_name]["deployments"]:
             return "mad not configured"
+        elif config["mandatory-account-configs"][mad_account_name]["deployments"]["mad"] == False:
+            return "mad not configured"
+
         mad_dns_domain  =  config["mandatory-account-configs"][mad_account_name]["deployments"]["mad"]["dns-domain"]
 
 
@@ -872,6 +877,8 @@ def cleanup_route53_resolver_load_config():
         central_account_name = config["global-options"]["central-operations-services"]["account"]
         if "mad" not in config["mandatory-account-configs"][central_account_name]["deployments"]:
             return "mad not configured"
+        elif config["mandatory-account-configs"][central_account_name]["deployments"]["mad"] == False:
+            return "mad not configured"
 
         central_resolver_rule_account =  config["mandatory-account-configs"][central_account_name]["deployments"]["mad"]["central-resolver-rule-account"]
 
@@ -916,7 +923,11 @@ def backup_config():
         print("Backing up config.json from CodeCommit...")
         try:
             for repo in repos["repositories"]:
-                if repo["repositoryName"].startswith("PBMM"):
+                if AcceleratorPrefix != 'PBMMAccel':
+                    CodeCommitPrefix = AcceleratorPrefix
+                else:
+                    CodeCommitPrefix = 'PBMM'
+                if repo["repositoryName"].startswith(CodeCommitPrefix):
                     file = cc.get_file(
                         repositoryName=repo["repositoryName"],
                         filePath='/config.json'
@@ -936,8 +947,11 @@ def backup_config():
 
 def configure_args(): 
     parser.parse_args()
+    args = parser.parse_args()
+    AcceleratorPrefix = re.sub('-$', '', args.AcceleratorPrefix)
+    return AcceleratorPrefix
 
 if __name__ == "__main__":
-    configure_args()
+    AcceleratorPrefix = configure_args()
     backup_config()
     cleanup()