This is an automated email from the ASF dual-hosted git repository. ash pushed a commit to branch v2-1-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit dbf306476e066205a28689067ac3508733d8d188 Author: jpyen <[email protected]> AuthorDate: Thu Jun 10 11:19:50 2021 -0700 Make REST API List DAGs endpoint consistent with UI/CLI behaviour (#16318) Co-authored-by: jpyen <> (cherry picked from commit 9ba796ef40fe833aba58f5aa13a63587106d8ffd) --- airflow/api_connexion/endpoints/dag_endpoint.py | 14 ++++++++++---- tests/api_connexion/endpoints/test_dag_endpoint.py | 19 ++++++++++++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/airflow/api_connexion/endpoints/dag_endpoint.py b/airflow/api_connexion/endpoints/dag_endpoint.py index 5bd6f88..7b19aed 100644 --- a/airflow/api_connexion/endpoints/dag_endpoint.py +++ b/airflow/api_connexion/endpoints/dag_endpoint.py @@ -59,11 +59,17 @@ def get_dag_details(dag_id): @security.requires_access([(permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG)]) @format_parameters({'limit': check_limit}) -def get_dags(limit, offset=0): +@provide_session +def get_dags(limit, session, offset=0): """Get all DAGs.""" - readable_dags = current_app.appbuilder.sm.get_readable_dags(g.user) - dags = readable_dags.order_by(DagModel.dag_id).offset(offset).limit(limit).all() - total_entries = readable_dags.count() + dags_query = session.query(DagModel).filter(~DagModel.is_subdag, DagModel.is_active) + + readable_dags = current_app.appbuilder.sm.get_accessible_dag_ids(g.user) + + dags_query = dags_query.filter(DagModel.dag_id.in_(readable_dags)) + total_entries = len(dags_query.all()) + + dags = dags_query.order_by(DagModel.dag_id).offset(offset).limit(limit).all() return dags_collection_schema.dump(DAGCollection(dags=dags, total_entries=total_entries)) diff --git a/tests/api_connexion/endpoints/test_dag_endpoint.py b/tests/api_connexion/endpoints/test_dag_endpoint.py index 031290c..f3f7501 100644 --- a/tests/api_connexion/endpoints/test_dag_endpoint.py +++ b/tests/api_connexion/endpoints/test_dag_endpoint.py @@ -121,9 +121,20 @@ class TestDagEndpoint: dag_id=f"TEST_DAG_{num}", fileloc=f"/tmp/dag_{num}.py", schedule_interval="2 2 * * *", + is_active=True, ) session.add(dag_model) + @provide_session + def _create_deactivated_dag(self, session=None): + dag_model = DagModel( + dag_id="TEST_DAG_DELETED_1", + fileloc="/tmp/dag_del_1.py", + schedule_interval="2 2 * * *", + is_active=False, + ) + session.add(dag_model) + class TestGetDag(TestDagEndpoint): @conf_vars({("webserver", "secret_key"): "mysecret"}) @@ -385,12 +396,18 @@ class TestGetDagDetails(TestDagEndpoint): class TestGetDags(TestDagEndpoint): - def test_should_respond_200(self): + @provide_session + def test_should_respond_200(self, session): self._create_dag_models(2) + self._create_deactivated_dag() + + dags_query = session.query(DagModel).filter(~DagModel.is_subdag) + assert len(dags_query.all()) == 3 response = self.client.get("api/v1/dags", environ_overrides={'REMOTE_USER': "test"}) file_token = SERIALIZER.dumps("/tmp/dag_1.py") file_token2 = SERIALIZER.dumps("/tmp/dag_2.py") + assert response.status_code == 200 assert { "dags": [
