diff --git a/.generator/src/generator/templates/api.j2 b/.generator/src/generator/templates/api.j2 index 03c088a3d9..6ab78cb1fa 100644 --- a/.generator/src/generator/templates/api.j2 +++ b/.generator/src/generator/templates/api.j2 @@ -241,9 +241,15 @@ impl {{ structName }} { yield team; } + {%- if pagination.cursorParam %} + if count == 0 { + break; + } + {%- else %} if count < page_size as usize { break; } + {%- endif %} {%- if pagination.pageParam %} {%- set getter, setter, required, schema = get_accessors(operation, pagination.pageParam) %} diff --git a/src/datadogV1/api/api_dashboards.rs b/src/datadogV1/api/api_dashboards.rs index 25a49a365b..d6ff75665d 100644 --- a/src/datadogV1/api/api_dashboards.rs +++ b/src/datadogV1/api/api_dashboards.rs @@ -1441,7 +1441,6 @@ impl DashboardsAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV1/api/api_monitors.rs b/src/datadogV1/api/api_monitors.rs index d7a1bdace5..1a5a7f8231 100644 --- a/src/datadogV1/api/api_monitors.rs +++ b/src/datadogV1/api/api_monitors.rs @@ -1416,7 +1416,6 @@ impl MonitorsAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV1/api/api_notebooks.rs b/src/datadogV1/api/api_notebooks.rs index 8410192f31..514ad85685 100644 --- a/src/datadogV1/api/api_notebooks.rs +++ b/src/datadogV1/api/api_notebooks.rs @@ -597,7 +597,6 @@ impl NotebooksAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV1/api/api_service_level_objective_corrections.rs b/src/datadogV1/api/api_service_level_objective_corrections.rs index 1cd857889d..866e5fec55 100644 --- a/src/datadogV1/api/api_service_level_objective_corrections.rs +++ b/src/datadogV1/api/api_service_level_objective_corrections.rs @@ -555,7 +555,6 @@ impl ServiceLevelObjectiveCorrectionsAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV1/api/api_service_level_objectives.rs b/src/datadogV1/api/api_service_level_objectives.rs index a3a345ac18..295b27fce1 100644 --- a/src/datadogV1/api/api_service_level_objectives.rs +++ b/src/datadogV1/api/api_service_level_objectives.rs @@ -1277,7 +1277,6 @@ impl ServiceLevelObjectivesAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV1/api/api_synthetics.rs b/src/datadogV1/api/api_synthetics.rs index 1e79569741..b2b826f371 100644 --- a/src/datadogV1/api/api_synthetics.rs +++ b/src/datadogV1/api/api_synthetics.rs @@ -3555,7 +3555,6 @@ impl SyntheticsAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_audit.rs b/src/datadogV2/api/api_audit.rs index e46ffbdb65..7030b93f75 100644 --- a/src/datadogV2/api/api_audit.rs +++ b/src/datadogV2/api/api_audit.rs @@ -214,8 +214,7 @@ impl AuditAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; @@ -413,8 +412,7 @@ impl AuditAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_bits_ai.rs b/src/datadogV2/api/api_bits_ai.rs index 4f7047626f..0a3cd813cd 100644 --- a/src/datadogV2/api/api_bits_ai.rs +++ b/src/datadogV2/api/api_bits_ai.rs @@ -307,7 +307,6 @@ impl BitsAIAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_case_management.rs b/src/datadogV2/api/api_case_management.rs index c0f54494a4..3c3b76ac1a 100644 --- a/src/datadogV2/api/api_case_management.rs +++ b/src/datadogV2/api/api_case_management.rs @@ -3077,7 +3077,6 @@ impl CaseManagementAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_ci_visibility_pipelines.rs b/src/datadogV2/api/api_ci_visibility_pipelines.rs index b1f3ffef04..bd7c2bea91 100644 --- a/src/datadogV2/api/api_ci_visibility_pipelines.rs +++ b/src/datadogV2/api/api_ci_visibility_pipelines.rs @@ -553,8 +553,7 @@ impl CIVisibilityPipelinesAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; @@ -751,8 +750,7 @@ impl CIVisibilityPipelinesAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_ci_visibility_tests.rs b/src/datadogV2/api/api_ci_visibility_tests.rs index 723d4aa9e8..22fbbf22cb 100644 --- a/src/datadogV2/api/api_ci_visibility_tests.rs +++ b/src/datadogV2/api/api_ci_visibility_tests.rs @@ -381,8 +381,7 @@ impl CIVisibilityTestsAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; @@ -576,8 +575,7 @@ impl CIVisibilityTestsAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_container_images.rs b/src/datadogV2/api/api_container_images.rs index e087469209..c7e12e121c 100644 --- a/src/datadogV2/api/api_container_images.rs +++ b/src/datadogV2/api/api_container_images.rs @@ -183,8 +183,7 @@ impl ContainerImagesAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_containers.rs b/src/datadogV2/api/api_containers.rs index 34e31e2902..776a1048e1 100644 --- a/src/datadogV2/api/api_containers.rs +++ b/src/datadogV2/api/api_containers.rs @@ -177,8 +177,7 @@ impl ContainersAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_downtimes.rs b/src/datadogV2/api/api_downtimes.rs index cda2113c34..92188e268f 100644 --- a/src/datadogV2/api/api_downtimes.rs +++ b/src/datadogV2/api/api_downtimes.rs @@ -622,7 +622,6 @@ impl DowntimesAPI { for team in r { yield team; } - if count < page_size as usize { break; } @@ -796,7 +795,6 @@ impl DowntimesAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_events.rs b/src/datadogV2/api/api_events.rs index 8cabbb01d8..8c2f22a3bc 100644 --- a/src/datadogV2/api/api_events.rs +++ b/src/datadogV2/api/api_events.rs @@ -501,8 +501,7 @@ impl EventsAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; @@ -686,8 +685,7 @@ impl EventsAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_incidents.rs b/src/datadogV2/api/api_incidents.rs index dbdb09d092..4481da0699 100644 --- a/src/datadogV2/api/api_incidents.rs +++ b/src/datadogV2/api/api_incidents.rs @@ -6823,7 +6823,6 @@ impl IncidentsAPI { for team in r { yield team; } - if count < page_size as usize { break; } @@ -7001,7 +7000,6 @@ impl IncidentsAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_logs.rs b/src/datadogV2/api/api_logs.rs index 5a775ab36c..dd063ddea3 100644 --- a/src/datadogV2/api/api_logs.rs +++ b/src/datadogV2/api/api_logs.rs @@ -431,8 +431,7 @@ impl LogsAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; @@ -638,8 +637,7 @@ impl LogsAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_metrics.rs b/src/datadogV2/api/api_metrics.rs index 6d708316d9..6d55fff630 100644 --- a/src/datadogV2/api/api_metrics.rs +++ b/src/datadogV2/api/api_metrics.rs @@ -1723,8 +1723,7 @@ impl MetricsAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_network_device_monitoring.rs b/src/datadogV2/api/api_network_device_monitoring.rs index fd1d410db9..3d2b51e9f8 100644 --- a/src/datadogV2/api/api_network_device_monitoring.rs +++ b/src/datadogV2/api/api_network_device_monitoring.rs @@ -567,7 +567,6 @@ impl NetworkDeviceMonitoringAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_powerpack.rs b/src/datadogV2/api/api_powerpack.rs index f5ab49813f..12904ca4f8 100644 --- a/src/datadogV2/api/api_powerpack.rs +++ b/src/datadogV2/api/api_powerpack.rs @@ -545,7 +545,6 @@ impl PowerpackAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_processes.rs b/src/datadogV2/api/api_processes.rs index 6004391cec..e422566be1 100644 --- a/src/datadogV2/api/api_processes.rs +++ b/src/datadogV2/api/api_processes.rs @@ -192,8 +192,7 @@ impl ProcessesAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_rum.rs b/src/datadogV2/api/api_rum.rs index c1c0195b46..81f329193b 100644 --- a/src/datadogV2/api/api_rum.rs +++ b/src/datadogV2/api/api_rum.rs @@ -861,8 +861,7 @@ impl RUMAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; @@ -1051,8 +1050,7 @@ impl RUMAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_scorecards.rs b/src/datadogV2/api/api_scorecards.rs index 437e76a85b..286ac212c0 100644 --- a/src/datadogV2/api/api_scorecards.rs +++ b/src/datadogV2/api/api_scorecards.rs @@ -1423,7 +1423,6 @@ impl ScorecardsAPI { for team in r { yield team; } - if count < page_size as usize { break; } @@ -1621,7 +1620,6 @@ impl ScorecardsAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_security_monitoring.rs b/src/datadogV2/api/api_security_monitoring.rs index 67457bf8a1..62d2038594 100644 --- a/src/datadogV2/api/api_security_monitoring.rs +++ b/src/datadogV2/api/api_security_monitoring.rs @@ -10744,8 +10744,7 @@ impl SecurityMonitoringAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(page) = resp.meta.page else { break }; @@ -11824,8 +11823,7 @@ impl SecurityMonitoringAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; @@ -12406,8 +12404,7 @@ impl SecurityMonitoringAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; @@ -14351,8 +14348,7 @@ impl SecurityMonitoringAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; @@ -14732,8 +14728,7 @@ impl SecurityMonitoringAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_service_definition.rs b/src/datadogV2/api/api_service_definition.rs index 4307276da6..9ad849b853 100644 --- a/src/datadogV2/api/api_service_definition.rs +++ b/src/datadogV2/api/api_service_definition.rs @@ -592,7 +592,6 @@ impl ServiceDefinitionAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_software_catalog.rs b/src/datadogV2/api/api_software_catalog.rs index 675d37d464..8c9f667f98 100644 --- a/src/datadogV2/api/api_software_catalog.rs +++ b/src/datadogV2/api/api_software_catalog.rs @@ -551,7 +551,6 @@ impl SoftwareCatalogAPI { for team in r { yield team; } - if count < page_size as usize { break; } @@ -752,7 +751,6 @@ impl SoftwareCatalogAPI { for team in r { yield team; } - if count < page_size as usize { break; } @@ -921,7 +919,6 @@ impl SoftwareCatalogAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_spans.rs b/src/datadogV2/api/api_spans.rs index b52fcd0bd5..4a8056ec03 100644 --- a/src/datadogV2/api/api_spans.rs +++ b/src/datadogV2/api/api_spans.rs @@ -371,8 +371,7 @@ impl SpansAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; @@ -567,8 +566,7 @@ impl SpansAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_static_analysis.rs b/src/datadogV2/api/api_static_analysis.rs index ee6e427cc8..10b6769c56 100644 --- a/src/datadogV2/api/api_static_analysis.rs +++ b/src/datadogV2/api/api_static_analysis.rs @@ -1457,7 +1457,6 @@ impl StaticAnalysisAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_teams.rs b/src/datadogV2/api/api_teams.rs index 1c81aaac74..30987bd5ca 100644 --- a/src/datadogV2/api/api_teams.rs +++ b/src/datadogV2/api/api_teams.rs @@ -2638,7 +2638,6 @@ impl TeamsAPI { for team in r { yield team; } - if count < page_size as usize { break; } @@ -3358,7 +3357,6 @@ impl TeamsAPI { for team in r { yield team; } - if count < page_size as usize { break; } @@ -3539,7 +3537,6 @@ impl TeamsAPI { for team in r { yield team; } - if count < page_size as usize { break; } @@ -3745,7 +3742,6 @@ impl TeamsAPI { for team in r { yield team; } - if count < page_size as usize { break; } @@ -3907,7 +3903,6 @@ impl TeamsAPI { for team in r { yield team; } - if count < page_size as usize { break; } diff --git a/src/datadogV2/api/api_test_optimization.rs b/src/datadogV2/api/api_test_optimization.rs index 22ad5e41a5..6654864806 100644 --- a/src/datadogV2/api/api_test_optimization.rs +++ b/src/datadogV2/api/api_test_optimization.rs @@ -685,8 +685,7 @@ impl TestOptimizationAPI { for team in r { yield team; } - - if count < page_size as usize { + if count == 0 { break; } let Some(meta) = resp.meta else { break }; diff --git a/src/datadogV2/api/api_users.rs b/src/datadogV2/api/api_users.rs index 87922c37db..c30859e5b1 100644 --- a/src/datadogV2/api/api_users.rs +++ b/src/datadogV2/api/api_users.rs @@ -1327,7 +1327,6 @@ impl UsersAPI { for team in r { yield team; } - if count < page_size as usize { break; }