do not retry if sql api returns 409 for deleted instance name (#2817)

Merged PR #2817.
GoogleCloudPlatform · Dec 12, 2019 · f206d90 · f206d90
1 parent 90e4409
commit f206d90
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/build/ansible b/build/ansible
diff --git a/build/inspec b/build/inspec
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/third_party/terraform/utils/error_retry_predicates.go b/third_party/terraform/utils/error_retry_predicates.go
@@ -33,6 +33,10 @@ func pubsubTopicProjectNotReady(err error) (bool, string) {
 
 func isSqlOperationInProgressError(err error) (bool, string) {
 	if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 409 {
+		if strings.Contains(gerr.Body, "you cannot reuse the name of the deleted instance until one week from the deletion date.") {
+			return false, ""
+		}
+
 		return true, "Waiting for other concurrent Cloud SQL operations to finish"
 	}
 	return false, ""