Made AppEngine requests retry if they fail due to a P4SA propagation delay. (#4453) (#2922)

Fixed hashicorp/terraform-provider-google#8333

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/4453.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+appengine: added retry for P4SA propagation delay
+```

google-beta/error_retry_predicates.go

@@ -240,12 +240,15 @@ func isNotFilestoreQuotaError(err error) (bool, string) {
 }
 
 // Retry if App Engine operation returns a 409 with a specific message for
-// concurrent operations.
+// concurrent operations, or a 404 indicating p4sa has not yet propagated.
 func isAppEngineRetryableError(err error) (bool, string) {
 	if gerr, ok := err.(*googleapi.Error); ok {
 		if gerr.Code == 409 && strings.Contains(strings.ToLower(gerr.Body), "operation is already in progress") {
 			return true, "Waiting for other concurrent App Engine changes to finish"
 		}
+		if gerr.Code == 404 && strings.Contains(strings.ToLower(gerr.Body), "unable to retrieve P4SA") {
+			return true, "Waiting for P4SA propagation to GAIA"
+		}
 	}
 	return false, ""
 }