Skip to content

GCSHook only perform list if delimiter specified #36130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
atrbgithub wants to merge 1 commit into from
Closed

GCSHook only perform list if delimiter specified #36130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions airflow/providers/google/cloud/hooks/gcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,11 +821,12 @@ def _list(
delimiter=delimiter,
versions=versions,
)
list(blobs)
if delimiter:
next(blobs, None)

if blobs.prefixes:
ids.extend(blobs.prefixes)
else:
elif not delimiter or (match_glob and delimiter == "/"):
ids.extend(blob.name for blob in blobs)

page_token = blobs.next_page_token
Expand Down Expand Up @@ -933,11 +934,12 @@ def list_by_timespan(
delimiter=delimiter,
versions=versions,
)
list(blobs)
if delimiter:
next(blobs, None)

if blobs.prefixes:
ids.extend(blobs.prefixes)
else:
elif not delimiter or (match_glob and delimiter == "/"):
ids.extend(
blob.name
for blob in blobs
Expand Down
5 changes: 5 additions & 0 deletions tests/providers/google/cloud/hooks/test_gcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,13 +821,18 @@ def test_provide_file_upload(self, mock_upload, mock_temp_file):
@mock.patch(GCS_STRING.format("GCSHook.get_conn"))
def test_list__delimiter(self, mock_service, prefix, result):
mock_service.return_value.bucket.return_value.list_blobs.return_value.next_page_token = None
mock_service.return_value.bucket.return_value.list_blobs.return_value.prefixes = None
with pytest.deprecated_call():
self.gcs_hook.list(
bucket_name="test_bucket",
prefix=prefix,
delimiter=",",
)
assert mock_service.return_value.bucket.return_value.list_blobs.call_args_list == result
assert (
mock_service.return_value.bucket.return_value.list_blobs.return_value.__next__.call_count
== len(result)
)

@mock.patch(GCS_STRING.format("GCSHook.get_conn"))
@mock.patch("airflow.providers.google.cloud.hooks.gcs.functools")
Expand Down