[AIRFLOW-6399] Serialization: DAG access_control field should be deco…

…rated field in DAG serialization (#7879) Co-authored by: Louis Simoneau <[email protected]> Co-authored-by: Long Le Xich <[email protected]> (cherry picked from commit 2d0db94)
apache · Mar 30, 2020 · 1c33562 · 1c33562
1 parent a7a233d
commit 1c33562
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/airflow/serialization/serialized_objects.py b/airflow/serialization/serialized_objects.py
@@ -500,7 +500,7 @@ class SerializedDAG(DAG, BaseSerialization):
     not pickle-able. SerializedDAG works for all DAGs.
     """
 
-    _decorated_fields = {'schedule_interval', 'default_args'}
+    _decorated_fields = {'schedule_interval', 'default_args', '_access_control'}
 
     @staticmethod
     def __get_constructor_defaults():  # pylint: disable=no-method-argument

diff --git a/tests/serialization/test_dag_serialization.py b/tests/serialization/test_dag_serialization.py
@@ -95,6 +95,18 @@
             },
         ],
         "timezone": "UTC",
+        "_access_control": {
+            "__type": "dict",
+            "__var": {
+                "test_role": {
+                    "__type": "set",
+                    "__var": [
+                        "can_dag_read",
+                        "can_dag_edit"
+                    ]
+                }
+            }
+        }
     },
 }
 
@@ -116,6 +128,9 @@ def make_simple_dag():
         },
         start_date=datetime(2019, 8, 1),
         is_paused_upon_creation=False,
+        access_control={
+            "test_role": {"can_dag_read", "can_dag_edit"}
+        }
     ) as dag:
         CustomOperator(task_id='custom_task')
         BashOperator(task_id='bash_task', bash_command='echo {{ task.task_id }}', owner='airflow')
@@ -215,12 +230,16 @@ def validate_serialized_dag(self, json_dag, ground_truth_dag):
 
         def sorted_serialized_dag(dag_dict):
             """
-            Sorts the "tasks" list in the serialised dag python dictionary
-            This is needed as the order of tasks should not matter but assertEqual
-            would fail if the order of tasks list changes in dag dictionary
+            Sorts the "tasks" list and "access_control" permissions in the
+            serialised dag python dictionary. This is needed as the order of
+            items should not matter but assertEqual would fail if the order of
+            items changes in the dag dictionary
             """
             dag_dict["dag"]["tasks"] = sorted(dag_dict["dag"]["tasks"],
                                               key=lambda x: sorted(x.keys()))
+            dag_dict["dag"]["_access_control"]["__var"]["test_role"]["__var"] = sorted(
+                dag_dict["dag"]["_access_control"]["__var"]["test_role"]["__var"]
+            )
             return dag_dict
 
         self.assertEqual(sorted_serialized_dag(ground_truth_dag),