This is an automated email from the ASF dual-hosted git repository.
ash pushed a commit to branch move-auth-managers
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/move-auth-managers by this
push:
new 45d03285b81 fixup! Relocate airflow.auth to airflow.api_fastapi.auth
45d03285b81 is described below
commit 45d03285b8113ba428127e42aa150a3ecb8affcb
Author: Ash Berlin-Taylor <[email protected]>
AuthorDate: Fri Mar 7 16:01:20 2025 +0000
fixup! Relocate airflow.auth to airflow.api_fastapi.auth
---
.../compat/src/airflow/providers/common/compat/assets/__init__.py | 2 +-
.../airflow/providers/databricks/plugins/databricks_workflow.py | 5 ++++-
.../src/airflow/providers/edge/plugins/edge_executor_plugin.py | 7 ++++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/providers/common/compat/src/airflow/providers/common/compat/assets/__init__.py
b/providers/common/compat/src/airflow/providers/common/compat/assets/__init__.py
index 2108fabce30..01e218d9208 100644
---
a/providers/common/compat/src/airflow/providers/common/compat/assets/__init__.py
+++
b/providers/common/compat/src/airflow/providers/common/compat/assets/__init__.py
@@ -35,7 +35,7 @@ else:
from airflow.sdk.definitions.asset import Asset, AssetAlias, AssetAll,
AssetAny
else:
# dataset is renamed to asset since Airflow 3.0
- from airflow.api_fastapi.auth.managers.models.resource_details import
DatasetDetails as AssetDetails
+ from airflow.auth.managers.models.resource_details import
DatasetDetails as AssetDetails
from airflow.datasets import (
Dataset as Asset,
DatasetAll as AssetAll,
diff --git
a/providers/databricks/src/airflow/providers/databricks/plugins/databricks_workflow.py
b/providers/databricks/src/airflow/providers/databricks/plugins/databricks_workflow.py
index 4e99e5501b1..3dc8646b9b3 100644
---
a/providers/databricks/src/airflow/providers/databricks/plugins/databricks_workflow.py
+++
b/providers/databricks/src/airflow/providers/databricks/plugins/databricks_workflow.py
@@ -62,7 +62,10 @@ REPAIR_WAIT_DELAY =
os.getenv("DATABRICKS_REPAIR_WAIT_DELAY", 0.5)
def get_auth_decorator():
- from airflow.api_fastapi.auth.managers.models.resource_details import
DagAccessEntity
+ if AIRFLOW_V_3_0_PLUS:
+ from airflow.api_fastapi.auth.managers.models.resource_details import
DagAccessEntity
+ else:
+ from airflow.auth.managers.models.resource_details import
DagAccessEntity
return auth.has_access_dag("POST", DagAccessEntity.RUN)
diff --git
a/providers/edge/src/airflow/providers/edge/plugins/edge_executor_plugin.py
b/providers/edge/src/airflow/providers/edge/plugins/edge_executor_plugin.py
index b6986b78190..a81d2f6bf73 100644
--- a/providers/edge/src/airflow/providers/edge/plugins/edge_executor_plugin.py
+++ b/providers/edge/src/airflow/providers/edge/plugins/edge_executor_plugin.py
@@ -27,7 +27,6 @@ from flask_appbuilder import BaseView, expose
from markupsafe import Markup
from sqlalchemy import select
-from airflow.api_fastapi.auth.managers.models.resource_details import
AccessView
from airflow.configuration import conf
from airflow.exceptions import AirflowConfigException
from airflow.models.taskinstance import TaskInstanceState
@@ -36,10 +35,12 @@ from airflow.providers.edge.version_compat import
AIRFLOW_V_3_0_PLUS
from airflow.utils.state import State
if AIRFLOW_V_3_0_PLUS:
+ from airflow.api_fastapi.auth.managers.models.resource_details import
AccessView
from airflow.providers.fab.www.auth import has_access_view
else:
- from airflow.www.auth import has_access_view # type: ignore
-from airflow.utils.session import NEW_SESSION, provide_session
+ from airflow.auth.managers.models.resource_details import AccessView #
type: ignore[no-redef]
+ from airflow.utils.session import NEW_SESSION, provide_session
+ from airflow.www.auth import has_access_view # type: ignore[no-redef]
from airflow.utils.yaml import safe_load
if TYPE_CHECKING:
