From b4ce5b72f17406e8d7fd0891210f6804a6cab3dd Mon Sep 17 00:00:00 2001 From: Jon Durbin Date: Tue, 16 May 2023 14:22:52 -0400 Subject: [PATCH] Support passing query params to iterate_bucket_page --- CHANGELOG.rst | 4 ++++ VERSION | 2 +- guillotina_gcloudstorage/storage.py | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 82ac558..a2f41c3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,7 @@ +6.0.8 (unreleased) +------------------ +- Support arbitrary args to iterate bucket page method, e.g. to include deleted versions. + 6.0.7 (unreleased) ------------------ - Method for generating signed download URLs diff --git a/VERSION b/VERSION index 089b1e6..4b786f5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.0.7 +6.0.8 diff --git a/guillotina_gcloudstorage/storage.py b/guillotina_gcloudstorage/storage.py index 14b966e..74ca516 100644 --- a/guillotina_gcloudstorage/storage.py +++ b/guillotina_gcloudstorage/storage.py @@ -569,11 +569,11 @@ async def iterate_bucket(self): yield item page_token = data.get("nextPageToken") - async def iterate_bucket_page(self, page_token=None, prefix=None): + async def iterate_bucket_page(self, page_token=None, prefix=None, **params): url = "{}/{}/o".format(OBJECT_BASE_URL, await self.get_bucket_name()) container = task_vars.container.get() prefix = prefix or container.id + "/" - params = {"prefix": prefix} + params.update({"prefix": prefix}) if page_token: params["pageToken"] = page_token