add wait after cancellation

shuyama1 · shuyama1 · commit 5d98ab095ce4 · 2026-02-19T11:23:55.000-08:00
diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job.go
@@ -437,6 +437,8 @@ func resourceDataprocJobDelete(d *schema.ResourceData, meta interface{}) error {
 
 	}
 
+	time.Sleep(90 * time.Second)
+
 	log.Printf("[DEBUG] Deleting Dataproc job %s", d.Id())
 	_, err = config.NewDataprocClient(userAgent).Projects.Regions.Jobs.Delete(
 		project, region, jobId).Do()
diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job_test.go.tmpl b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job_test.go.tmpl
@@ -393,8 +393,6 @@ func testAccCheckDataprocJobCompletesSuccessfully(t *testing.T, n string, job *d
 			return err
 		}
 
-		time.Sleep(90 * time.Second)
-
 		jobCompleteTimeoutMins := 5 * time.Minute
 		waitErr := tpgdataproc.DataprocJobOperationWait(config, region, project, job.Reference.JobId,
 			"Awaiting Dataproc job completion", config.UserAgent, jobCompleteTimeoutMins)

Original file line number	Diff line number	Diff line change
`@@ -437,6 +437,8 @@ func resourceDataprocJobDelete(d *schema.ResourceData, meta interface{}) error {`
`437`	`437`
`438`	`438`	`}`
`439`	`439`
	`440`	`+ time.Sleep(90 * time.Second)`
	`441`	`+`
`440`	`442`	`log.Printf("[DEBUG] Deleting Dataproc job %s", d.Id())`
`441`	`443`	`_, err = config.NewDataprocClient(userAgent).Projects.Regions.Jobs.Delete(`
`442`	`444`	`project, region, jobId).Do()`
Original file line number	Diff line number	Diff line change
`@@ -393,8 +393,6 @@ func testAccCheckDataprocJobCompletesSuccessfully(t testing.T, n string, job d`
`393`	`393`	`return err`
`394`	`394`	`}`
`395`	`395`
`396`		`- time.Sleep(90 * time.Second)`
`397`		`-`
`398`	`396`	`jobCompleteTimeoutMins := 5 * time.Minute`
`399`	`397`	`waitErr := tpgdataproc.DataprocJobOperationWait(config, region, project, job.Reference.JobId,`
`400`	`398`	`"Awaiting Dataproc job completion", config.UserAgent, jobCompleteTimeoutMins)`