Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion airflow-ctl/src/airflowctl/api/operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def safe_validate(content: bytes) -> BaseModel:
raw = fill_missing_fields(json.loads(content), data_model)
return data_model.model_validate(raw) # type: ignore[union-attr]

self.response = self.client.get(path, params=shared_params)
self.response = self.client.get(path, params={**shared_params, "offset": offset})
first_pass = safe_validate(self.response.content)
total_entries = first_pass.total_entries # type: ignore[attr-defined]
if total_entries < limit:
Expand Down
23 changes: 23 additions & 0 deletions airflow-ctl/tests/airflow_ctl/api/test_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,29 @@ def test_execute_list_sends_limit_on_subsequent_pages(self):
for call in mock_client.get.call_args_list:
assert call.kwargs["params"]["limit"] == 2

def test_execute_list_sends_offset_to_server(self):
"""``offset`` must reach the server on the first request, not only on subsequent pages."""
rows = [{"name": name} for name in "abcdef"]

def paged(path, params):
# An absent ``offset`` is what the server would see as its own default of 0.
start = params.get("offset", 0)
return Mock(
content=json.dumps(
{"hellos": rows[start : start + params["limit"]], "total_entries": len(rows)}
)
)

mock_client = Mock()
mock_client.get.side_effect = paged
base_operation = BaseOperations(client=mock_client)

response = base_operation.execute_list(
path="hello", data_model=HelloCollectionResponse, offset=2, limit=2
)

assert [hello.name for hello in response.hellos] == ["c", "d", "e", "f"]

@pytest.mark.parametrize("limit", [0, -1])
def test_execute_list_rejects_non_positive_limit(self, limit):
mock_client = Mock()
Expand Down