Skip to content

Commit

Permalink
Retry delete network step while creating a google project. (#10046) (#…
Browse files Browse the repository at this point in the history
…17419)

[upstream:7faaacc8f1d429d6d0d6317ba98e962bf9bd1ae4]

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored Feb 26, 2024
1 parent 61948f1 commit 8e717c4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .changelog/10046.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resourcemanager: added a retry to deleting the default network when `auto_create_network` is false in `google_project`
```
8 changes: 7 additions & 1 deletion google/services/resourcemanager/resource_google_project.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,13 @@ func resourceGoogleProjectCreate(d *schema.ResourceData, meta interface{}) error
return errwrap.Wrapf("Error enabling the Compute Engine API required to delete the default network: {{err}} ", err)
}

if err = forceDeleteComputeNetwork(d, config, project.ProjectId, "default"); err != nil {
err = forceDeleteComputeNetwork(d, config, project.ProjectId, "default")
// Retry if API is not yet enabled.
if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 403) {
time.Sleep(10 * time.Second)
err = forceDeleteComputeNetwork(d, config, project.ProjectId, "default")
}
if err != nil {
if transport_tpg.IsGoogleApiErrorWithCode(err, 404) {
log.Printf("[DEBUG] Default network not found for project %q, no need to delete it", project.ProjectId)
} else {
Expand Down

0 comments on commit 8e717c4

Please sign in to comment.