Skip to content

fix: fix 1000+ buckets pagination issue #15112

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

Merged
ddelgrosso1 merged 7 commits into from
May 16, 2025
Merged

fix: fix 1000+ buckets pagination issue #15112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c02dd30
test: add unit test to confirm absence of pageToken param in listBuck…
eliekozah May 7, 2025
5f7e1c5
test: add unit test to confirm absence of pageToken param in listBuck…
eliekozah May 7, 2025
b5478ff
test: add unit test to confirm absence of pageToken param in listBuck…
eliekozah May 7, 2025
405eff5
test: add unit test to confirm absence of pageToken param in listBuck…
eliekozah May 7, 2025
6235ccb
test: add unit test to confirm absence of pageToken param in listBuck…
eliekozah May 7, 2025
e87525e
test: add unit test to confirm absence of pageToken param in listBuck…
eliekozah May 7, 2025
d5f9b16
Merge branch 'main' into fix_broken_pagination_infinite_loop
ddelgrosso1 May 7, 2025
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
3 changes: 3 additions & 0 deletions google/cloud/storage/internal/rest/stub.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ StatusOr<ListBucketsResponse> RestStub::ListBuckets(
if (!headers.ok()) return headers;
request.AddOptionsToHttpRequest(builder);
builder.AddQueryParameter("project", request.project_id());
if (!request.page_token().empty()) {
builder.AddQueryParameter("pageToken", request.page_token());
}
return ParseFromRestResponse<ListBucketsResponse>(
storage_rest_client_->Get(context, std::move(builder).BuildRequest()));
}
Expand Down
37 changes: 37 additions & 0 deletions google/cloud/storage/internal/rest/stub_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ using ::testing::ElementsAre;
using ::testing::Eq;
using ::testing::HasSubstr;
using ::testing::Matcher;
using ::testing::Not;
using ::testing::Pair;
using ::testing::ResultOf;
using ::testing::Return;
Expand Down Expand Up @@ -193,6 +194,42 @@ TEST(RestStubTest, CreateBucket) {
StatusIs(PermanentError().code(), PermanentError().message()));
}

TEST(RestStubTest, ListBucketsIncludesPageTokenWhenPresentInRequest) {
auto mock = std::make_shared<MockRestClient>();
std::string expected_token = "test-page-token";
ListBucketsRequest request("test-project-id");
request.set_page_token(expected_token);

EXPECT_CALL(*mock,
Get(ExpectedContext(),
ResultOf(
"request parameters contain 'pageToken'",
[](RestRequest const& r) { return r.parameters(); },
Contains(Pair("pageToken", expected_token)))))
.WillOnce(Return(PermanentError()));

auto tested = std::make_unique<RestStub>(Options{}, mock, mock);
auto context = TestContext();
tested->ListBuckets(context, TestOptions(), request);
}

TEST(RestStubTest, ListBucketsOmitsPageTokenWhenEmptyInRequest) {
auto mock = std::make_shared<MockRestClient>();
ListBucketsRequest request("test-project-id");

EXPECT_CALL(*mock,
Get(ExpectedContext(),
ResultOf(
"request parameters do not contain 'pageToken'",
[](RestRequest const& r) { return r.parameters(); },
Not(Contains(Pair("pageToken", _))))))
.WillOnce(Return(PermanentError()));

auto tested = std::make_unique<RestStub>(Options{}, mock, mock);
auto context = TestContext();
tested->ListBuckets(context, TestOptions(), request);
}

TEST(RestStubTest, GetBucketMetadata) {
auto mock = std::make_shared<MockRestClient>();
EXPECT_CALL(*mock, Get(ExpectedContext(), ExpectedRequest()))
Expand Down
Loading