You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2020/06/22 14:04:52 UTC
[airflow] branch v1-10-test updated: [AIRFLOW-6231] Display DAG run
conf in the list view (#6794)
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v1-10-test by this push:
new d84d36c [AIRFLOW-6231] Display DAG run conf in the list view (#6794)
d84d36c is described below
commit d84d36c5d4b9c127aede106b62b34b017e2d91e1
Author: Daniel Huang <dx...@gmail.com>
AuthorDate: Thu May 28 04:49:49 2020 -0700
[AIRFLOW-6231] Display DAG run conf in the list view (#6794)
(cherry-picked from 902703d)
---
airflow/www_rbac/views.py | 4 ++--
tests/www_rbac/test_views.py | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/airflow/www_rbac/views.py b/airflow/www_rbac/views.py
index a09f77b..bf33f2b 100644
--- a/airflow/www_rbac/views.py
+++ b/airflow/www_rbac/views.py
@@ -2508,8 +2508,8 @@ class DagRunModelView(AirflowModelView):
base_permissions = ['can_list', 'can_add']
add_columns = ['state', 'dag_id', 'execution_date', 'run_id', 'external_trigger', 'conf']
- list_columns = ['state', 'dag_id', 'execution_date', 'run_id', 'external_trigger']
- search_columns = ['state', 'dag_id', 'execution_date', 'run_id', 'external_trigger']
+ list_columns = ['state', 'dag_id', 'execution_date', 'run_id', 'external_trigger', 'conf']
+ search_columns = ['state', 'dag_id', 'execution_date', 'run_id', 'external_trigger', 'conf']
base_order = ('execution_date', 'desc')
diff --git a/tests/www_rbac/test_views.py b/tests/www_rbac/test_views.py
index 0739230..b46c60a 100644
--- a/tests/www_rbac/test_views.py
+++ b/tests/www_rbac/test_views.py
@@ -2452,6 +2452,7 @@ class TestExtraLinks(TestBase):
class TestDagRunModelView(TestBase):
+
@classmethod
def setUpClass(cls):
super(TestDagRunModelView, cls).setUpClass()
@@ -2510,6 +2511,22 @@ class TestDagRunModelView(TestBase):
dr = self.session.query(models.DagRun).all()
self.assertFalse(dr)
+ def test_list_dagrun_includes_conf(self):
+ data = {
+ "state": "running",
+ "dag_id": "example_bash_operator",
+ "execution_date": "2018-07-06 05:06:03",
+ "run_id": "test_list_dagrun_includes_conf",
+ "conf": '{"include": "me"}'
+ }
+ self.client.post('/dagrun/add', data=data, follow_redirects=True)
+ dr = self.session.query(models.DagRun).one()
+ self.assertEqual(dr.execution_date, timezone.convert_to_utc(datetime(2018, 7, 6, 5, 6, 3)))
+ self.assertEqual(dr.conf, {"include": "me"})
+
+ resp = self.client.get('/dagrun/list', follow_redirects=True)
+ self.check_content_in_response("{'include': 'me'}", resp)
+
class TestDecorators(TestBase):
EXAMPLE_DAG_DEFAULT_DATE = dates.days_ago(2)