From b1a8ae829961e105fc1d96adb5355cd696db4232 Mon Sep 17 00:00:00 2001 From: zane Date: Sat, 9 Jun 2018 23:42:33 -0700 Subject: [PATCH] Updating tests --- moto/secretsmanager/models.py | 13 +++++++------ moto/secretsmanager/responses.py | 6 +++--- tests/test_secretsmanager/test_server.py | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/moto/secretsmanager/models.py b/moto/secretsmanager/models.py index 4d95be48b..85f9c8a51 100644 --- a/moto/secretsmanager/models.py +++ b/moto/secretsmanager/models.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -import datetime +import time import json import boto3 @@ -13,26 +13,27 @@ class SecretsManager(BaseModel): def __init__(self, region_name, **kwargs): self.secret_id = kwargs.get('secret_id', '') self.version_id = kwargs.get('version_id', '') - self.string_id = kwargs.get('string_id', '') + self.version_stage = kwargs.get('version_stage', '') class SecretsManagerBackend(BaseBackend): - def __init__(self, region_name=None): + def __init__(self, region_name=None, **kwargs): super(SecretsManagerBackend, self).__init__() self.region = region_name + self.secret_id = kwargs.get('secret_id', '') + self.createdate = int(time.time()) - def get_secret_value(self, secret_id, version_id, string_id): + def get_secret_value(self, secret_id, version_id, version_stage): response = json.dumps({ "ARN": self.secret_arn(), "Name": self.secret_id, "VersionId": "A435958A-D821-4193-B719-B7769357AER4", - "SecretBinary": b"testbytes", "SecretString": "mysecretstring", "VersionStages": [ "AWSCURRENT", ], - "CreatedDate": datetime.datetime.utcnow() + "CreatedDate": "2018-05-23 13:16:57.198000" }) return response diff --git a/moto/secretsmanager/responses.py b/moto/secretsmanager/responses.py index 10d67ae6e..144a254ec 100644 --- a/moto/secretsmanager/responses.py +++ b/moto/secretsmanager/responses.py @@ -8,9 +8,9 @@ from .models import secretsmanager_backends class SecretsManagerResponse(BaseResponse): def get_secret_value(self): - secret_id = self.get_param('SecretId') - version_id = self.get_param('VersionId') - version_stage = self.get_param('VersionStage') + secret_id = self._get_param('SecretId') + version_id = self._get_param('VersionId') + version_stage = self._get_param('VersionStage') return secretsmanager_backends[self.region].get_secret_value( secret_id=secret_id, version_id=version_id, diff --git a/tests/test_secretsmanager/test_server.py b/tests/test_secretsmanager/test_server.py index 9089c9407..142e9fe7d 100644 --- a/tests/test_secretsmanager/test_server.py +++ b/tests/test_secretsmanager/test_server.py @@ -14,7 +14,7 @@ Test the different server responses @mock_secretsmanager def test_get_secret_value(): - backend = server.create_backend_app("secretsmanager-get-secret-value") + backend = server.create_backend_app("secretsmanager") test_client = backend.test_client() res = test_client.post('/', @@ -24,4 +24,4 @@ def test_get_secret_value(): ) json_data = json.loads(res.data.decode("utf-8")) - assert json_data['SecretId'] == "test" + assert json_data['SecretString'] == "mysecretstring"