Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1772 from NeilRoberts/handle_secret_name_and_id_properly_issue-1770

Browse Source 
Issue 1770: Deal with the friendly name properly
This commit is contained in:
Steve Pulec 2018-08-13 20:31:08 -04:00 committed by GitHub
commit 93c9a51fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
moto/secretsmanager/models.py
View File

@ -41,12 +41,12 @@ class SecretsManagerBackend(BaseBackend):
def get_secret_value(self, secret_id, version_id, version_stage): def get_secret_value(self, secret_id, version_id, version_stage):
if self.secret_id == '': if secret_id not in (self.secret_id, self.name):
raise ResourceNotFoundException() raise ResourceNotFoundException()
response = json.dumps({ response = json.dumps({
"ARN": secret_arn(self.region, self.secret_id), "ARN": secret_arn(self.region, self.secret_id),
"Name": self.secret_id, "Name": self.name,
"VersionId": "A435958A-D821-4193-B719-B7769357AER4", "VersionId": "A435958A-D821-4193-B719-B7769357AER4",
"SecretString": self.secret_string, "SecretString": self.secret_string,
"VersionStages": [ "VersionStages": [
@ -61,10 +61,11 @@ class SecretsManagerBackend(BaseBackend):
self.secret_string = secret_string self.secret_string = secret_string
self.secret_id = name self.secret_id = name
self.name = name
response = json.dumps({ response = json.dumps({
"ARN": secret_arn(self.region, name), "ARN": secret_arn(self.region, name),
"Name": self.secret_id, "Name": self.name,
"VersionId": "A435958A-D821-4193-B719-B7769357AER4", "VersionId": "A435958A-D821-4193-B719-B7769357AER4",
}) })

9
tests/test_secretsmanager/test_secretsmanager.py
View File

@ -25,6 +25,15 @@ def test_get_secret_that_does_not_exist():
with assert_raises(ClientError): with assert_raises(ClientError):
result = conn.get_secret_value(SecretId='i-dont-exist') result = conn.get_secret_value(SecretId='i-dont-exist')
@mock_secretsmanager
def test_get_secret_with_mismatched_id():
conn = boto3.client('secretsmanager', region_name='us-west-2')
create_secret = conn.create_secret(Name='java-util-test-password',
SecretString="foosecret")
with assert_raises(ClientError):
result = conn.get_secret_value(SecretId='i-dont-exist')
@mock_secretsmanager @mock_secretsmanager
def test_create_secret(): def test_create_secret():
conn = boto3.client('secretsmanager', region_name='us-east-1') conn = boto3.client('secretsmanager', region_name='us-east-1')