Merge pull request #11 from vdloo/ignore-empty-keys

Ignore empty keys

Author: vdloo

consul_kv/api.py

@@ -96,7 +96,8 @@ def get_kv(k=None, recurse=False, endpoint=DEFAULT_KV_ENDPOINT, timeout=socket._
     mapping = {
         # values are stored base64 encoded in consul, they
         # are decoded before returned by this function.
-        r['Key']: b64decode(r['Value']).decode('utf-8') for r in result if r['Value']
+        r['Key']: b64decode(r['Value']).decode('utf-8')
+        if r['Value'] else None for r in result if r['Key']
     }
     return mapping
 

tests/unit/api/test_get_kv.py

@@ -9,9 +9,9 @@ class TestGetKV(TestCase):
     def setUp(self):
         self.request = self.set_up_patch('consul_kv.api.request')
         self.request.urlopen.return_value.__exit__ = lambda a, b, c, d: None
-        self.json_dump = '[{"Key": "key1", "Value": "Value"}]'
         self.base64decode = self.set_up_patch('consul_kv.api.b64decode')
         self.base64decode.return_value = 'value1'.encode('utf-8')
+        self.json_dump = '[{"Key": "key1", "Value": "Value"}]'
         self.request.urlopen.return_value.__enter__ = lambda x: Mock(
             read=lambda: Mock(
                 decode=lambda _: self.json_dump
@@ -77,3 +77,31 @@ def test_get_kv_returns_mapping(self):
             'key1': 'value1'
         }
         self.assertEqual(ret, expected_mapping)
+
+    def test_get_kv_returns_empty_results_as_none(self):
+        self.json_dump = '[{"Key": "key1", "Value": null}]'
+        self.request.urlopen.return_value.__enter__ = lambda x: Mock(
+            read=lambda: Mock(
+                decode=lambda _: self.json_dump
+            )
+        )
+
+        ret = get_kv('some/path', recurse=True)
+
+        expected_mapping = {
+            'key1': None
+        }
+        self.assertEqual(ret, expected_mapping)
+
+    def test_get_kv_ignores_empty_keys(self):
+        self.json_dump = '[{"Key": "", "Value": null}]'
+        self.request.urlopen.return_value.__enter__ = lambda x: Mock(
+            read=lambda: Mock(
+                decode=lambda _: self.json_dump
+            )
+        )
+
+        ret = get_kv('some/path', recurse=True)
+
+        expected_mapping = {}
+        self.assertEqual(ret, expected_mapping)