From 91fb40810242213349e0f436e01464425fdd0928 Mon Sep 17 00:00:00 2001
From: Niels Laukens <niels@dest-unreach.be>
Date: Wed, 4 Sep 2019 16:25:43 +0200
Subject: [PATCH] Move tags_from_query_string to core.utils

---
 moto/core/utils.py         | 17 +++++++++++++++++
 moto/ec2/responses/tags.py |  3 ++-
 moto/ec2/utils.py          | 17 -----------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/moto/core/utils.py b/moto/core/utils.py
index ca670e871..acf76bb48 100644
--- a/moto/core/utils.py
+++ b/moto/core/utils.py
@@ -297,3 +297,20 @@ def path_url(url):
     if parsed_url.query:
         path = path + '?' + parsed_url.query
     return path
+
+
+def tags_from_query_string(querystring_dict):
+    prefix = 'Tag'
+    suffix = 'Key'
+    response_values = {}
+    for key, value in querystring_dict.items():
+        if key.startswith(prefix) and key.endswith(suffix):
+            tag_index = key.replace(prefix + ".", "").replace("." + suffix, "")
+            tag_key = querystring_dict.get("Tag.{0}.Key".format(tag_index))[0]
+            tag_value_key = "Tag.{0}.Value".format(tag_index)
+            if tag_value_key in querystring_dict:
+                response_values[tag_key] = querystring_dict.get(tag_value_key)[
+                    0]
+            else:
+                response_values[tag_key] = None
+    return response_values
diff --git a/moto/ec2/responses/tags.py b/moto/ec2/responses/tags.py
index 65d3da255..37f2c3bea 100644
--- a/moto/ec2/responses/tags.py
+++ b/moto/ec2/responses/tags.py
@@ -2,7 +2,8 @@ from __future__ import unicode_literals
 
 from moto.core.responses import BaseResponse
 from moto.ec2.models import validate_resource_ids
-from moto.ec2.utils import tags_from_query_string, filters_from_querystring
+from moto.ec2.utils import filters_from_querystring
+from moto.core.utils import tags_from_query_string
 
 
 class TagResponse(BaseResponse):
diff --git a/moto/ec2/utils.py b/moto/ec2/utils.py
index e67cb39f4..f0d58d5fc 100644
--- a/moto/ec2/utils.py
+++ b/moto/ec2/utils.py
@@ -198,23 +198,6 @@ def split_route_id(route_id):
     return values[0], values[1]
 
 
-def tags_from_query_string(querystring_dict):
-    prefix = 'Tag'
-    suffix = 'Key'
-    response_values = {}
-    for key, value in querystring_dict.items():
-        if key.startswith(prefix) and key.endswith(suffix):
-            tag_index = key.replace(prefix + ".", "").replace("." + suffix, "")
-            tag_key = querystring_dict.get("Tag.{0}.Key".format(tag_index))[0]
-            tag_value_key = "Tag.{0}.Value".format(tag_index)
-            if tag_value_key in querystring_dict:
-                response_values[tag_key] = querystring_dict.get(tag_value_key)[
-                    0]
-            else:
-                response_values[tag_key] = None
-    return response_values
-
-
 def dhcp_configuration_from_querystring(querystring, option=u'DhcpConfiguration'):
     """
     turn: