Merge pull request #78 from aws-ia/devel

Update cleanup config json

Author: gcasilva

scripts/cleanup_config.json

@@ -150,6 +150,26 @@
         "Type" : "IAM_ROLE",
         "Filter" : "sra-management-account-parameters-lambda"
     },
+    {
+        "Type" : "IAM_ROLE",
+        "Filter" : "sra-helper-guardduty-lambda-role"
+    },
+    {
+        "Type" : "IAM_ROLE",
+        "Filter" : "sra-guardduty-codebuild-role"
+    },
+    {
+        "Type" : "IAM_ROLE",
+        "Filter" : "sra-guardduty-codebuild-lambda-role"
+    },
+    {
+        "Type" : "IAM_ROLE",
+        "Filter" : "sra-helper-guardduty-codebuild-role"
+    },
+    {
+        "Type" : "IAM_ROLE",
+        "Filter" : "sra-helper-guardduty-codebuild-lambda-role"
+    },
     {
         "Type" : "STACK_SET",
         "Filter" : "sra-stackset-execution-role"

scripts/cleanup_config.py

@@ -468,7 +468,6 @@ def delete_iam_role(item):
             print(f"..Deleting inline policy {policy} from role {role_name}.")
             iam_session.delete_role_policy(RoleName=role_name, PolicyName=policy)
         print(f"....Deleting role {role_name}.")
-        iam_session
         iam_session.delete_role(RoleName=role_name)
     except Exception as exe:
         if exe.response['Error']['Code'] == 'NoSuchEntity':