Skip to content

Commit f6a85c6

Browse files
CrowiantAnton Nitochkin
andauthored
Replace imports from airflow.security.permissions module in fab provider due to future deprecation of the module. (#59755)
Co-authored-by: Anton Nitochkin <[email protected]>
1 parent a2f1180 commit f6a85c6

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/permissions_command.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ def cleanup_dag_permissions(dag_id: str, session: Session = NEW_SESSION) -> None
5050
from sqlalchemy import delete, select
5151

5252
from airflow.providers.fab.auth_manager.models import Permission, Resource, assoc_permission_role
53-
from airflow.security.permissions import RESOURCE_DAG_PREFIX, RESOURCE_DAG_RUN, RESOURCE_DETAILS_MAP
53+
from airflow.providers.fab.www.security.permissions import (
54+
RESOURCE_DAG_PREFIX,
55+
RESOURCE_DAG_RUN,
56+
RESOURCE_DETAILS_MAP,
57+
)
5458

5559
# Clean up specific DAG permissions
5660
dag_resources = session.scalars(
@@ -107,7 +111,7 @@ def permissions_cleanup(args):
107111
from airflow.models import DagModel
108112
from airflow.providers.fab.auth_manager.cli_commands.utils import get_application_builder
109113
from airflow.providers.fab.auth_manager.models import Resource
110-
from airflow.security.permissions import (
114+
from airflow.providers.fab.www.security.permissions import (
111115
RESOURCE_DAG_PREFIX,
112116
RESOURCE_DAG_RUN,
113117
RESOURCE_DETAILS_MAP,

providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
from airflow.providers.fab.www.security import permissions
102102
from airflow.providers.fab.www.security_manager import AirflowSecurityManagerV2
103103
from airflow.providers.fab.www.session import AirflowDatabaseSessionInterface
104-
from airflow.security.permissions import RESOURCE_BACKFILL
105104

106105
if TYPE_CHECKING:
107106
from airflow.providers.fab.www.security.permissions import (
@@ -236,7 +235,7 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
236235
(permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG_WARNING),
237236
(permissions.ACTION_CAN_READ, RESOURCE_ASSET),
238237
(permissions.ACTION_CAN_READ, RESOURCE_ASSET_ALIAS),
239-
(permissions.ACTION_CAN_READ, RESOURCE_BACKFILL),
238+
(permissions.ACTION_CAN_READ, permissions.RESOURCE_BACKFILL),
240239
(permissions.ACTION_CAN_READ, permissions.RESOURCE_CLUSTER_ACTIVITY),
241240
(permissions.ACTION_CAN_READ, permissions.RESOURCE_POOL),
242241
(permissions.ACTION_CAN_READ, permissions.RESOURCE_IMPORT_ERROR),
@@ -308,9 +307,9 @@ class FabAirflowSecurityManagerOverride(AirflowSecurityManagerV2):
308307
(permissions.ACTION_CAN_DELETE, permissions.RESOURCE_XCOM),
309308
(permissions.ACTION_CAN_CREATE, RESOURCE_ASSET),
310309
(permissions.ACTION_CAN_DELETE, RESOURCE_ASSET),
311-
(permissions.ACTION_CAN_CREATE, RESOURCE_BACKFILL),
312-
(permissions.ACTION_CAN_EDIT, RESOURCE_BACKFILL),
313-
(permissions.ACTION_CAN_DELETE, RESOURCE_BACKFILL),
310+
(permissions.ACTION_CAN_CREATE, permissions.RESOURCE_BACKFILL),
311+
(permissions.ACTION_CAN_EDIT, permissions.RESOURCE_BACKFILL),
312+
(permissions.ACTION_CAN_DELETE, permissions.RESOURCE_BACKFILL),
314313
]
315314
# [END security_op_perms]
316315

providers/fab/tests/unit/fab/auth_manager/cli_commands/test_permissions_command.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ def test_cleanup_dag_permissions_removes_specific_dag_resources(self):
256256
cleanup_dag_permissions,
257257
)
258258
from airflow.providers.fab.auth_manager.models import Action, Permission, Resource
259-
from airflow.security.permissions import RESOURCE_DAG_PREFIX
259+
from airflow.providers.fab.www.security.permissions import RESOURCE_DAG_PREFIX
260260
from airflow.utils.session import create_session
261261

262262
with create_session() as session:
@@ -309,7 +309,7 @@ def test_cleanup_dag_permissions_handles_resources_without_permissions(self):
309309
cleanup_dag_permissions,
310310
)
311311
from airflow.providers.fab.auth_manager.models import Resource
312-
from airflow.security.permissions import RESOURCE_DAG_PREFIX
312+
from airflow.providers.fab.www.security.permissions import RESOURCE_DAG_PREFIX
313313
from airflow.utils.session import create_session
314314

315315
with create_session() as session:
@@ -330,7 +330,7 @@ def test_cleanup_dag_permissions_with_default_session(self):
330330
cleanup_dag_permissions,
331331
)
332332
from airflow.providers.fab.auth_manager.models import Resource
333-
from airflow.security.permissions import RESOURCE_DAG_PREFIX
333+
from airflow.providers.fab.www.security.permissions import RESOURCE_DAG_PREFIX
334334
from airflow.utils.session import create_session
335335

336336
# Setup test data

0 commit comments

Comments
 (0)