Skip to content

Commit c5c6f66

Browse files
authored
clean up observability test in ga (#15381)
1 parent 2aece24 commit c5c6f66

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed
Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
package observability_test
22

3-
import (
43
{{ if ne $.TargetVersionName `ga` -}}
4+
5+
import (
56
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
6-
"github.com/hashicorp/terraform-plugin-testing/plancheck"
7-
"github.com/hashicorp/terraform-provider-google/google/envvar"
8-
{{- end }}
7+
"github.com/hashicorp/terraform-plugin-testing/plancheck"
8+
"github.com/hashicorp/terraform-provider-google/google/envvar"
99
"github.com/hashicorp/terraform-provider-google/google/acctest"
1010

1111
"testing"
1212
)
1313

1414
func TestAccObservabilityTraceScope_update(t *testing.T) {
15-
{{ if ne $.TargetVersionName `ga` -}}
1615
t.Parallel()
1716

1817
context := map[string]interface{}{
19-
"org_id": envvar.GetTestOrgFromEnv(t),
18+
"org_id": envvar.GetTestOrgFromEnv(t),
2019
"random_suffix": acctest.RandString(t, 10),
2120
}
2221

@@ -49,51 +48,52 @@ func TestAccObservabilityTraceScope_update(t *testing.T) {
4948
},
5049
},
5150
})
52-
{{- end }}
5351
}
5452

5553
func testAccObservabilityTraceScope_basic(context map[string]interface{}) string {
5654
return acctest.Nprintf(`
5755
resource "google_observability_trace_scope" "observability_trace_scope" {
58-
provider = google-beta
59-
trace_scope_id = "tf-test-test-scope%{random_suffix}"
60-
location = "global"
61-
resource_names = [
62-
"projects/${data.google_project.project.project_id}",
63-
]
64-
description = "A trace scope configured with Terraform"
56+
provider = google-beta
57+
trace_scope_id = "tf-test-test-scope%{random_suffix}"
58+
location = "global"
59+
resource_names = [
60+
"projects/${data.google_project.project.project_id}",
61+
]
62+
description = "A trace scope configured with Terraform"
6563
}
6664

6765
data "google_project" "project" {
68-
provider = google-beta
66+
provider = google-beta
6967
}
7068
`, context)
7169
}
7270

7371
func testAccObservabilityTraceScope_update(context map[string]interface{}) string {
7472
return acctest.Nprintf(`
7573
resource "google_observability_trace_scope" "observability_trace_scope" {
76-
depends_on = [google_project.project-2]
77-
provider = google-beta
78-
trace_scope_id = "tf-test-test-scope%{random_suffix}"
79-
location = "global"
80-
resource_names = [
81-
"projects/${data.google_project.project.project_id}",
82-
"projects/${google_project.project-2.project_id}",
83-
]
84-
description = "A new description"
74+
depends_on = [google_project.project-2]
75+
provider = google-beta
76+
trace_scope_id = "tf-test-test-scope%{random_suffix}"
77+
location = "global"
78+
resource_names = [
79+
"projects/${data.google_project.project.project_id}",
80+
"projects/${google_project.project-2.project_id}",
81+
]
82+
description = "A new description"
8583
}
8684

8785
data "google_project" "project" {
88-
provider = google-beta
86+
provider = google-beta
8987
}
9088

9189
resource "google_project" "project-2" {
92-
provider = google-beta
93-
project_id = "tf-test%{random_suffix}"
94-
name = "tf-test%{random_suffix}"
95-
org_id = "%{org_id}"
96-
deletion_policy = "DELETE"
90+
provider = google-beta
91+
project_id = "tf-test%{random_suffix}"
92+
name = "tf-test%{random_suffix}"
93+
org_id = "%{org_id}"
94+
deletion_policy = "DELETE"
9795
}
9896
`, context)
9997
}
98+
99+
{{ end }}

0 commit comments

Comments
 (0)