Refactor test fixtures DAGs to have tasks and taskgroups as list

Author: pankajkoti

tests/fixtures/dag_factory.yml

@@ -19,15 +19,15 @@ example_dag:
   doc_md: '##here is a doc md string'
   schedule_interval: 0 3 * * *
   tasks:
-    task_1:
+    - task_id: "task_1"
       bash_command: echo 1
       operator: airflow.operators.bash.BashOperator
-    task_2:
+    - task_id: "task_2"
       bash_command: echo 2
       dependencies:
       - task_1
       operator: airflow.operators.bash.BashOperator
-    task_3:
+    - task_id: "task_3"
       bash_command: echo 3
       dependencies:
       - task_1
@@ -36,15 +36,15 @@ example_dag2:
   doc_md_file_path: $PWD/tests/fixtures/mydocfile.md
   schedule_interval: None
   tasks:
-    task_1:
+    - task_id: "task_1"
       bash_command: echo 1
       operator: airflow.operators.bash.BashOperator
-    task_2:
+    - task_id: "task_2"
       bash_command: echo 2
       dependencies:
       - task_1
       operator: airflow.operators.bash.BashOperator
-    task_3:
+    - task_id: "task_3"
       bash_command: echo 3
       dependencies:
       - task_1
@@ -56,14 +56,14 @@ example_dag3:
   doc_md_python_callable_file: $PWD/tests/fixtures/doc_md_builder.py
   doc_md_python_callable_name: mydocmdbuilder
   tasks:
-    task_1:
+    - task_id: "task_1"
       bash_command: echo 1
       operator: airflow.operators.bash.BashOperator
 example_dag4:
   vars:
     arg1: &arg1 'hello'
     arg2: &arg2 !join [*arg1, ' world']
   tasks:
-    task_1:
+    - task_id: "task_1"
       bash_command: !join ['echo ', *arg2]
       operator: airflow.operators.bash.BashOperator

tests/fixtures/dag_factory_http_operator_task.yml

@@ -11,23 +11,23 @@ http_operator_example_dag:
   tags: ['http']
   render_template_as_native_obj: True
   tasks:
-    send_request_json:
+    - task_id: "send_request_json"
       operator: airflow.providers.http.operators.http.HttpOperator
       http_conn_id: "example_host"
       method: "POST"
       endpoint: "/run_test"
-      data: 
+      data:
         data: "fake_data"
         format: "json"
       headers:
         Content-Type: application/json
       log_response: True
-    send_request_plain_text:
+    - task_id: "send_request_plain_text"
       operator: airflow.providers.http.operators.http.HttpOperator
       http_conn_id: "example_host"
       method: "POST"
       endpoint: "/run_test"
-      data: 
+      data:
         data: "fake_data"
         test: "plain_text"
       headers:

tests/fixtures/dag_factory_kubernetes_pod_operator.yml

@@ -13,7 +13,7 @@ default:
   schedule_interval: '0 1 * * *'
 example_dag:
   tasks:
-    task_1:
+    - task_id: "task_1"
       operator: airflow.providers.cncf.kubernetes.operators.pod.KubernetesPodOperator
       namespace: 'default'
       config_file : 'path_to_config_file'
@@ -50,11 +50,10 @@ example_dag:
       ]
       labels: {'foo': 'bar'}
       name: 'passing-test'
-      task_id: 'passing-task'
       get_logs: True
       in_cluster: False
       dependencies: []
-    task_2:
+    - task_id: "task_2"
       operator: airflow.providers.cncf.kubernetes.operators.pod.KubernetesPodOperator
       namespace: 'default'
       config_file : 'path_to_config_file'
@@ -67,7 +66,6 @@ example_dag:
       ]
       labels: {'foo': 'bar'}
       name: 'passing-test'
-      task_id: 'passing-task'
       get_logs: True
       in_cluster: False
       dependencies: ['task_1']

tests/fixtures/dag_factory_kubernetes_pod_operator_lt_2_7.yml

@@ -13,7 +13,7 @@ default:
   schedule_interval: '0 1 * * *'
 example_dag:
   tasks:
-    task_1:
+    - task_id: "task_1"
       operator: airflow.providers.cncf.kubernetes.operators.kubernetes_pod.KubernetesPodOperator
       namespace: 'default'
       config_file : 'path_to_config_file'
@@ -50,11 +50,10 @@ example_dag:
       ]
       labels: {'foo': 'bar'}
       name: 'passing-test'
-      task_id: 'passing-task'
       get_logs: True
       in_cluster: False
       dependencies: []
-    task_2:
+    - task_id: "task_2"
       operator: airflow.providers.cncf.kubernetes.operators.kubernetes_pod.KubernetesPodOperator
       namespace: 'default'
       config_file : 'path_to_config_file'
@@ -67,7 +66,6 @@ example_dag:
       ]
       labels: {'foo': 'bar'}
       name: 'passing-test'
-      task_id: 'passing-task'
       get_logs: True
       in_cluster: False
       dependencies: ['task_1']

tests/fixtures/dag_factory_no_or_none_string_schedule.yml

