Skip to content

[v3-1-test] Add number of queries guard in public dag version list endpoints (#57… #57735

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
Nov 4, 2025
+18 −8
Merged

[v3-1-test] Add number of queries guard in public dag version list endpoints (#57… #57735

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
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/api_fastapi/core_api/routes/public/dag_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def get_dag_versions(

This endpoint allows specifying `~` as the dag_id to retrieve DAG Versions for all DAGs.
"""
query = select(DagVersion).options(joinedload(DagVersion.dag_model))
query = select(DagVersion).options(joinedload(DagVersion.dag_model), joinedload(DagVersion.bundle))

if dag_id != "~":
get_latest_version_of_dag(dag_bag, dag_id, session)
Expand Down
24 changes: 17 additions & 7 deletions airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_dag_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

from airflow.providers.standard.operators.empty import EmptyOperator

from tests_common.test_utils.asserts import assert_queries_count
from tests_common.test_utils.db import clear_db_dag_bundles, clear_db_dags, clear_db_serialized_dags

pytestmark = pytest.mark.db_test
Expand Down Expand Up @@ -212,7 +213,7 @@ def test_should_respond_403(self, unauthorized_test_client):

class TestGetDagVersions(TestDagVersionEndpoint):
@pytest.mark.parametrize(
"dag_id, expected_response",
"dag_id, expected_response, expected_query_count",
[
[
"~",
Expand Down Expand Up @@ -261,6 +262,7 @@ class TestGetDagVersions(TestDagVersionEndpoint):
],
"total_entries": 4,
},
2,
],
[
"dag_with_multiple_versions",
Expand Down Expand Up @@ -299,17 +301,19 @@ class TestGetDagVersions(TestDagVersionEndpoint):
],
"total_entries": 3,
},
4,
],
],
)
@pytest.mark.usefixtures("make_dag_with_multiple_versions")
def test_get_dag_versions(self, test_client, dag_id, expected_response):
response = test_client.get(f"/dags/{dag_id}/dagVersions")
def test_get_dag_versions(self, test_client, dag_id, expected_response, expected_query_count):
with assert_queries_count(expected_query_count):
response = test_client.get(f"/dags/{dag_id}/dagVersions")
assert response.status_code == 200
assert response.json() == expected_response

@pytest.mark.parametrize(
"dag_id, expected_response",
"dag_id, expected_response, expected_query_count",
[
[
"~",
Expand Down Expand Up @@ -358,6 +362,7 @@ def test_get_dag_versions(self, test_client, dag_id, expected_response):
],
"total_entries": 4,
},
2,
],
[
"dag_with_multiple_versions",
Expand Down Expand Up @@ -396,12 +401,16 @@ def test_get_dag_versions(self, test_client, dag_id, expected_response):
],
"total_entries": 3,
},
4,
],
],
)
@pytest.mark.usefixtures("make_dag_with_multiple_versions")
def test_get_dag_versions_with_url_template(self, test_client, dag_id, expected_response):
response = test_client.get(f"/dags/{dag_id}/dagVersions")
def test_get_dag_versions_with_url_template(
self, test_client, dag_id, expected_response, expected_query_count
):
with assert_queries_count(expected_query_count):
response = test_client.get(f"/dags/{dag_id}/dagVersions")
assert response.status_code == 200
assert response.json() == expected_response

Expand Down Expand Up @@ -479,7 +488,8 @@ def test_get_dag_versions_with_url_template(self, test_client, dag_id, expected_
def test_get_dag_versions_parameters(
self, test_client, params, expected_versions, expected_total_entries
):
response = test_client.get("/dags/~/dagVersions", params=params)
with assert_queries_count(2):
response = test_client.get("/dags/~/dagVersions", params=params)
assert response.status_code == 200
response_payload = response.json()
assert response_payload["total_entries"] == expected_total_entries
Expand Down