Skip to content

Commit 96a9e34

Browse files
authored
add tf-test prefix to compute reservation and dialogflowcx tests (GoogleCloudPlatform#14509)
1 parent 8be898b commit 96a9e34

File tree

10 files changed

+11
-6
lines changed

10 files changed

+11
-6
lines changed

mmv1/products/compute/Reservation.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ examples:
6666
- name: 'reservation_source_instance_template'
6767
primary_resource_id: 'gce_reservation_source_instance_template'
6868
vars:
69+
instance-template: 'instance-template'
6970
reservation_name: 'gce-reservation-source-instance-template'
7071
- name: 'reservation_sharing_policy'
7172
primary_resource_id: 'gce_reservation_sharing_policy'
7273
vars:
74+
instance-template: 'instance-template'
7375
reservation_name: 'gce-reservation-sharing-policy'
7476
- name: 'shared_reservation_basic'
7577
primary_resource_id: 'gce_reservation'

mmv1/products/dialogflowcx/Flow.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ examples:
4949
vars:
5050
agent_name: 'dialogflowcx-agent'
5151
bucket_name: 'dialogflowcx-bucket'
52+
data-store: 'datastore-flow-full'
5253
- name: 'dialogflowcx_flow_default_start_flow'
5354
primary_resource_id: 'default_start_flow'
5455
vars:

mmv1/products/dialogflowcx/Page.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ examples:
4242
primary_resource_id: 'basic_page'
4343
vars:
4444
agent_name: 'dialogflowcx-agent'
45+
data-store: 'datastore-page-full'
4546
parameters:
4647
- name: 'parent'
4748
type: String

mmv1/products/dialogflowcx/Tool.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ examples:
4646
primary_resource_id: 'data_store_tool'
4747
vars:
4848
agent_name: 'dialogflowcx-agent-data-store'
49+
data_store: 'datastore-tool'
4950
- name: 'dialogflowcx_tool_function'
5051
primary_resource_id: 'function_tool'
5152
vars:

mmv1/templates/terraform/examples/dialogflowcx_flow_full.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ resource "google_dialogflow_cx_flow" "{{$.PrimaryResourceId}}" {
410410

411411
resource "google_discovery_engine_data_store" "my_datastore" {
412412
location = "global"
413-
data_store_id = "datastore-flow-full"
413+
data_store_id = "{{index $.Vars "data-store"}}"
414414
display_name = "datastore-flow-full"
415415
industry_vertical = "GENERIC"
416416
content_config = "NO_CONTENT"

mmv1/templates/terraform/examples/dialogflowcx_page_full.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ resource "google_dialogflow_cx_page" "my_page2" {
672672

673673
resource "google_discovery_engine_data_store" "my_datastore" {
674674
location = "global"
675-
data_store_id = "datastore-page-full"
675+
data_store_id = "{{index $.Vars "data-store"}}"
676676
display_name = "datastore-page-full"
677677
industry_vertical = "GENERIC"
678678
content_config = "NO_CONTENT"

mmv1/templates/terraform/examples/dialogflowcx_tool_data_store.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ resource "google_dialogflow_cx_tool" "{{$.PrimaryResourceId}}" {
3030

3131
resource "google_discovery_engine_data_store" "my_datastore" {
3232
location = "global"
33-
data_store_id = "datastore-tool-test-%{random_suffix}"
33+
data_store_id = "{{index $.Vars "data_store"}}"
3434
display_name = "datastore for Tool test"
3535
industry_vertical = "GENERIC"
3636
content_config = "NO_CONTENT"

mmv1/templates/terraform/examples/reservation_sharing_policy.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ data "google_compute_image" "my_image" {
44
}
55

66
resource "google_compute_instance_template" "foobar" {
7-
name = "tf-test-instance-template"
7+
name = "{{index $.Vars "instance-template"}}"
88
machine_type = "g2-standard-4"
99
can_ip_forward = false
1010
tags = ["foo", "bar"]

mmv1/templates/terraform/examples/reservation_source_instance_template.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ data "google_compute_image" "my_image" {
44
}
55

66
resource "google_compute_instance_template" "foobar" {
7-
name = "tf-test-instance-template"
7+
name = "{{index $.Vars "instance-template"}}"
88
machine_type = "n2-standard-2"
99
can_ip_forward = false
1010
tags = ["foo", "bar"]

mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_page_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ func testAccDialogflowCXPage_full(context map[string]interface{}) string {
640640
641641
resource "google_discovery_engine_data_store" "my_datastore" {
642642
location = "global"
643-
data_store_id = "datastore-page-update"
643+
data_store_id = "tf-test-datastore-page-update%{random_suffix}"
644644
display_name = "datastore-page-update"
645645
industry_vertical = "GENERIC"
646646
content_config = "NO_CONTENT"

0 commit comments

Comments
 (0)