Fix dataflow flextemplate job labels (#6559) (#4748)

Signed-off-by: Modular Magician <magic-modules@google.com> Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Oct 3, 2022 · d232057 · d232057
1 parent 4da9edb
commit d232057
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/.changelog/6559.txt b/.changelog/6559.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+dataflow : added support of `labels` to resource `google_dataflow_flextemplate_job` (beta)
+```
diff --git a/google-beta/resource_dataflow_flex_template_job.go b/google-beta/resource_dataflow_flex_template_job.go
@@ -57,8 +57,6 @@ func resourceDataflowFlexTemplateJob() *schema.Resource {
 				Type:             schema.TypeMap,
 				Optional:         true,
 				DiffSuppressFunc: resourceDataflowJobLabelDiffSuppress,
-				// TODO add support for labels when the API supports it
-				Deprecated: "Deprecated until the API supports this field",
 			},
 
 			"parameters": {
@@ -117,6 +115,9 @@ func resourceDataflowFlexTemplateJobCreate(d *schema.ResourceData, meta interfac
 			ContainerSpecGcsPath: d.Get("container_spec_gcs_path").(string),
 			JobName:              d.Get("name").(string),
 			Parameters:           expandStringMap(d, "parameters"),
+			Environment: &dataflow.FlexTemplateRuntimeEnvironment{
+				AdditionalUserLabels: expandStringMap(d, "labels"),
+			},
 		},
 	}
 
@@ -126,6 +127,13 @@ func resourceDataflowFlexTemplateJobCreate(d *schema.ResourceData, meta interfac
 	}
 
 	job := response.Job
+
+	//adding wait time for setting all the parameters into state file
+	err = waitForDataflowJobState(d, config, job.Id, userAgent, d.Timeout(schema.TimeoutUpdate), "JOB_STATE_RUNNING")
+	if err != nil {
+		return fmt.Errorf("Error waiting for job with job ID %q to be running: %s", job.Id, err)
+	}
+
 	d.SetId(job.Id)
 	if err := d.Set("job_id", job.Id); err != nil {
 		return fmt.Errorf("Error setting job_id: %s", err)
@@ -253,7 +261,10 @@ func resourceDataflowFlexTemplateJobUpdate(d *schema.ResourceData, meta interfac
 			ContainerSpecGcsPath: d.Get("container_spec_gcs_path").(string),
 			JobName:              d.Get("name").(string),
 			Parameters:           expandStringMap(d, "parameters"),
-			Update:               true,
+			Environment: &dataflow.FlexTemplateRuntimeEnvironment{
+				AdditionalUserLabels: expandStringMap(d, "labels"),
+			},
+			Update: true,
 		},
 	}
 

diff --git a/google-beta/resource_dataflow_flex_template_job_test.go b/google-beta/resource_dataflow_flex_template_job_test.go
@@ -204,6 +204,9 @@ resource "google_dataflow_flex_template_job" "job" {
     qps = "1"
     %s
   }
+  labels = {
+   "my_labels" = "value"
+  }
 }
 `, job, topicField)
 }
@@ -237,6 +240,9 @@ resource "google_dataflow_flex_template_job" "job" {
     serviceAccount = google_service_account.dataflow-sa.email
     zone = "%s"
   }
+  labels = {
+   "my_labels" = "value"
+  }
 }
 `, accountId, job, zone)
 }

diff --git a/website/docs/r/dataflow_flex_template_job.html.markdown b/website/docs/r/dataflow_flex_template_job.html.markdown
@@ -95,8 +95,7 @@ such as `serviceAccount`, `workerMachineType`, etc can be specified here.
 
 * `labels` - (Optional) User labels to be specified for the job. Keys and values
 should follow the restrictions specified in the [labeling restrictions](https://cloud.google.com/compute/docs/labeling-resources#restrictions)
-page. **Note**: This field is marked as deprecated in Terraform as the API does not currently
-support adding labels.
+page. 
 **NOTE**: Google-provided Dataflow templates often provide default labels
 that begin with `goog-dataflow-provided`. Unless explicitly set in config, these
 labels will be ignored to prevent diffs on re-apply.