Make Google Dataform operators templated_fields more consistent (#34187)

retsilla · web-flow · commit bf9769bebf71 · 2023-09-09T23:13:02.000+02:00
diff --git a/airflow/providers/google/cloud/operators/dataform.py b/airflow/providers/google/cloud/operators/dataform.py
@@ -66,7 +66,7 @@ class DataformCreateCompilationResultOperator(GoogleCloudBaseOperator):
         account from the list granting this role to the originating account (templated).
     """
 
-    template_fields = ("repository_id", "impersonation_chain")
+    template_fields = ("project_id", "region", "repository_id", "compilation_result", "impersonation_chain")
 
     def __init__(
         self,
@@ -132,7 +132,13 @@ class DataformGetCompilationResultOperator(GoogleCloudBaseOperator):
         account from the list granting this role to the originating account (templated).
     """
 
-    template_fields = ("repository_id", "compilation_result_id", "impersonation_chain")
+    template_fields = (
+        "project_id",
+        "region",
+        "repository_id",
+        "compilation_result_id",
+        "impersonation_chain",
+    )
 
     def __init__(
         self,
@@ -202,7 +208,7 @@ class DataformCreateWorkflowInvocationOperator(GoogleCloudBaseOperator):
     :param wait_time: Number of seconds between checks
     """
 
-    template_fields = ("workflow_invocation", "impersonation_chain")
+    template_fields = ("project_id", "region", "repository_id", "workflow_invocation", "impersonation_chain")
     operator_extra_links = (DataformWorkflowInvocationLink(),)
 
     def __init__(
@@ -291,7 +297,13 @@ class DataformGetWorkflowInvocationOperator(GoogleCloudBaseOperator):
         account from the list granting this role to the originating account (templated).
     """
 
-    template_fields = ("repository_id", "workflow_invocation_id", "impersonation_chain")
+    template_fields = (
+        "project_id",
+        "region",
+        "repository_id",
+        "workflow_invocation_id",
+        "impersonation_chain",
+    )
     operator_extra_links = (DataformWorkflowInvocationLink(),)
 
     def __init__(
@@ -358,7 +370,13 @@ class DataformCancelWorkflowInvocationOperator(GoogleCloudBaseOperator):
         account from the list granting this role to the originating account (templated).
     """
 
-    template_fields = ("repository_id", "workflow_invocation_id", "impersonation_chain")
+    template_fields = (
+        "project_id",
+        "region",
+        "repository_id",
+        "workflow_invocation_id",
+        "impersonation_chain",
+    )
     operator_extra_links = (DataformWorkflowInvocationLink(),)
 
     def __init__(
@@ -426,6 +444,7 @@ class DataformCreateRepositoryOperator(GoogleCloudBaseOperator):
     operator_extra_links = (DataformRepositoryLink(),)
     template_fields = (
         "project_id",
+        "region",
         "repository_id",
         "impersonation_chain",
     )
@@ -505,6 +524,7 @@ class DataformDeleteRepositoryOperator(GoogleCloudBaseOperator):
 
     template_fields = (
         "project_id",
+        "region",
         "repository_id",
         "impersonation_chain",
     )
@@ -579,7 +599,9 @@ class DataformCreateWorkspaceOperator(GoogleCloudBaseOperator):
     operator_extra_links = (DataformWorkspaceLink(),)
     template_fields = (
         "project_id",
+        "region",
         "repository_id",
+        "workspace_id",
         "impersonation_chain",
     )
 
@@ -663,6 +685,7 @@ class DataformDeleteWorkspaceOperator(GoogleCloudBaseOperator):
 
     template_fields = (
         "project_id",
+        "region",
         "repository_id",
         "workspace_id",
         "impersonation_chain",
@@ -739,6 +762,7 @@ class DataformWriteFileOperator(GoogleCloudBaseOperator):
 
     template_fields = (
         "project_id",
+        "region",
         "repository_id",
         "workspace_id",
         "impersonation_chain",
@@ -820,6 +844,7 @@ class DataformMakeDirectoryOperator(GoogleCloudBaseOperator):
 
     template_fields = (
         "project_id",
+        "region",
         "repository_id",
         "workspace_id",
         "impersonation_chain",
@@ -900,6 +925,7 @@ class DataformRemoveFileOperator(GoogleCloudBaseOperator):
 
     template_fields = (
         "project_id",
+        "region",
         "repository_id",
         "workspace_id",
         "impersonation_chain",
@@ -978,6 +1004,7 @@ class DataformRemoveDirectoryOperator(GoogleCloudBaseOperator):
 
     template_fields = (
         "project_id",
+        "region",
         "repository_id",
         "workspace_id",
         "impersonation_chain",
@@ -1056,6 +1083,7 @@ class DataformInstallNpmPackagesOperator(GoogleCloudBaseOperator):
 
     template_fields = (
         "project_id",
+        "region",
         "repository_id",
         "workspace_id",
         "impersonation_chain",
