Skip to content

Commit a11d93a

Browse files
Fixed : Failing test(s): TestAccDataflowJobWithAdditionalExperiments permadiff on google_dataflow_job.labels (#6602) (#4928)
* changed_dataflow_job_read_function * Modify_Read_function_to_fix_the_Test_Failures * removing the skiIfVcr * ignoring the API values in additional_experiments attr * reverting ruby version * ignoring the read for additional_experiments * addressing the review comment and skipping the test TestAccDataflowJobWithAdditionalExperiments in VCR * commiting to run pipeline Signed-off-by: Modular Magician <[email protected]> Signed-off-by: Modular Magician <[email protected]>
1 parent 77c1806 commit a11d93a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.changelog/6602.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
```release-note:bug
2+
dataflow: Fixed permadiff on additional_experiments for `google_dataflow_job`
3+
4+
```

google-beta/resource_dataflow_job.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,6 @@ func resourceDataflowJobRead(d *schema.ResourceData, meta interface{}) error {
365365
if err := d.Set("service_account_email", optionsMap["serviceAccountEmail"]); err != nil {
366366
return fmt.Errorf("Error setting service_account_email: %s", err)
367367
}
368-
if err := d.Set("additional_experiments", optionsMap["experiments"]); err != nil {
369-
return fmt.Errorf("Error setting additional_experiments: %s", err)
370-
}
371368

372369
if ok := shouldStopDataflowJobDeleteQuery(job.CurrentState, d.Get("skip_wait_on_job_termination").(bool)); ok {
373370
log.Printf("[DEBUG] Removing resource '%s' because it is in state %s.\n", job.Name, job.CurrentState)

google-beta/resource_dataflow_job_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ func TestAccDataflowJobWithAdditionalExperiments(t *testing.T) {
339339
ResourceName: "google_dataflow_job.with_additional_experiments",
340340
ImportState: true,
341341
ImportStateVerify: true,
342-
ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "state"},
342+
ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "state", "additional_experiments"},
343343
},
344344
},
345345
})
@@ -455,7 +455,6 @@ func testAccCheckDataflowJobRegionDestroyProducer(t *testing.T) func(s *terrafor
455455
if rs.Type != "google_dataflow_job" {
456456
continue
457457
}
458-
459458
config := googleProviderConfig(t)
460459
job, err := config.NewDataflowClient(config.userAgent).Projects.Locations.Jobs.Get(config.Project, "us-central1", rs.Primary.ID).Do()
461460
if job != nil {

0 commit comments

Comments
 (0)