Skip to content

Commit

Permalink
Replace deprecated get_accessible_dag_ids and use get_readable_dags i…
Browse files Browse the repository at this point in the history
…n get_dag_warnings (#36256)
  • Loading branch information
hussein-awala committed Dec 16, 2023
1 parent 30ea37e commit 9406f00
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions airflow/api_connexion/endpoints/dag_warning_endpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

from typing import TYPE_CHECKING

from flask import g
from sqlalchemy import select

from airflow.api_connexion import security
Expand All @@ -27,9 +26,9 @@
DagWarningCollection,
dag_warning_collection_schema,
)
from airflow.api_connexion.security import get_readable_dags
from airflow.auth.managers.models.resource_details import DagAccessEntity
from airflow.models.dagwarning import DagWarning as DagWarningModel
from airflow.utils.airflow_flask_app import get_airflow_app
from airflow.utils.db import get_query_count
from airflow.utils.session import NEW_SESSION, provide_session

Expand Down Expand Up @@ -61,7 +60,7 @@ def get_dag_warnings(
if dag_id:
query = query.where(DagWarningModel.dag_id == dag_id)
else:
readable_dags = get_airflow_app().appbuilder.sm.get_accessible_dag_ids(g.user)
readable_dags = get_readable_dags()
query = query.where(DagWarningModel.dag_id.in_(readable_dags))
if warning_type:
query = query.where(DagWarningModel.warning_type == warning_type)
Expand Down
4 changes: 2 additions & 2 deletions airflow/api_connexion/security.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,5 +267,5 @@ def decorated(*args, **kwargs):
return requires_access_decorator


def get_readable_dags() -> list[str]:
return get_airflow_app().appbuilder.sm.get_accessible_dag_ids(g.user)
def get_readable_dags() -> set[str]:
return get_auth_manager().get_permitted_dag_ids(user=g.user)

0 comments on commit 9406f00

Please sign in to comment.