Skip to content

Fix ListCatalogEntity pagination endpoint to use correct offset value #543

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
merged 1 commit into from
Mar 5, 2025
Merged

Fix ListCatalogEntity pagination endpoint to use correct offset value #543

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
8 changes: 4 additions & 4 deletions .apigentools-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"spec_versions": {
"v1": {
"apigentools_version": "1.6.6",
"regenerated": "2025-03-03 19:12:27.323894",
"spec_repo_commit": "35df584d"
"regenerated": "2025-03-05 14:38:20.340456",
"spec_repo_commit": "0c376cca"
},
"v2": {
"apigentools_version": "1.6.6",
"regenerated": "2025-03-03 19:12:27.340073",
"spec_repo_commit": "35df584d"
"regenerated": "2025-03-05 14:38:20.356470",
"spec_repo_commit": "0c376cca"
}
}
}
2 changes: 1 addition & 1 deletion .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35328,7 +35328,7 @@ paths:
- Software Catalog
x-pagination:
limitParam: page[limit]
pageParam: page[offset]
pageOffsetParam: page[offset]
resultsPath: data
post:
description: Create or update entities in Software Catalog.
Expand Down
9 changes: 5 additions & 4 deletions src/datadogV2/api/api_software_catalog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,6 @@ impl SoftwareCatalogAPI {
} else {
page_size = params.page_limit.unwrap().clone();
}
if params.page_offset.is_none() {
params.page_offset = Some(0);
}
loop {
let resp = self.list_catalog_entity(params.clone()).await?;
let Some(data) = resp.data else { break };
Expand All @@ -319,7 +316,11 @@ impl SoftwareCatalogAPI {
if count < page_size as usize {
break;
}
params.page_offset = Some(params.page_offset.unwrap() + 1);
if params.page_offset.is_none() {
params.page_offset = Some(page_size.clone());
} else {
params.page_offset = Some(params.page_offset.unwrap() + page_size.clone());
}
}
}
}
Expand Down
Loading