@@ -5,15 +5,15 @@ example_dag_no_schedule:
   description: this is an example dag
   doc_md: '##here is a doc md string'
   tasks:
-    task_1:
+    - task_id: "task_1"
       bash_command: echo 1
       operator: airflow.operators.bash.BashOperator
-    task_2:
+    - task_id: "task_2"
       bash_command: echo 2
       dependencies:
       - task_1
       operator: airflow.operators.bash.BashOperator
-    task_3:
+    - task_id: "task_3"
       bash_command: echo 3
       dependencies:
       - task_1
@@ -28,15 +28,15 @@ example_dag_none_string_schedule:
   description: this is an example dag
   doc_md: '##here is a doc md string'
   tasks:
-    task_1:
+    - task_id: "task_1"
       bash_command: echo 1
       operator: airflow.operators.bash.BashOperator
-    task_2:
+    - task_id: "task_2"
       bash_command: echo 2
       dependencies:
       - task_1
       operator: airflow.operators.bash.BashOperator
-    task_3:
+    - task_id: "task_3"
       bash_command: echo 3
       dependencies:
       - task_1

tests/fixtures/dag_factory_simple_http_operator_task.yml

@@ -11,23 +11,23 @@ simple_http_operator_example_dag:
   tags: ['http']
   render_template_as_native_obj: True
   tasks:
-    send_request_json:
+    - task_id: "send_request_json"
       operator: airflow.operators.http_operator.SimpleHttpOperator
       http_conn_id: "example_host"
       method: "POST"
       endpoint: "/run_test"
-      data: 
+      data:
         data: "fake_data"
         format: "json"
       headers:
         Content-Type: application/json
       log_response: True
-    send_request_plain_text:
+    - task_id: "send_request_plain_text"
       operator: airflow.operators.http_operator.SimpleHttpOperator
       http_conn_id: "example_host"
       method: "POST"
       endpoint: "/run_test"
-      data: 
+      data:
         data: "fake_data"
         test: "plain_text"
       headers:

tests/fixtures/dag_factory_task_group.yml

@@ -12,24 +12,24 @@ default:
 example_dag:
   description: "this dag uses task groups"
   task_groups:
-    task_group_1:
+    - group_name: "task_group_1"
       tooltip: "this is a task group"
       dependencies: [task_1]
   tasks:
-    task_1:
+    - task_id: "task_1"
       operator: airflow.operators.bash.BashOperator
       bash_command: "echo 1"
-    task_2:
+    - task_id: "task_2"
       operator: airflow.operators.bash.BashOperator
       bash_command: "echo 2"
       task_group_name: task_group_1
-    task_3:
+    - task_id: "task_3"
       operator: airflow.operators.python.PythonOperator
       python_callable_name: print_hello
       python_callable_file: examples/print_hello.py
       task_group_name: task_group_1
       dependencies: [task_2]
-    task_4:
+    - task_id: "task_4"
       operator: airflow.operators.bash.BashOperator
       bash_command: "echo 1"
       dependencies: [task_group_1]

tests/fixtures/dag_factory_variables_as_arguments.yml

@@ -19,14 +19,14 @@ example_dag:
   description: 'this is an example dag'
   schedule_interval: '0 3 * * *'
   tasks:
-    task_1:
+    - task_id: "task_1"
       operator: airflow.operators.bash.BashOperator
       bash_command: 'echo 1'
-    task_2:
+    - task_id: "task_2"
       operator: airflow.operators.bash.BashOperator
       bash_command: 'echo 2'
       dependencies: [task_1]
-    task_3:
+    - task_id: "task_3"
       operator: airflow.operators.bash.BashOperator
       bash_command: 'echo 3'
       dependencies: [task_1]
@@ -41,6 +41,6 @@ second_example_dag:
   description: 'this is a second example dag'
   schedule_interval: '0 6 * * *'
   tasks:
-    task_0:
+    - task_id: "task_0"
       operator: airflow.operators.bash.BashOperator
       bash_command: 'echo 1'

tests/fixtures/dag_md_docs.yml

@@ -15,15 +15,15 @@ default:
 example_dag2:
   schedule_interval: None
   tasks:
-    task_1:
+    - task_id: "task_1"
       bash_command: echo 1
       operator: airflow.operators.bash.BashOperator
-    task_2:
+    - task_id: "task_2"
       bash_command: echo 2
       dependencies:
       - task_1
       operator: airflow.operators.bash.BashOperator
-    task_3:
+    - task_id: "task_3"
       bash_command: echo 3
       dependencies:
       - task_1

tests/fixtures/invalid_dag_factory.yml

@@ -11,14 +11,14 @@ example_dag:
   description: 'this is an example dag'
   schedule_interval: '0 3 * * *'
   tasks:
-    task_1:
+    - task_id: "task_1"
       operator: airflow.operators.bash.BashOperator
       bash_command: 'echo 1'
-    task_2:
+    - task_id: "task_2"
       operator: airflow.operators.bash.BashOperator
       bash_command: 'echo 2'
       dependencies: [task_1]
-    task_3:
+    - task_id: "task_3"
       operator: airflow.operators.bash.BashOperator
       bash_command: 'echo 3'
       dependencies: [task_1]