Merge pull request #1892 from terraform-providers/b-batch-deletion-state

r/batch_job_queue: Wait for update completion when disabling

aws/resource_aws_batch_job_queue.go

@@ -143,9 +143,9 @@ func resourceAwsBatchJobQueueDelete(d *schema.ResourceData, meta interface{}) er
 
 	// Wait until the Job Queue is disabled before deleting
 	stateConf := &resource.StateChangeConf{
-		Pending:    []string{batch.JQStateEnabled},
-		Target:     []string{batch.JQStateDisabled},
-		Refresh:    batchJobQueueRefreshStateFunc(conn, sn),
+		Pending:    []string{batch.JQStatusUpdating},
+		Target:     []string{batch.JQStatusValid},
+		Refresh:    batchJobQueueRefreshStatusFunc(conn, sn),
 		Timeout:    10 * time.Minute,
 		Delay:      10 * time.Second,
 		MinTimeout: 3 * time.Second,
@@ -154,6 +154,7 @@ func resourceAwsBatchJobQueueDelete(d *schema.ResourceData, meta interface{}) er
 	if err != nil {
 		return err
 	}
+
 	log.Printf("[DEBUG] Trying to delete Job Queue %s", sn)
 	_, err = conn.DeleteJobQueue(&batch.DeleteJobQueueInput{
 		JobQueue: aws.String(sn),