From 6e05a4ca2844b89cb3fcfffc9f828c70e3667773 Mon Sep 17 00:00:00 2001 From: hussein-awala Date: Sat, 16 Dec 2023 13:58:33 +0100 Subject: [PATCH] Replace deprecated get_accessible_dag_ids and use get_readable_dags in get_dag_warnings --- airflow/api_connexion/endpoints/dag_warning_endpoint.py | 5 ++--- airflow/api_connexion/security.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/airflow/api_connexion/endpoints/dag_warning_endpoint.py b/airflow/api_connexion/endpoints/dag_warning_endpoint.py index 3e0db58dc9ad5..1f480b7111f3d 100644 --- a/airflow/api_connexion/endpoints/dag_warning_endpoint.py +++ b/airflow/api_connexion/endpoints/dag_warning_endpoint.py @@ -18,7 +18,6 @@ from typing import TYPE_CHECKING -from flask import g from sqlalchemy import select from airflow.api_connexion import security @@ -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 @@ -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) diff --git a/airflow/api_connexion/security.py b/airflow/api_connexion/security.py index ae468316a3158..0aa504a837f28 100644 --- a/airflow/api_connexion/security.py +++ b/airflow/api_connexion/security.py @@ -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)