add tf-test prefix to compute reservation and dialogflowcx tests (#14509) (#1045)

modular-magician · web-flow · commit 9f523384d057 · 2025-07-11T16:49:30.000-07:00
[upstream:96a9e345b646eb02ffd950fd2b2639eaf171fcd0]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/dialogflowcx_flow_full/main.tf b/dialogflowcx_flow_full/main.tf
@@ -410,7 +410,7 @@ resource "google_dialogflow_cx_flow" "basic_flow" {
 
 resource "google_discovery_engine_data_store" "my_datastore" {
   location          = "global"
-  data_store_id     = "datastore-flow-full"
+  data_store_id     = "datastore-flow-full-${local.name_suffix}"
   display_name      = "datastore-flow-full"
   industry_vertical = "GENERIC"
   content_config    = "NO_CONTENT"
diff --git a/dialogflowcx_page_full/main.tf b/dialogflowcx_page_full/main.tf
@@ -672,7 +672,7 @@ resource "google_dialogflow_cx_page" "my_page2" {
 
 resource "google_discovery_engine_data_store" "my_datastore" {
   location          = "global"
-  data_store_id     = "datastore-page-full"
+  data_store_id     = "datastore-page-full-${local.name_suffix}"
   display_name      = "datastore-page-full"
   industry_vertical = "GENERIC"
   content_config    = "NO_CONTENT"
diff --git a/dialogflowcx_tool_data_store/main.tf b/dialogflowcx_tool_data_store/main.tf
@@ -30,7 +30,7 @@ resource "google_dialogflow_cx_tool" "data_store_tool" {
 
 resource "google_discovery_engine_data_store" "my_datastore" {
   location          = "global"
-  data_store_id     = "datastore-tool-test-%{random_suffix}"
+  data_store_id     = "datastore-tool-${local.name_suffix}"
   display_name      = "datastore for Tool test"
   industry_vertical = "GENERIC"
   content_config    = "NO_CONTENT"
diff --git a/reservation_sharing_policy/main.tf b/reservation_sharing_policy/main.tf
@@ -4,7 +4,7 @@ data "google_compute_image" "my_image" {
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name = "tf-test-instance-template"
+  name = "instance-template-${local.name_suffix}"
   machine_type = "g2-standard-4"
   can_ip_forward = false
   tags = ["foo", "bar"]
diff --git a/reservation_source_instance_template/main.tf b/reservation_source_instance_template/main.tf
@@ -4,7 +4,7 @@ data "google_compute_image" "my_image" {
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name           = "tf-test-instance-template"
+  name           = "instance-template-${local.name_suffix}"
   machine_type   = "n2-standard-2"
   can_ip_forward = false
   tags           = ["foo", "bar"]

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ data "google_compute_image" "my_image" {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`resource "google_compute_instance_template" "foobar" {`
`7`		`- name = "tf-test-instance-template"`
	`7`	`+ name = "instance-template-${local.name_suffix}"`
`8`	`8`	`machine_type = "g2-standard-4"`
`9`	`9`	`can_ip_forward = false`
`10`	`10`	`tags = ["foo", "bar"]`