From 1ec163e813b5725a82e16d62c341bd764df9d0cb Mon Sep 17 00:00:00 2001 From: The Magician Date: Thu, 4 Apr 2024 10:58:51 -0700 Subject: [PATCH] test: Fix missing database for datastore_index test. (#10316) (#7189) [upstream:e040a9334c923903a7180deec51aa96113181354] Signed-off-by: Modular Magician --- .changelog/10316.txt | 3 +++ ...resource_datastore_index_generated_test.go | 17 ++++++++++++++++ website/docs/r/datastore_index.html.markdown | 20 ++++++++++++++----- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 .changelog/10316.txt diff --git a/.changelog/10316.txt b/.changelog/10316.txt new file mode 100644 index 0000000000..42b910df15 --- /dev/null +++ b/.changelog/10316.txt @@ -0,0 +1,3 @@ +```release-note:none + +``` \ No newline at end of file diff --git a/google-beta/services/datastore/resource_datastore_index_generated_test.go b/google-beta/services/datastore/resource_datastore_index_generated_test.go index 6315b660d6..e1b104f7fc 100644 --- a/google-beta/services/datastore/resource_datastore_index_generated_test.go +++ b/google-beta/services/datastore/resource_datastore_index_generated_test.go @@ -26,6 +26,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" "github.com/hashicorp/terraform-provider-google-beta/google-beta/acctest" + "github.com/hashicorp/terraform-provider-google-beta/google-beta/envvar" "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" ) @@ -34,6 +35,7 @@ func TestAccDatastoreIndex_datastoreIndexExample(t *testing.T) { t.Parallel() context := map[string]interface{}{ + "project_id": envvar.GetTestProjectFromEnv(), "random_suffix": acctest.RandString(t, 10), } @@ -56,6 +58,19 @@ func TestAccDatastoreIndex_datastoreIndexExample(t *testing.T) { func testAccDatastoreIndex_datastoreIndexExample(context map[string]interface{}) string { return acctest.Nprintf(` +resource "google_firestore_database" "database" { + project = "%{project_id}" + # google_datastore_index resources only support the (default) database. + # However, google_firestore_index can express any Datastore Mode index + # and should be preferred in all cases. + name = "(default)" + location_id = "nam5" + type = "DATASTORE_MODE" + + delete_protection_state = "DELETE_PROTECTION_DISABLED" + deletion_policy = "DELETE" +} + resource "google_datastore_index" "default" { kind = "foo" properties { @@ -66,6 +81,8 @@ resource "google_datastore_index" "default" { name = "tf_test_property_b%{random_suffix}" direction = "ASCENDING" } + + depends_on = [google_firestore_database.database] } `, context) } diff --git a/website/docs/r/datastore_index.html.markdown b/website/docs/r/datastore_index.html.markdown index 4a96bfd552..3e7be6877a 100644 --- a/website/docs/r/datastore_index.html.markdown +++ b/website/docs/r/datastore_index.html.markdown @@ -34,15 +34,23 @@ one, you can create a `google_app_engine_application` resource with `database_type` set to `"CLOUD_DATASTORE_COMPATIBILITY"` to do so. Your Datastore location will be the same as the App Engine location specified. - ## Example Usage - Datastore Index ```hcl +resource "google_firestore_database" "database" { + project = "my-project-name" + # google_datastore_index resources only support the (default) database. + # However, google_firestore_index can express any Datastore Mode index + # and should be preferred in all cases. + name = "(default)" + location_id = "nam5" + type = "DATASTORE_MODE" + + delete_protection_state = "DELETE_PROTECTION_DISABLED" + deletion_policy = "DELETE" +} + resource "google_datastore_index" "default" { kind = "foo" properties { @@ -53,6 +61,8 @@ resource "google_datastore_index" "default" { name = "property_b" direction = "ASCENDING" } + + depends_on = [google_firestore_database.database] } ```