Merge pull request #2636 from dhermes/logging-iterators-1

Converting Logging client->list_entries to iterator.

Author: dhermes

packages/google-cloud-core/google/cloud/iterator.py

@@ -298,6 +298,7 @@ class HTTPIterator(Iterator):
     _PAGE_TOKEN = 'pageToken'
     _MAX_RESULTS = 'maxResults'
     _RESERVED_PARAMS = frozenset([_PAGE_TOKEN, _MAX_RESULTS])
+    _HTTP_METHOD = 'GET'
 
     def __init__(self, client, path, item_to_value,
                  items_key=DEFAULT_ITEMS_KEY,
@@ -378,9 +379,19 @@ def _get_next_page_response(self):
         :rtype: dict
         :returns: The parsed JSON response of the next page's contents.
         """
-        return self.client.connection.api_request(
-            method='GET', path=self.path,
-            query_params=self._get_query_params())
+        params = self._get_query_params()
+        if self._HTTP_METHOD == 'GET':
+            return self.client.connection.api_request(
+                method=self._HTTP_METHOD,
+                path=self.path,
+                query_params=params)
+        elif self._HTTP_METHOD == 'POST':
+            return self.client.connection.api_request(
+                method=self._HTTP_METHOD,
+                path=self.path,
+                data=params)
+        else:
+            raise ValueError('Unexpected HTTP method', self._HTTP_METHOD)
 
 
 class GAXIterator(Iterator):

packages/google-cloud-core/unit_tests/test_iterator.py

@@ -436,6 +436,32 @@ def test__get_next_page_response_new_no_token_in_response(self):
         self.assertEqual(kw['path'], path)
         self.assertEqual(kw['query_params'], {})
 
+    def test__get_next_page_response_with_post(self):
+        path = '/foo'
+        returned = {'green': 'eggs', 'ham': 55}
+        connection = _Connection(returned)
+        client = _Client(connection)
+        iterator = self._makeOne(client, path, None)
+        iterator._HTTP_METHOD = 'POST'
+        response = iterator._get_next_page_response()
+        self.assertEqual(response, returned)
+
+        self.assertEqual(len(connection._requested), 1)
+        called_kwargs = connection._requested[0]
+        self.assertEqual(called_kwargs, {
+            'method': iterator._HTTP_METHOD,
+            'path': path,
+            'data': {},
+        })
+
+    def test__get_next_page_bad_http_method(self):
+        path = '/foo'
+        client = _Client(None)
+        iterator = self._makeOne(client, path, None)
+        iterator._HTTP_METHOD = 'NOT-A-VERB'
+        with self.assertRaises(ValueError):
+            iterator._get_next_page_response()
+
 
 class TestGAXIterator(unittest.TestCase):