Merge pull request #792 from ministryofjustice/ag--fix-delete-app-whe…

…n-no-role

Fix delete app/user when IAM role doesn't exist

controlpanel/api/aws.py

@@ -3,6 +3,7 @@
 import logging
 
 import boto3
+import botocore
 from django.conf import settings
 
 
@@ -181,9 +182,11 @@ def delete_role(name):
     try:
         role = boto3.resource('iam').Role(name)
         role.load()
-    except role.meta.client.exceptions.NoSuchEntityException:
-        log.warning(f'Skipping delete of Role {name}: Does not exist')
-        return
+    except botocore.exceptions.ClientError as e:
+        if e.response["Error"]["Code"] == "NoSuchEntity":
+            log.warning(f'Skipping delete of Role {name}: Does not exist')
+            return
+        raise e
 
     for policy in role.attached_policies.all():
         role.detach_policy(PolicyArn=policy.arn)