Fixed : Failing test(s): TestAccDataflowJobWithAdditionalExperiments …

…permadiff on google_dataflow_job.labels (#6602) (#13136) * 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 <magic-modules@google.com> Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Nov 29, 2022 · 50e1f7d · 50e1f7d
1 parent 9d7fd88
commit 50e1f7d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.changelog/6602.txt b/.changelog/6602.txt
@@ -0,0 +1,4 @@
+```release-note:bug
+dataflow: Fixed permadiff on additional_experiments for `google_dataflow_job`
+
+```
diff --git a/google/resource_dataflow_job.go b/google/resource_dataflow_job.go
@@ -365,9 +365,6 @@ func resourceDataflowJobRead(d *schema.ResourceData, meta interface{}) error {
 	if err := d.Set("service_account_email", optionsMap["serviceAccountEmail"]); err != nil {
 		return fmt.Errorf("Error setting service_account_email: %s", err)
 	}
-	if err := d.Set("additional_experiments", optionsMap["experiments"]); err != nil {
-		return fmt.Errorf("Error setting additional_experiments: %s", err)
-	}
 
 	if ok := shouldStopDataflowJobDeleteQuery(job.CurrentState, d.Get("skip_wait_on_job_termination").(bool)); ok {
 		log.Printf("[DEBUG] Removing resource '%s' because it is in state %s.\n", job.Name, job.CurrentState)

diff --git a/google/resource_dataflow_job_test.go b/google/resource_dataflow_job_test.go
@@ -339,7 +339,7 @@ func TestAccDataflowJobWithAdditionalExperiments(t *testing.T) {
 				ResourceName:            "google_dataflow_job.with_additional_experiments",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "state"},
+				ImportStateVerifyIgnore: []string{"on_delete", "parameters", "skip_wait_on_job_termination", "state", "additional_experiments"},
 			},
 		},
 	})
@@ -455,7 +455,6 @@ func testAccCheckDataflowJobRegionDestroyProducer(t *testing.T) func(s *terrafor
 			if rs.Type != "google_dataflow_job" {
 				continue
 			}
-
 			config := googleProviderConfig(t)
 			job, err := config.NewDataflowClient(config.userAgent).Projects.Locations.Jobs.Get(config.Project, "us-central1", rs.Primary.ID).Do()
 			if job != nil {