This is an automated email from the ASF dual-hosted git repository.
vincbeck pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new a65c73b4182 Remove unused entries from `DagAccessEntity` (#51174)
a65c73b4182 is described below
commit a65c73b4182edab27c391628f5ba3e09fa92bbf6
Author: Vincent <[email protected]>
AuthorDate: Mon Jun 2 13:40:22 2025 -0400
Remove unused entries from `DagAccessEntity` (#51174)
* Remove unused entries from `DagAccessEntity`
* Fix compat tests
---
.../api_fastapi/auth/managers/models/resource_details.py | 2 --
.../unit/amazon/aws/auth_manager/test_aws_auth_manager.py | 15 ++++++++++++---
.../providers/fab/auth_manager/fab_auth_manager.py | 4 ----
providers/fab/tests/unit/fab/www/test_auth.py | 1 -
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/airflow-core/src/airflow/api_fastapi/auth/managers/models/resource_details.py
b/airflow-core/src/airflow/api_fastapi/auth/managers/models/resource_details.py
index 7be79aff058..c89d599a60b 100644
---
a/airflow-core/src/airflow/api_fastapi/auth/managers/models/resource_details.py
+++
b/airflow-core/src/airflow/api_fastapi/auth/managers/models/resource_details.py
@@ -99,11 +99,9 @@ class DagAccessEntity(Enum):
CODE = "CODE"
DEPENDENCIES = "DEPENDENCIES"
RUN = "RUN"
- SLA_MISS = "SLA_MISS"
TASK = "TASK"
TASK_INSTANCE = "TASK_INSTANCE"
TASK_LOGS = "TASK_LOGS"
- TASK_RESCHEDULE = "TASK_RESCHEDULE"
VERSION = "VERSION"
WARNING = "WARNING"
XCOM = "XCOM"
diff --git
a/providers/amazon/tests/unit/amazon/aws/auth_manager/test_aws_auth_manager.py
b/providers/amazon/tests/unit/amazon/aws/auth_manager/test_aws_auth_manager.py
index fbffa23bf27..f739313211a 100644
---
a/providers/amazon/tests/unit/amazon/aws/auth_manager/test_aws_auth_manager.py
+++
b/providers/amazon/tests/unit/amazon/aws/auth_manager/test_aws_auth_manager.py
@@ -486,7 +486,18 @@ class TestAwsAuthManager:
]
+ [
{"method": "GET", "details": DagDetails(id="dag_1"),
"access_entity": dag_access_entity}
- for dag_access_entity in DagAccessEntity
+ for dag_access_entity in (
+ DagAccessEntity.AUDIT_LOG,
+ DagAccessEntity.CODE,
+ DagAccessEntity.DEPENDENCIES,
+ DagAccessEntity.RUN,
+ DagAccessEntity.TASK,
+ DagAccessEntity.TASK_INSTANCE,
+ DagAccessEntity.TASK_LOGS,
+ DagAccessEntity.VERSION,
+ DagAccessEntity.WARNING,
+ DagAccessEntity.XCOM,
+ )
],
user=mock,
)
@@ -518,11 +529,9 @@ class TestAwsAuthManager:
DagAccessEntity.CODE.value,
DagAccessEntity.DEPENDENCIES.value,
DagAccessEntity.RUN.value,
- DagAccessEntity.SLA_MISS.value,
DagAccessEntity.TASK.value,
DagAccessEntity.TASK_INSTANCE.value,
DagAccessEntity.TASK_LOGS.value,
- DagAccessEntity.TASK_RESCHEDULE.value,
DagAccessEntity.VERSION.value,
DagAccessEntity.WARNING.value,
DagAccessEntity.XCOM.value,
diff --git
a/providers/fab/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
b/providers/fab/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
index d6cd3c7f67a..074e26c8c7c 100644
--- a/providers/fab/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
+++ b/providers/fab/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
@@ -84,10 +84,8 @@ from airflow.providers.fab.www.security.permissions import (
RESOURCE_PLUGIN,
RESOURCE_POOL,
RESOURCE_PROVIDER,
- RESOURCE_SLA_MISS,
RESOURCE_TASK_INSTANCE,
RESOURCE_TASK_LOG,
- RESOURCE_TASK_RESCHEDULE,
RESOURCE_TRIGGER,
RESOURCE_VARIABLE,
RESOURCE_WEBSITE,
@@ -127,7 +125,6 @@ _MAP_DAG_ACCESS_ENTITY_TO_FAB_RESOURCE_TYPE:
dict[DagAccessEntity, tuple[str, ..
DagAccessEntity.CODE: (RESOURCE_DAG_CODE,),
DagAccessEntity.DEPENDENCIES: (RESOURCE_DAG_DEPENDENCIES,),
DagAccessEntity.RUN: (RESOURCE_DAG_RUN,),
- DagAccessEntity.SLA_MISS: (RESOURCE_SLA_MISS,),
# RESOURCE_TASK_INSTANCE has been originally misused.
RESOURCE_TASK_INSTANCE referred to task definition
# AND task instances without making the difference
# To be backward compatible, we translate DagAccessEntity.TASK_INSTANCE to
RESOURCE_TASK_INSTANCE AND
@@ -136,7 +133,6 @@ _MAP_DAG_ACCESS_ENTITY_TO_FAB_RESOURCE_TYPE:
dict[DagAccessEntity, tuple[str, ..
DagAccessEntity.TASK: (RESOURCE_TASK_INSTANCE,),
DagAccessEntity.TASK_INSTANCE: (RESOURCE_DAG_RUN, RESOURCE_TASK_INSTANCE),
DagAccessEntity.TASK_LOGS: (RESOURCE_TASK_LOG,),
- DagAccessEntity.TASK_RESCHEDULE: (RESOURCE_TASK_RESCHEDULE,),
DagAccessEntity.VERSION: (RESOURCE_DAG_VERSION,),
DagAccessEntity.WARNING: (RESOURCE_DAG_WARNING,),
DagAccessEntity.XCOM: (RESOURCE_XCOM,),
diff --git a/providers/fab/tests/unit/fab/www/test_auth.py
b/providers/fab/tests/unit/fab/www/test_auth.py
index d27930ec913..dfa7df6e4c4 100644
--- a/providers/fab/tests/unit/fab/www/test_auth.py
+++ b/providers/fab/tests/unit/fab/www/test_auth.py
@@ -188,7 +188,6 @@ class TestHasAccessWithDetails:
@pytest.mark.parametrize(
"dag_access_entity",
[
- DagAccessEntity.SLA_MISS,
DagAccessEntity.XCOM,
DagAccessEntity.RUN,
DagAccessEntity.TASK_INSTANCE,