This is an automated email from the ASF dual-hosted git repository.
dimberman 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 904a94a3f26 Revert "Disable _sync_dag_perms until we can fix its
implementation (#45087)" (#45091)
904a94a3f26 is described below
commit 904a94a3f2677c5e28ebd17ae56afed3165a19a2
Author: Jed Cunningham <[email protected]>
AuthorDate: Thu Dec 19 12:45:56 2024 -0700
Revert "Disable _sync_dag_perms until we can fix its implementation
(#45087)" (#45091)
This reverts commit 80c5f3593aecbdcad77f83b62704c76f4d78f3a6.
---
airflow/dag_processing/collection.py | 14 ++++----------
tests/dag_processing/test_collection.py | 2 --
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/airflow/dag_processing/collection.py
b/airflow/dag_processing/collection.py
index 12a79d370b6..9c8f05c194a 100644
--- a/airflow/dag_processing/collection.py
+++ b/airflow/dag_processing/collection.py
@@ -188,17 +188,11 @@ def _serialize_dag_capturing_errors(dag:
MaybeSerializedDAG, session: Session, p
session=session,
processor_subdir=processor_subdir,
)
- # TODO: Currently _sync_dag_perms is FAB specific. We need to
re-implement it using the auth manager
- # interface. In the short term, we are going to disable it but this
should be fixed and re-enabled
- # before AF3 is released
- # if dag_was_updated:
- # _sync_dag_perms(dag, session=session)
- # else:
- # # Check and update DagCode
- if not dag_was_updated:
+ if dag_was_updated:
+ _sync_dag_perms(dag, session=session)
+ else:
+ # Check and update DagCode
DagCode.update_source_code(dag.dag_id, dag.fileloc)
-
-
return []
except OperationalError:
raise
diff --git a/tests/dag_processing/test_collection.py
b/tests/dag_processing/test_collection.py
index ffee13798ad..3373e433639 100644
--- a/tests/dag_processing/test_collection.py
+++ b/tests/dag_processing/test_collection.py
@@ -177,7 +177,6 @@ class TestUpdateDagParsingResults:
get_listener_manager().clear()
dag_import_error_listener.clear()
- @pytest.mark.skip("Skipping until we fix the implementation to not be
FAB-specific")
@pytest.mark.usefixtures("clean_db") # sync_perms in fab has bad session
commit hygiene
def test_sync_perms_syncs_dag_specific_perms_on_update(
self, monkeypatch, spy_agency: SpyAgency, session, time_machine
@@ -393,7 +392,6 @@ class TestUpdateDagParsingResults:
assert import_errors == {"def.py"}
- @pytest.mark.skip("Skipping until we fix the implementation to not be
FAB-specific")
def test_sync_perm_for_dag_with_dict_access_control(self, session,
spy_agency: SpyAgency):
"""
Test that dagbag._sync_perm_for_dag will call
ApplessAirflowSecurityManager.sync_perm_for_dag
