Repository: incubator-airflow Updated Branches: refs/heads/master 7ca45b252 -> 961aa0581
[AIRFLOW-2016] assign template_fields for Dataproc Workflow Template sub-classes, not base class Closes #3346 from mchalek/mchalek-fix-inline- workflow-template-operator Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/961aa058 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/961aa058 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/961aa058 Branch: refs/heads/master Commit: 961aa05812c42c31f92a3c5047ec6617346b2de6 Parents: 7ca45b2 Author: Kevin McHale <[email protected]> Authored: Thu May 10 22:33:19 2018 +0100 Committer: Kaxil Naik <[email protected]> Committed: Thu May 10 22:33:19 2018 +0100 ---------------------------------------------------------------------- airflow/contrib/operators/dataproc_operator.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/961aa058/airflow/contrib/operators/dataproc_operator.py ---------------------------------------------------------------------- diff --git a/airflow/contrib/operators/dataproc_operator.py b/airflow/contrib/operators/dataproc_operator.py index 1614720..6b1dbee 100644 --- a/airflow/contrib/operators/dataproc_operator.py +++ b/airflow/contrib/operators/dataproc_operator.py @@ -1031,8 +1031,6 @@ class DataProcPySparkOperator(BaseOperator): class DataprocWorkflowTemplateBaseOperator(BaseOperator): - template_fields = ['template_id', 'template'] - @apply_defaults def __init__(self, project_id, @@ -1083,6 +1081,8 @@ class DataprocWorkflowTemplateInstantiateOperator(DataprocWorkflowTemplateBaseOp :type delegate_to: string """ + template_fields = ['template_id'] + @apply_defaults def __init__(self, template_id, *args, **kwargs): (super(DataprocWorkflowTemplateInstantiateOperator, self) @@ -1125,6 +1125,8 @@ class DataprocWorkflowTemplateInstantiateInlineOperator( :type delegate_to: string """ + template_fields = ['template'] + @apply_defaults def __init__(self, template, *args, **kwargs): (super(DataprocWorkflowTemplateInstantiateInlineOperator, self)
