Clean up retriable error syntax

third_party/terraform/utils/utils.go

@@ -350,21 +350,22 @@ func retryTimeDuration(retryFunc func() error, duration time.Duration) error {
 }
 
 func isRetryableError(err error) bool {
-	if gerr, ok := err.(*googleapi.Error); ok && (gerr.Code == 409 || gerr.Code == 429 || gerr.Code == 500 || gerr.Code == 502 || gerr.Code == 503) {
-		if gerr.Code == 409 && !strings.Contains(gerr.Body, "operationInProgress") {
-			// 409's are retried because cloud sql throws a 409 when concurrent calls are made, however we only
-			// want to retry sql conflicts and not actual 409 conflicts such as name already exists. Until we
-			// stop using the sql client we must check the error string to determine if it's retriable
-			// See https://github.com/terraform-providers/terraform-provider-google/issues/3279
-			return false
-		}
+	if gerr, ok := err.(*googleapi.Error); ok && (gerr.Code == 429 || gerr.Code == 500 || gerr.Code == 502 || gerr.Code == 503) {
 		return true
 	}
 	// These operations are always hitting googleapis.com - they should rarely
 	// time out, and if they do, that timeout is retryable.
 	if urlerr, ok := err.(*url.Error); ok && urlerr.Timeout() {
 		return true
 	}
+	if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 409 && strings.Contains(gerr.Body, "operationInProgress") {
+		// 409's are retried because cloud sql throws a 409 when concurrent calls are made.
+		// The only way right now to determine it is a SQL 409 due to concurrent calls is to
+		// look at the contents of the error message.
+		// See https://github.com/terraform-providers/terraform-provider-google/issues/3279
+		return true
+	}
+
 	return false
 }