add bookmark support in watcher (#291)

Co-authored-by: Thomas Kaufmann <[email protected]>

Author: tkauf15k

kubernetes_asyncio/watch/watch.py

@@ -104,7 +104,7 @@ def unmarshal_event(self, data: str, response_type):
 
         # If possible, compile the JSON response into a Python native response
         # type, eg `V1Namespace` or `V1Pod`,`ExtensionsV1beta1Deployment`, ...
-        if response_type:
+        if response_type and js['type'].lower() != 'bookmark':
             js['object'] = self._api_client.deserialize(
                 response=SimpleNamespace(data=json.dumps(js['raw_object'])),
                 response_type=response_type
@@ -120,6 +120,8 @@ def unmarshal_event(self, data: str, response_type):
                     and 'metadata' in js['object']
                     and 'resourceVersion' in js['object']['metadata']):
                 self.resource_version = js['object']['metadata']['resourceVersion']
+        elif js['type'].lower() == 'bookmark':
+            self.resource_version = js['object']['metadata']['resourceVersion']
 
         return js
 

kubernetes_asyncio/watch/watch_test.py

@@ -280,3 +280,17 @@ async def test_watch_timeout_with_resource_version(self):
 
         fake_resp.release.assert_called_once_with()
         self.assertEqual(watch.resource_version, '10')
+
+    def test_unmarshal_bookmark_succeeds_and_preserves_resource_version(self):
+        w = Watch()
+        event = w.unmarshal_event('{"type": "BOOKMARK", "object": {"apiVersion":'
+                                  '"test.com/v1beta1","kind":"foo","metadata":'
+                                  '{"name": "bar", "resourceVersion": "1"}}}',
+                                  'object')
+        self.assertEqual("BOOKMARK", event['type'])
+
+        # make sure the resource version is preserved,
+        # and the watcher's resource_version is updated
+        self.assertTrue(isinstance(event['object'], dict))
+        self.assertEqual("1", event['object']['metadata']['resourceVersion'])
+        self.assertEqual("1", w.resource_version)