Address dependency issues in TestAccFirestoreField_* tests

mmv1/third_party/terraform/services/firestore/resource_firestore_field_test.go

@@ -83,18 +83,26 @@ resource "google_project" "project" {
 	org_id     = "%{org_id}"
 }
 
-resource "time_sleep" "wait_60_seconds" {
+# 60s wait between creating the project and enabling the service
+resource "time_sleep" "wait_60_sec_after_project" {
 	depends_on = [google_project.project]
 
 	create_duration = "60s"
 }
 
+# 60s wait between enabling the service and trying to use it
+resource "time_sleep" "wait_60_sec_after_service" {
+	depends_on = [google_project_service.firestore]
+
+	create_duration = "60s"
+}
+
 resource "google_project_service" "firestore" {
 	project = google_project.project.project_id
 	service = "firestore.googleapis.com"
 
 	# Needed for CI tests for permissions to propagate, should not be needed for actual usage
-	depends_on = [time_sleep.wait_60_seconds]
+	depends_on = [time_sleep.wait_60_sec_after_project]
 }
 
 resource "google_firestore_database" "database" {
@@ -103,7 +111,7 @@ resource "google_firestore_database" "database" {
 	location_id = "nam5"
 	type        = "FIRESTORE_NATIVE"
 
-	depends_on = [google_project_service.firestore]
+	depends_on = [time_sleep.wait_60_sec_after_service]
 }
 `, context)
 	} else {