From 92bc3ff910cc4323825c80f5687856131e569804 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 13 Aug 2018 12:41:43 -0700 Subject: [PATCH] Issue 1753: Add support for DescribeSecret - Add helper method to validate the secret identifier from the client. - Update describe_secret to use new helper method. - Insert friendly name into "Name" field of returned description (was SecretId). ***Assumes acceptance of PR 1772. --- moto/secretsmanager/models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/moto/secretsmanager/models.py b/moto/secretsmanager/models.py index b6f3b3d86..bba16ac53 100644 --- a/moto/secretsmanager/models.py +++ b/moto/secretsmanager/models.py @@ -42,6 +42,9 @@ class SecretsManagerBackend(BaseBackend): self.__dict__ = {} self.__init__(region_name) + def _is_valid_identifier(self, identifier): + return identifier in (self.name, self.secret_id) + def get_secret_value(self, secret_id, version_id, version_stage): if self.secret_id == '': @@ -74,12 +77,12 @@ class SecretsManagerBackend(BaseBackend): return response def describe_secret(self, secret_id): - if self.secret_id == '': + if not self._is_valid_identifier(secret_id): raise ResourceNotFoundException response = json.dumps({ "ARN": secret_arn(self.region, self.secret_id), - "Name": self.secret_id, + "Name": self.name, "Description": "", "KmsKeyId": "", "RotationEnabled": self.rotation_enabled,