Skip to content

Commit c2f5742

Browse files
Added additional filter by description to mostRecent test (#4853) (#3321)
This ensures that only the relevant instances will be considered while filtering Resolved hashicorp/terraform-provider-google#9246 Signed-off-by: Modular Magician <[email protected]>
1 parent ea65eda commit c2f5742

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.changelog/4853.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/data_source_google_compute_instance_template_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ resource "google_compute_instance_template" "c" {
156156
157157
data "google_compute_instance_template" "default" {
158158
// Hack to prevent depends_on bug triggering datasource recreate due to https://github.com/hashicorp/terraform/issues/11806
159+
// This bug is fixed in 0.13+.
159160
project = "%{project}${replace(google_compute_instance_template.a.id, "/.*/", "")}${replace(google_compute_instance_template.b.id, "/.*/", "")}${replace(google_compute_instance_template.c.id, "/.*/", "")}"
160161
filter = "name = tf-test-template-c-%{suffix}"
161162
}
@@ -166,7 +167,7 @@ func testAccInstanceTemplate_filter_mostRecent(project, suffix string) string {
166167
return Nprintf(`
167168
resource "google_compute_instance_template" "a" {
168169
name = "tf-test-template-%{suffix}-a"
169-
description = "Example template."
170+
description = "tf-test-instance-template"
170171
171172
machine_type = "e2-small"
172173
@@ -184,7 +185,7 @@ resource "google_compute_instance_template" "a" {
184185
}
185186
resource "google_compute_instance_template" "b" {
186187
name = "tf-test-template-%{suffix}-b"
187-
description = "Example template."
188+
description = "tf-test-instance-template"
188189
189190
machine_type = "e2-small"
190191
@@ -207,7 +208,7 @@ resource "google_compute_instance_template" "b" {
207208
}
208209
resource "google_compute_instance_template" "c" {
209210
name = "tf-test-template-%{suffix}-c"
210-
description = "Example template."
211+
description = "tf-test-instance-template"
211212
212213
machine_type = "e2-small"
213214
@@ -230,8 +231,9 @@ resource "google_compute_instance_template" "c" {
230231
231232
data "google_compute_instance_template" "default" {
232233
// Hack to prevent depends_on bug triggering datasource recreate due to https://github.com/hashicorp/terraform/issues/11806
234+
// This bug is fixed in 0.13+.
233235
project = "%{project}${replace(google_compute_instance_template.b.id, "/.*/", "")}"
234-
filter = "name != tf-test-template-%{suffix}-b"
236+
filter = "(name != tf-test-template-%{suffix}-b) (description = tf-test-instance-template)"
235237
most_recent = true
236238
}
237239
`, map[string]interface{}{"project": project, "suffix": suffix})

0 commit comments

Comments
 (0)