From 4f34af95bc0a3ac1a3b980ba772118f5e8e81d41 Mon Sep 17 00:00:00 2001 From: mattsb42-aws Date: Fri, 13 Sep 2019 13:35:55 -0700 Subject: [PATCH] remove dead code because the key ID validation is now centralized, by the time this code would have been reached, we know that the key ID exists, so a KeyError will never be thrown --- moto/kms/responses.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/moto/kms/responses.py b/moto/kms/responses.py index baa55295..998d5cc4 100644 --- a/moto/kms/responses.py +++ b/moto/kms/responses.py @@ -152,13 +152,10 @@ class KmsResponse(BaseResponse): self._validate_key_id(key_id) - try: - key = self.kms_backend.describe_key( - self.kms_backend.get_key_id(key_id)) - except KeyError: - headers = dict(self.headers) - headers['status'] = 404 - return "{}", headers + key = self.kms_backend.describe_key( + self.kms_backend.get_key_id(key_id) + ) + return json.dumps(key.to_dict()) def list_keys(self):