Skip to content

[v3-1-test] Add query guard in public asset list endpoints (#57438) #57543

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
pierrejeambrun merged 1 commit into from
Oct 30, 2025
Merged

[v3-1-test] Add query guard in public asset list endpoints (#57438) #57543

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
5 changes: 4 additions & 1 deletion airflow-core/src/airflow/api_fastapi/core_api/routes/public/assets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ def get_assets(
subqueryload(AssetModel.scheduled_dags),
subqueryload(AssetModel.producing_tasks),
subqueryload(AssetModel.consuming_tasks),
subqueryload(AssetModel.aliases),
)
)

Expand Down Expand Up @@ -304,7 +305,9 @@ def get_asset_events(
session=session,
)

assets_event_select = assets_event_select.options(subqueryload(AssetEvent.created_dagruns))
assets_event_select = assets_event_select.options(
subqueryload(AssetEvent.created_dagruns), joinedload(AssetEvent.asset)
)
assets_events = session.scalars(assets_event_select)

return AssetEventCollectionResponse(
Expand Down
24 changes: 17 additions & 7 deletions airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_assets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ def test_should_respond_200(self, test_client, session):
assert len(session.query(AssetModel).all()) == 3
assert len(session.query(AssetActive).all()) == 2

response = test_client.get("/assets")
with assert_queries_count(7):
response = test_client.get("/assets")

assert response.status_code == 200
response_data = response.json()
tz_datetime_format = from_datetime_to_zulu_without_ms(DEFAULT_DATE)
Expand Down Expand Up @@ -585,7 +587,9 @@ def test_should_respond_200(self, test_client, session):
asset_aliases = session.query(AssetAliasModel).all()
assert len(asset_aliases) == 2

response = test_client.get("/assets/aliases")
with assert_queries_count(2):
response = test_client.get("/assets/aliases")

assert response.status_code == 200
response_data = response.json()
assert response_data == {
Expand Down Expand Up @@ -668,7 +672,10 @@ def test_should_respond_200(self, test_client, session):
assets = session.query(AssetEvent).all()
session.commit()
assert len(assets) == 2
response = test_client.get("/assets/events")

with assert_queries_count(3):
response = test_client.get("/assets/events")

assert response.status_code == 200
response_data = response.json()
assert response_data == {
Expand Down Expand Up @@ -1002,9 +1009,10 @@ def test_should_respond_200(self, test_client, session, create_dummy_dag):
(asset,) = self.create_assets(session=session, num=1)
self._create_asset_dag_run_queues(dag_id, asset.id, session)

response = test_client.get(
f"/dags/{dag_id}/assets/queuedEvents",
)
with assert_queries_count(4):
response = test_client.get(
f"/dags/{dag_id}/assets/queuedEvents",
)

assert response.status_code == 200
assert response.json() == {
Expand Down Expand Up @@ -1262,7 +1270,9 @@ def test_should_respond_200(self, test_client, session, create_dummy_dag):
(asset,) = self.create_assets(session=session, num=1)
self._create_asset_dag_run_queues(dag_id, asset.id, session)

response = test_client.get(f"/assets/{asset.id}/queuedEvents")
with assert_queries_count(3):
response = test_client.get(f"/assets/{asset.id}/queuedEvents")

assert response.status_code == 200
assert response.json() == {
"queued_events": [
Expand Down