From 08d17a7a13f6ea9d655a3b336f1cc595ee9c4ff4 Mon Sep 17 00:00:00 2001
From: zane <zane.williamson@gmail.com>
Date: Fri, 21 Dec 2018 14:04:52 -0800
Subject: [PATCH] adding Tags support

---
 moto/secretsmanager/models.py                   | 12 ++++--------
 moto/secretsmanager/responses.py                |  4 +++-
 .../test_secretsmanager/test_secretsmanager.py  | 17 +++++++++++++++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/moto/secretsmanager/models.py b/moto/secretsmanager/models.py
index 7f89e2eb6..1350ab469 100644
--- a/moto/secretsmanager/models.py
+++ b/moto/secretsmanager/models.py
@@ -56,7 +56,7 @@ class SecretsManagerBackend(BaseBackend):
 
         return response
 
-    def create_secret(self, name, secret_string, **kwargs):
+    def create_secret(self, name, secret_string, tags, **kwargs):
 
         generated_version_id = str(uuid.uuid4())
 
@@ -68,7 +68,8 @@ class SecretsManagerBackend(BaseBackend):
             'rotation_enabled': False,
             'rotation_lambda_arn': '',
             'auto_rotate_after_days': 0,
-            'version_id': generated_version_id
+            'version_id': generated_version_id,
+            'tags': tags
         }
 
         self.secrets[name] = secret
@@ -101,12 +102,7 @@ class SecretsManagerBackend(BaseBackend):
             "LastChangedDate": None,
             "LastAccessedDate": None,
             "DeletedDate": None,
-            "Tags": [
-                {
-                    "Key": "",
-                    "Value": ""
-                },
-            ]
+            "Tags": secret['tags']
         })
 
         return response
diff --git a/moto/secretsmanager/responses.py b/moto/secretsmanager/responses.py
index b8b6872a8..932e7bfd7 100644
--- a/moto/secretsmanager/responses.py
+++ b/moto/secretsmanager/responses.py
@@ -19,9 +19,11 @@ class SecretsManagerResponse(BaseResponse):
     def create_secret(self):
         name = self._get_param('Name')
         secret_string = self._get_param('SecretString')
+        tags = self._get_param('Tags', if_none=[])
         return secretsmanager_backends[self.region].create_secret(
             name=name,
-            secret_string=secret_string
+            secret_string=secret_string,
+            tags=tags
         )
 
     def get_random_password(self):
diff --git a/tests/test_secretsmanager/test_secretsmanager.py b/tests/test_secretsmanager/test_secretsmanager.py
index 0e0b98b1e..169282421 100644
--- a/tests/test_secretsmanager/test_secretsmanager.py
+++ b/tests/test_secretsmanager/test_secretsmanager.py
@@ -44,6 +44,23 @@ def test_create_secret():
     secret = conn.get_secret_value(SecretId='test-secret')
     assert secret['SecretString'] == 'foosecret'
 
+@mock_secretsmanager
+def test_create_secret_with_tags():
+    conn = boto3.client('secretsmanager', region_name='us-east-1')
+    secret_name = 'test-secret-with-tags'
+
+    result = conn.create_secret(
+        Name=secret_name,
+        SecretString="foosecret",
+        Tags=[{"Key": "Foo", "Value": "Bar"}, {"Key": "Mykey", "Value": "Myvalue"}]
+    )
+    assert result['ARN']
+    assert result['Name'] == secret_name 
+    secret_value = conn.get_secret_value(SecretId=secret_name)
+    assert secret_value['SecretString'] == 'foosecret'
+    secret_details = conn.describe_secret(SecretId=secret_name)
+    assert secret_details['Tags'] == [{"Key": "Foo", "Value": "Bar"}, {"Key": "Mykey", "Value": "Myvalue"}]
+
 @mock_secretsmanager
 def test_get_random_password_default_length():
     conn = boto3.client('secretsmanager', region_name='us-west-2')