Add 5s to the billing project wait + network deletion retry wait in google_project (#12779) (#9103)

modular-magician · web-flow · commit 1b7bdf5c718d · 2025-01-21T13:05:29.000-08:00
[upstream:d5d5cd3ce9eb18be29821d8b40bdce975da2243b]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/12779.txt b/.changelog/12779.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resourcemanager: added a slightly longer wait (two 10s checks bumped to 15s) for issues with billing associations in `google_project`. Default network deletion should succeed more often.
+```
diff --git a/google-beta/services/resourcemanager/resource_google_project.go b/google-beta/services/resourcemanager/resource_google_project.go
@@ -218,9 +218,9 @@ func resourceGoogleProjectCreate(d *schema.ResourceData, meta interface{}) error
 		}
 	}
 
-	// Sleep for 10s, letting the billing account settle before other resources
+	// Sleep to let the billing account settle before other resources
 	// try to use this project.
-	time.Sleep(10 * time.Second)
+	time.Sleep(15 * time.Second)
 
 	err = resourceGoogleProjectRead(d, meta)
 	if err != nil {
@@ -247,7 +247,7 @@ func resourceGoogleProjectCreate(d *schema.ResourceData, meta interface{}) error
 		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)
+			time.Sleep(15 * time.Second)
 			err = forceDeleteComputeNetwork(d, config, project.ProjectId, "default")
 		}
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+resourcemanager: added a slightly longer wait (two 10s checks bumped to 15s) for issues with billing associations in `google_project`. Default network deletion should succeed more often.
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -218,9 +218,9 @@ func resourceGoogleProjectCreate(d *schema.ResourceData, meta interface{}) error`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
`221`		`- // Sleep for 10s, letting the billing account settle before other resources`
	`221`	`+ // Sleep to let the billing account settle before other resources`
`222`	`222`	`// try to use this project.`
`223`		`- time.Sleep(10 * time.Second)`
	`223`	`+ time.Sleep(15 * time.Second)`
`224`	`224`
`225`	`225`	`err = resourceGoogleProjectRead(d, meta)`
`226`	`226`	`if err != nil {`
`@@ -247,7 +247,7 @@ func resourceGoogleProjectCreate(d *schema.ResourceData, meta interface{}) error`
`247`	`247`	`err = forceDeleteComputeNetwork(d, config, project.ProjectId, "default")`
`248`	`248`	`// Retry if API is not yet enabled.`
`249`	`249`	`if err != nil && transport_tpg.IsGoogleApiErrorWithCode(err, 403) {`
`250`		`- time.Sleep(10 * time.Second)`
	`250`	`+ time.Sleep(15 * time.Second)`
`251`	`251`	`err = forceDeleteComputeNetwork(d, config, project.ProjectId, "default")`
`252`	`252`	`}`
`253`	`253`	`if err != nil {`