From 93ed94f73c51bbddc08cb65b0013f0898a5d281c Mon Sep 17 00:00:00 2001
From: Sarah French <15078782+SarahFrench@users.noreply.github.com>
Date: Tue, 5 Mar 2024 11:14:28 +0000
Subject: [PATCH] Address dependency issues in TestAccFirestoreField_* tests
 (#9957)

* Add additional wait in TestAccFirestoreField_* tests

* Boost wait in test to 6 minutes

* Add dependency between database and service to control delete order

* Update dependency to explicitly include project

* Make firestore fields be removed from state when they're 'deleted'

* Add `destroy_duration`

* Remove from state after log line that uses id value

* Update destory check to accept a 403 as valid

* Remove unneeded changes in PR

* Remove call to SetId
---
 .../custom_check_destroy/firestore_field.go.erb       | 11 ++++++++++-
 .../firestore/resource_firestore_field_test.go        |  8 ++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/mmv1/templates/terraform/custom_check_destroy/firestore_field.go.erb b/mmv1/templates/terraform/custom_check_destroy/firestore_field.go.erb
index f3caa9775cca..7b5fe9d1fffc 100644
--- a/mmv1/templates/terraform/custom_check_destroy/firestore_field.go.erb
+++ b/mmv1/templates/terraform/custom_check_destroy/firestore_field.go.erb
@@ -16,7 +16,16 @@ res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 	UserAgent: config.UserAgent,
 })
 if err != nil {
-  return err
+	e := err.(*googleapi.Error)
+	if e.Code == 403 && strings.Contains(e.Message, "Cloud Firestore API has not been used in project") {
+		// The acceptance test has provisioned the resources under test in a new project, and the destory check is seeing the
+		// effects of the project not existing. This means the service isn't enabled, and that the resource is definitely destroyed.
+		// We do not return the error in this case - destroy was successful
+		return nil
+	}
+
+	// Return err in all other cases
+	return err
 }
 
 if v := res["indexConfig"]; v != nil {
diff --git a/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go b/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go
index 794b5f8369a5..8be524c6e99a 100644
--- a/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go
+++ b/mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go
@@ -103,7 +103,11 @@ resource "google_firestore_database" "database" {
 	location_id = "nam5"
 	type        = "FIRESTORE_NATIVE"
 
-	depends_on = [google_project_service.firestore]
+	# used to control delete order
+	depends_on = [
+		google_project_service.firestore,
+		google_project.project
+	]
 }
 `, context)
 	} else {
@@ -115,7 +119,7 @@ resource "google_firestore_database" "database" {
 	type        = "FIRESTORE_NATIVE"
 
 	delete_protection_state = "DELETE_PROTECTION_DISABLED"
-    deletion_policy         = "DELETE"
+	deletion_policy         = "DELETE"
 }
 `, context)
 	}