Skip to content

Commit 8e717c4

Browse files
Retry delete network step while creating a google project. (#10046) (#17419)
[upstream:7faaacc8f1d429d6d0d6317ba98e962bf9bd1ae4] Signed-off-by: Modular Magician <[email protected]>
1 parent 61948f1 commit 8e717c4

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

.changelog/10046.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resourcemanager: added a retry to deleting the default network when `auto_create_network` is false in `google_project`
3+
```

google/services/resourcemanager/resource_google_project.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,13 @@ func resourceGoogleProjectCreate(d *schema.ResourceData, meta interface{}) error
229229
return errwrap.Wrapf("Error enabling the Compute Engine API required to delete the default network: {{err}} ", err)
230230
}
231231

232-
if err = forceDeleteComputeNetwork(d, config, project.ProjectId, "default"); err != nil {
232+
err = forceDeleteComputeNetwork(d, config, project.ProjectId, "default")
233+
// Retry if API is not yet enabled.
234+
if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 403) {
235+
time.Sleep(10 * time.Second)
236+
err = forceDeleteComputeNetwork(d, config, project.ProjectId, "default")
237+
}
238+
if err != nil {
233239
if transport_tpg.IsGoogleApiErrorWithCode(err, 404) {
234240
log.Printf("[DEBUG] Default network not found for project %q, no need to delete it", project.ProjectId)
235241
} else {

0 commit comments

Comments
 (0)