Skip to content

Commit 6e2c371

Browse files
Handle operation for ApigeeOrganization delete requests. (#12416) (#20504)
[upstream:f322db3ab30c87d520159caa363ddbfef01c3640] Signed-off-by: Modular Magician <[email protected]>
1 parent 9a0f7c7 commit 6e2c371

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

.changelog/12416.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
apigee: made `google_apigee_organization` wait for deletion operation to complete.
3+
```

google/services/apigee/resource_apigee_organization.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,14 @@ func resourceApigeeOrganizationDelete(d *schema.ResourceData, meta interface{})
601601
return transport_tpg.HandleNotFoundError(err, d, "Organization")
602602
}
603603

604+
err = ApigeeOperationWaitTime(
605+
config, res, "Deleting Organization", userAgent,
606+
d.Timeout(schema.TimeoutDelete))
607+
608+
if err != nil {
609+
return err
610+
}
611+
604612
log.Printf("[DEBUG] Finished deleting Organization %q: %#v", d.Id(), res)
605613
return nil
606614
}

0 commit comments

Comments
 (0)