Skip to content

Commit bf9769b

Browse files
authored
Make Google Dataform operators templated_fields more consistent (#34187)
1 parent 7b4fc39 commit bf9769b

File tree

1 file changed

+33
-5
lines changed

1 file changed

+33
-5
lines changed

β€Žairflow/providers/google/cloud/operators/dataform.py

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class DataformCreateCompilationResultOperator(GoogleCloudBaseOperator):
6666
account from the list granting this role to the originating account (templated).
6767
"""
6868

69-
template_fields = ("repository_id", "impersonation_chain")
69+
template_fields = ("project_id", "region", "repository_id", "compilation_result", "impersonation_chain")
7070

7171
def __init__(
7272
self,
@@ -132,7 +132,13 @@ class DataformGetCompilationResultOperator(GoogleCloudBaseOperator):
132132
account from the list granting this role to the originating account (templated).
133133
"""
134134

135-
template_fields = ("repository_id", "compilation_result_id", "impersonation_chain")
135+
template_fields = (
136+
"project_id",
137+
"region",
138+
"repository_id",
139+
"compilation_result_id",
140+
"impersonation_chain",
141+
)
136142

137143
def __init__(
138144
self,
@@ -202,7 +208,7 @@ class DataformCreateWorkflowInvocationOperator(GoogleCloudBaseOperator):
202208
:param wait_time: Number of seconds between checks
203209
"""
204210

205-
template_fields = ("workflow_invocation", "impersonation_chain")
211+
template_fields = ("project_id", "region", "repository_id", "workflow_invocation", "impersonation_chain")
206212
operator_extra_links = (DataformWorkflowInvocationLink(),)
207213

208214
def __init__(
@@ -291,7 +297,13 @@ class DataformGetWorkflowInvocationOperator(GoogleCloudBaseOperator):
291297
account from the list granting this role to the originating account (templated).
292298
"""
293299

294-
template_fields = ("repository_id", "workflow_invocation_id", "impersonation_chain")
300+
template_fields = (
301+
"project_id",
302+
"region",
303+
"repository_id",
304+
"workflow_invocation_id",
305+
"impersonation_chain",
306+
)
295307
operator_extra_links = (DataformWorkflowInvocationLink(),)
296308

297309
def __init__(
@@ -358,7 +370,13 @@ class DataformCancelWorkflowInvocationOperator(GoogleCloudBaseOperator):
358370
account from the list granting this role to the originating account (templated).
359371
"""
360372

361-
template_fields = ("repository_id", "workflow_invocation_id", "impersonation_chain")
373+
template_fields = (
374+
"project_id",
375+
"region",
376+
"repository_id",
377+
"workflow_invocation_id",
378+
"impersonation_chain",
379+
)
362380
operator_extra_links = (DataformWorkflowInvocationLink(),)
363381

364382
def __init__(
@@ -426,6 +444,7 @@ class DataformCreateRepositoryOperator(GoogleCloudBaseOperator):
426444
operator_extra_links = (DataformRepositoryLink(),)
427445
template_fields = (
428446
"project_id",
447+
"region",
429448
"repository_id",
430449
"impersonation_chain",
431450
)
@@ -505,6 +524,7 @@ class DataformDeleteRepositoryOperator(GoogleCloudBaseOperator):
505524

506525
template_fields = (
507526
"project_id",
527+
"region",
508528
"repository_id",
509529
"impersonation_chain",
510530
)
@@ -579,7 +599,9 @@ class DataformCreateWorkspaceOperator(GoogleCloudBaseOperator):
579599
operator_extra_links = (DataformWorkspaceLink(),)
580600
template_fields = (
581601
"project_id",
602+
"region",
582603
"repository_id",
604+
"workspace_id",
583605
"impersonation_chain",
584606
)
585607

@@ -663,6 +685,7 @@ class DataformDeleteWorkspaceOperator(GoogleCloudBaseOperator):
663685

664686
template_fields = (
665687
"project_id",
688+
"region",
666689
"repository_id",
667690
"workspace_id",
668691
"impersonation_chain",
@@ -739,6 +762,7 @@ class DataformWriteFileOperator(GoogleCloudBaseOperator):
739762

740763
template_fields = (
741764
"project_id",
765+
"region",
742766
"repository_id",
743767
"workspace_id",
744768
"impersonation_chain",
@@ -820,6 +844,7 @@ class DataformMakeDirectoryOperator(GoogleCloudBaseOperator):
820844

821845
template_fields = (
822846
"project_id",
847+
"region",
823848
"repository_id",
824849
"workspace_id",
825850
"impersonation_chain",
@@ -900,6 +925,7 @@ class DataformRemoveFileOperator(GoogleCloudBaseOperator):
900925

901926
template_fields = (
902927
"project_id",
928+
"region",
903929
"repository_id",
904930
"workspace_id",
905931
"impersonation_chain",
@@ -978,6 +1004,7 @@ class DataformRemoveDirectoryOperator(GoogleCloudBaseOperator):
9781004

9791005
template_fields = (
9801006
"project_id",
1007+
"region",
9811008
"repository_id",
9821009
"workspace_id",
9831010
"impersonation_chain",
@@ -1056,6 +1083,7 @@ class DataformInstallNpmPackagesOperator(GoogleCloudBaseOperator):
10561083

10571084
template_fields = (
10581085
"project_id",
1086+
"region",
10591087
"repository_id",
10601088
"workspace_id",
10611089
"impersonation_chain",

0 commit comments

Comments
 (0)