simplify kms tags parsing

dowjones · Dec 17, 2018 · 45a2eea · 45a2eea
1 parent dc2dbeb
commit 45a2eea
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/hammer/library/aws/kms.py b/hammer/library/aws/kms.py
@@ -127,19 +127,14 @@ def check(self, keys_to_check=None):
                     return False
 
                 try:
-                    tags_response = self.account.client("kms").list_resource_tags(KeyId=key_id)
-                    tags = {}
-                    if "Tags" in tags_response:
-                        tags = tags_response["Tags"]
+                    tags = self.account.client("kms").list_resource_tags(KeyId=key_id).get("Tags", [])
                 except ClientError as err:
                     if err.response['Error']['Code'] in ["AccessDenied", "UnauthorizedOperation"]:
                         logging.error(f"Access denied in {self.account} "
                                       f"(kms:{err.operation_name}, "
                                       f"resource='{key_id}')")
-                        continue
                     else:
                         logging.exception(f"Failed to get '{key_id}' tags in {self.account}")
-                        continue
 
                 key = KMSKey(account=self.account, key_id=key_id, key_arn=key_arn, tags=tags,
                              key_rotation_enabled=key_rotation_enabled)