Catches errors relating to attempting to attach policies to entities …

…where they are already attached.
stelligent · May 30, 2018 · eb36974 · eb36974
1 parent d868d59
commit eb36974
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/cumulogenesis/services/organization.py b/cumulogenesis/services/organization.py
@@ -126,7 +126,13 @@ def update_entity_policy_attachments(self, org_model, target_id, old_policies, n
             if policy not in old_policies:
                 logger.info('Adding policy association for %s to target %s', policy, target_id)
                 policy_id = org_model.updated_model.policies[policy]['id']
-                self.client.attach_policy(PolicyId=policy_id, TargetId=target_id)
+                try:
+                    self.client.attach_policy(PolicyId=policy_id, TargetId=target_id)
+                except botocore.exceptions.ClientError as err:
+                    if 'DuplicatePolicyAttachmentException' in str(err):
+                        logger.warning('Policy %s is already attached to target %s', policy, target_id)
+                    else:
+                        raise
         for policy in old_policies:
             if policy not in new_policies:
                 logger.info('Removing policy association for %s to target %s', policy, target_id)