Fokko closed pull request #2334: [AIRFLOW-1252] API - Fix when conf is in JSON
body
URL: https://github.com/apache/incubator-airflow/pull/2334
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/airflow/api/common/experimental/trigger_dag.py
b/airflow/api/common/experimental/trigger_dag.py
index d7353f66d1..0268752565 100644
--- a/airflow/api/common/experimental/trigger_dag.py
+++ b/airflow/api/common/experimental/trigger_dag.py
@@ -59,7 +59,10 @@ def _trigger_dag(
run_conf = None
if conf:
- run_conf = json.loads(conf)
+ if type(conf) is dict:
+ run_conf = conf
+ else:
+ run_conf = json.loads(conf)
triggers = list()
dags_to_trigger = list()
diff --git a/tests/api/common/experimental/trigger_dag_tests.py
b/tests/api/common/experimental/trigger_dag_tests.py
index d6354840e2..fc1d7cda8e 100644
--- a/tests/api/common/experimental/trigger_dag_tests.py
+++ b/tests/api/common/experimental/trigger_dag_tests.py
@@ -19,6 +19,7 @@
import mock
import unittest
+import json
from airflow.exceptions import AirflowException
from airflow.models import DAG, DagRun
@@ -88,6 +89,44 @@ def test_trigger_dag_include_subdags(self, dag_bag_mock,
dag_run_mock, dag_mock)
self.assertEqual(3, len(triggers))
+ @mock.patch('airflow.models.DagBag')
+ def test_trigger_dag_with_str_conf(self, dag_bag_mock):
+ dag_id = "trigger_dag_with_str_conf"
+ dag = DAG(dag_id)
+ dag_bag_mock.dags = [dag_id]
+ dag_bag_mock.get_dag.return_value = dag
+ conf = "{\"foo\": \"bar\"}"
+ dag_run = DagRun()
+ triggers = _trigger_dag(
+ dag_id,
+ dag_bag_mock,
+ dag_run,
+ run_id=None,
+ conf=conf,
+ execution_date=None,
+ replace_microseconds=True)
+
+ self.assertEquals(triggers[0].conf, json.loads(conf))
+
+ @mock.patch('airflow.models.DagBag')
+ def test_trigger_dag_with_dict_conf(self, dag_bag_mock):
+ dag_id = "trigger_dag_with_dict_conf"
+ dag = DAG(dag_id)
+ dag_bag_mock.dags = [dag_id]
+ dag_bag_mock.get_dag.return_value = dag
+ conf = dict(foo="bar")
+ dag_run = DagRun()
+ triggers = _trigger_dag(
+ dag_id,
+ dag_bag_mock,
+ dag_run,
+ run_id=None,
+ conf=conf,
+ execution_date=None,
+ replace_microseconds=True)
+
+ self.assertEquals(triggers[0].conf, conf)
+
if __name__ == '__main__':
unittest.main()
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
