Skip to content

Commit d0e6542

Browse files
jar-bjar-b
authored
internal/generate/tagstests: enable go-vcr support (#43383)
* internal/generate/tagstests: enable go-vcr support This change makes the following VCR-aware replacements in the tagstest templates for resources and data sources: - `resource.Test` to `acctest.Test` - `resource.ParallelTest` to `acctest.ParallelTest` - `sdkacctest.RandomWithPrefix` with `acctest.RandomWithPrefix` In order to be fully support go-vcr, the "check exists" and "check destroy" helpers also need to include a `testing.T` argument. The generator already includes optional `existsTakesT` and `destroyTakesT` annotations, which can be set on new resources as they become VCR enabled over time. * chore: regenerate tagstests ```console % make testacc PKG=logs TESTS="TestAccLogsLogGroup_tags" make: Verifying source code with gofmt... ==> Checking that code complies with gofmt requirements... TF_ACC=1 go1.24.5 test ./internal/service/logs/... -v -count 1 -parallel 20 -run='TestAccLogsLogGroup_tags' -timeout 360m -vet=off 2025/07/15 10:17:35 Creating Terraform AWS Provider (SDKv2-style)... 2025/07/15 10:17:35 Initializing Terraform AWS Provider (SDKv2-style)... --- PASS: TestAccLogsLogGroup_tags_DefaultTags_emptyResourceTag (59.44s) === CONT TestAccLogsLogGroup_tags_DefaultTags_nullNonOverlappingResourceTag --- PASS: TestAccLogsLogGroup_tags_DefaultTags_emptyProviderOnlyTag (60.35s) --- PASS: TestAccLogsLogGroup_tags_DefaultTags_nullOverlappingResourceTag (62.23s) --- PASS: TestAccLogsLogGroup_tags_ComputedTag_OnCreate (62.70s) --- PASS: TestAccLogsLogGroup_tags_EmptyMap (77.83s) --- PASS: TestAccLogsLogGroup_tags_null (79.77s) --- PASS: TestAccLogsLogGroup_tags_EmptyTag_OnUpdate_Replace (82.95s) --- PASS: TestAccLogsLogGroup_tags_DefaultTags_updateToProviderOnly (83.20s) --- PASS: TestAccLogsLogGroup_tags_AddOnUpdate (84.95s) --- PASS: TestAccLogsLogGroup_tags_DefaultTags_updateToResourceOnly (85.10s) --- PASS: TestAccLogsLogGroup_tags_ComputedTag_OnUpdate_Add (86.44s) --- PASS: TestAccLogsLogGroup_tags_ComputedTag_OnUpdate_Replace (86.77s) --- PASS: TestAccLogsLogGroup_tags_EmptyTag_OnCreate (90.72s) --- PASS: TestAccLogsLogGroup_tags_DefaultTags_nullNonOverlappingResourceTag (34.14s) --- PASS: TestAccLogsLogGroup_tags_IgnoreTags_Overlap_DefaultTag (94.28s) --- PASS: TestAccLogsLogGroup_tags_EmptyTag_OnUpdate_Add (99.73s) --- PASS: TestAccLogsLogGroup_tags_IgnoreTags_Overlap_ResourceTag (102.33s) --- PASS: TestAccLogsLogGroup_tags_DefaultTags_nonOverlapping (106.98s) --- PASS: TestAccLogsLogGroup_tags_DefaultTags_overlapping (107.78s) --- PASS: TestAccLogsLogGroup_tags_DefaultTags_providerOnly (119.71s) --- PASS: TestAccLogsLogGroup_tags (120.13s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/logs 126.123s ```
2 parents f889f1c + c139183 commit d0e6542

File tree

247 files changed

+7629
-7843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+7629
-7843
lines changed

‎internal/generate/tagstests/data_source_test.go.gtpl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{{ end }}
1212

1313
{{ define "Test" -}}
14-
resource.{{ if and .Serialize (not .SerializeParallelTests) }}Test{{ else }}ParallelTest{{ end }}
14+
acctest.{{ if and .Serialize (not .SerializeParallelTests) }}Test{{ else }}ParallelTest{{ end }}
1515
{{- end }}
1616

1717
{{ define "TestCaseSetup" -}}
@@ -133,7 +133,7 @@ func {{ template "testname" . }}_tagsSerial(t *testing.T) {
133133
func {{ template "testname" . }}_tags(t *testing.T) {
134134
{{- template "Init" . }}
135135

136-
{{ template "Test" . }}(t, resource.TestCase{
136+
{{ template "Test" . }}(ctx, t, resource.TestCase{
137137
{{ template "TestCaseSetup" . }}
138138
Steps: []resource.TestStep{
139139
{
@@ -161,7 +161,7 @@ func {{ template "testname" . }}_tags(t *testing.T) {
161161
func {{ template "testname" . }}_tags_NullMap(t *testing.T) {
162162
{{- template "Init" . }}
163163

164-
{{ template "Test" . }}(t, resource.TestCase{
164+
{{ template "Test" . }}(ctx, t, resource.TestCase{
165165
{{ template "TestCaseSetup" . }}
166166
Steps: []resource.TestStep{
167167
{
@@ -185,7 +185,7 @@ func {{ template "testname" . }}_tags_NullMap(t *testing.T) {
185185
func {{ template "testname" . }}_tags_EmptyMap(t *testing.T) {
186186
{{- template "Init" . }}
187187

188-
{{ template "Test" . }}(t, resource.TestCase{
188+
{{ template "Test" . }}(ctx, t, resource.TestCase{
189189
{{ template "TestCaseSetup" . }}
190190
Steps: []resource.TestStep{
191191
{
@@ -209,7 +209,7 @@ func {{ template "testname" . }}_tags_EmptyMap(t *testing.T) {
209209
func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) {
210210
{{- template "Init" . }}
211211

212-
{{ template "Test" . }}(t, resource.TestCase{
212+
{{ template "Test" . }}(ctx, t, resource.TestCase{
213213
{{ template "TestCaseSetupNoProviders" . }}
214214
Steps: []resource.TestStep{
215215
{
@@ -243,7 +243,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) {
243243
func {{ template "testname" . }}_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) {
244244
{{- template "Init" . }}
245245

246-
{{ template "Test" . }}(t, resource.TestCase{
246+
{{ template "Test" . }}(ctx, t, resource.TestCase{
247247
{{ template "TestCaseSetupNoProviders" . }}
248248
Steps: []resource.TestStep{
249249
{
@@ -283,7 +283,7 @@ func {{ template "testname" . }}_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T
283283
func {{ template "testname" . }}_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) {
284284
{{- template "Init" . }}
285285

286-
{{ template "Test" . }}(t, resource.TestCase{
286+
{{ template "Test" . }}(ctx, t, resource.TestCase{
287287
{{ template "TestCaseSetupNoProviders" . }}
288288
Steps: []resource.TestStep{
289289
{

‎internal/generate/tagstests/main.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -851,12 +851,8 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) {
851851
return
852852
}
853853
if !generatorSeen {
854-
d.Generator = "sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)"
854+
d.Generator = "acctest.RandomWithPrefix(t, acctest.ResourcePrefix)"
855855
d.GoImports = append(d.GoImports,
856-
goImport{
857-
Path: "github.com/hashicorp/terraform-plugin-testing/helper/acctest",
858-
Alias: "sdkacctest",
859-
},
860856
goImport{
861857
Path: "github.com/hashicorp/terraform-provider-aws/internal/acctest",
862858
},

‎internal/generate/tagstests/resource_test.go.gtpl‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{{ end }}
1515

1616
{{ define "Test" -}}
17-
resource.{{ if and .Serialize (not .SerializeParallelTests) }}Test{{ else }}ParallelTest{{ end }}
17+
acctest.{{ if and .Serialize (not .SerializeParallelTests) }}Test{{ else }}ParallelTest{{ end }}
1818
{{- end }}
1919

2020
{{ define "TestCaseSetup" -}}
@@ -193,7 +193,7 @@ func {{ template "testname" . }}_tagsSerial(t *testing.T) {
193193
func {{ template "testname" . }}_tags(t *testing.T) {
194194
{{- template "Init" . }}
195195

196-
{{ template "Test" . }}(t, resource.TestCase{
196+
{{ template "Test" . }}(ctx, t, resource.TestCase{
197197
{{ template "TestCaseSetup" . }}
198198
Steps: []resource.TestStep{
199199
{
@@ -416,7 +416,7 @@ func {{ template "testname" . }}_tags_null(t *testing.T) {
416416
{{ end }}
417417
{{- template "Init" . }}
418418

419-
{{ template "Test" . }}(t, resource.TestCase{
419+
{{ template "Test" . }}(ctx, t, resource.TestCase{
420420
{{ template "TestCaseSetup" . }}
421421
Steps: []resource.TestStep{
422422
{
@@ -509,7 +509,7 @@ func {{ template "testname" . }}_tags_null(t *testing.T) {
509509
func {{ template "testname" . }}_tags_EmptyMap(t *testing.T) {
510510
{{- template "Init" . }}
511511

512-
{{ template "Test" . }}(t, resource.TestCase{
512+
{{ template "Test" . }}(ctx, t, resource.TestCase{
513513
{{ template "TestCaseSetup" . }}
514514
Steps: []resource.TestStep{
515515
{
@@ -590,7 +590,7 @@ func {{ template "testname" . }}_tags_EmptyMap(t *testing.T) {
590590
func {{ template "testname" . }}_tags_AddOnUpdate(t *testing.T) {
591591
{{- template "Init" . }}
592592

593-
{{ template "Test" . }}(t, resource.TestCase{
593+
{{ template "Test" . }}(ctx, t, resource.TestCase{
594594
{{ template "TestCaseSetup" . }}
595595
Steps: []resource.TestStep{
596596
{
@@ -684,7 +684,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnCreate(t *testing.T) {
684684
{{ end }}
685685
{{- template "Init" . }}
686686

687-
{{ template "Test" . }}(t, resource.TestCase{
687+
{{ template "Test" . }}(ctx, t, resource.TestCase{
688688
{{ template "TestCaseSetup" . }}
689689
Steps: []resource.TestStep{
690690
{
@@ -792,7 +792,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Add(t *testing.T) {
792792
{{ end }}
793793
{{- template "Init" . }}
794794

795-
{{ template "Test" . }}(t, resource.TestCase{
795+
{{ template "Test" . }}(ctx, t, resource.TestCase{
796796
{{ template "TestCaseSetup" . }}
797797
Steps: []resource.TestStep{
798798
{
@@ -953,7 +953,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Replace(t *testing.T) {
953953
{{ end }}
954954
{{- template "Init" . }}
955955

956-
{{ template "Test" . }}(t, resource.TestCase{
956+
{{ template "Test" . }}(ctx, t, resource.TestCase{
957957
{{ template "TestCaseSetup" . }}
958958
Steps: []resource.TestStep{
959959
{
@@ -1054,7 +1054,7 @@ func {{ template "testname" . }}_tags_EmptyTag_OnUpdate_Replace(t *testing.T) {
10541054
func {{ template "testname" . }}_tags_DefaultTags_providerOnly(t *testing.T) {
10551055
{{- template "Init" . }}
10561056

1057-
{{ template "Test" . }}(t, resource.TestCase{
1057+
{{ template "Test" . }}(ctx, t, resource.TestCase{
10581058
{{ template "TestCaseSetupNoProviders" . }}
10591059
Steps: []resource.TestStep{
10601060
{
@@ -1282,7 +1282,7 @@ func {{ template "testname" . }}_tags_DefaultTags_providerOnly(t *testing.T) {
12821282
func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) {
12831283
{{- template "Init" . }}
12841284

1285-
{{ template "Test" . }}(t, resource.TestCase{
1285+
{{ template "Test" . }}(ctx, t, resource.TestCase{
12861286
{{ template "TestCaseSetupNoProviders" . }}
12871287
Steps: []resource.TestStep{
12881288
{
@@ -1473,7 +1473,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nonOverlapping(t *testing.T) {
14731473
func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) {
14741474
{{- template "Init" . }}
14751475

1476-
{{ template "Test" . }}(t, resource.TestCase{
1476+
{{ template "Test" . }}(ctx, t, resource.TestCase{
14771477
{{ template "TestCaseSetupNoProviders" . }}
14781478
Steps: []resource.TestStep{
14791479
{
@@ -1674,7 +1674,7 @@ func {{ template "testname" . }}_tags_DefaultTags_overlapping(t *testing.T) {
16741674
func {{ template "testname" . }}_tags_DefaultTags_updateToProviderOnly(t *testing.T) {
16751675
{{- template "Init" . }}
16761676

1677-
{{ template "Test" . }}(t, resource.TestCase{
1677+
{{ template "Test" . }}(ctx, t, resource.TestCase{
16781678
{{ template "TestCaseSetupNoProviders" . }}
16791679
Steps: []resource.TestStep{
16801680
{
@@ -1774,7 +1774,7 @@ func {{ template "testname" . }}_tags_DefaultTags_updateToProviderOnly(t *testin
17741774
func {{ template "testname" . }}_tags_DefaultTags_updateToResourceOnly(t *testing.T) {
17751775
{{- template "Init" . }}
17761776

1777-
{{ template "Test" . }}(t, resource.TestCase{
1777+
{{ template "Test" . }}(ctx, t, resource.TestCase{
17781778
{{ template "TestCaseSetupNoProviders" . }}
17791779
Steps: []resource.TestStep{
17801780
{
@@ -1876,7 +1876,7 @@ func {{ template "testname" . }}_tags_DefaultTags_emptyResourceTag(t *testing.T)
18761876
{{ end }}
18771877
{{- template "Init" . }}
18781878

1879-
{{ template "Test" . }}(t, resource.TestCase{
1879+
{{ template "Test" . }}(ctx, t, resource.TestCase{
18801880
{{ template "TestCaseSetupNoProviders" . }}
18811881
Steps: []resource.TestStep{
18821882
{
@@ -1955,7 +1955,7 @@ func {{ template "testname" . }}_tags_DefaultTags_emptyProviderOnlyTag(t *testin
19551955
{{ end }}
19561956
{{- template "Init" . }}
19571957

1958-
{{ template "Test" . }}(t, resource.TestCase{
1958+
{{ template "Test" . }}(ctx, t, resource.TestCase{
19591959
{{ template "TestCaseSetupNoProviders" . }}
19601960
Steps: []resource.TestStep{
19611961
{
@@ -2026,7 +2026,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nullOverlappingResourceTag(t *
20262026
{{ end }}
20272027
{{- template "Init" . }}
20282028

2029-
{{ template "Test" . }}(t, resource.TestCase{
2029+
{{ template "Test" . }}(ctx, t, resource.TestCase{
20302030
{{ template "TestCaseSetupNoProviders" . }}
20312031
Steps: []resource.TestStep{
20322032
{
@@ -2114,7 +2114,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nullNonOverlappingResourceTag(
21142114
{{ end }}
21152115
{{- template "Init" . }}
21162116

2117-
{{ template "Test" . }}(t, resource.TestCase{
2117+
{{ template "Test" . }}(ctx, t, resource.TestCase{
21182118
{{ template "TestCaseSetupNoProviders" . }}
21192119
Steps: []resource.TestStep{
21202120
{
@@ -2201,7 +2201,7 @@ func {{ template "testname" . }}_tags_DefaultTags_nullNonOverlappingResourceTag(
22012201
func {{ template "testname" . }}_tags_ComputedTag_OnCreate(t *testing.T) {
22022202
{{- template "Init" . }}
22032203

2204-
{{ template "Test" . }}(t, resource.TestCase{
2204+
{{ template "Test" . }}(ctx, t, resource.TestCase{
22052205
{{ template "TestCaseSetupNoProviders" . }}
22062206
Steps: []resource.TestStep{
22072207
{
@@ -2261,7 +2261,7 @@ func {{ template "testname" . }}_tags_ComputedTag_OnCreate(t *testing.T) {
22612261
func {{ template "testname" . }}_tags_ComputedTag_OnUpdate_Add(t *testing.T) {
22622262
{{- template "Init" . }}
22632263

2264-
{{ template "Test" . }}(t, resource.TestCase{
2264+
{{ template "Test" . }}(ctx, t, resource.TestCase{
22652265
{{ template "TestCaseSetupNoProviders" . }}
22662266
Steps: []resource.TestStep{
22672267
{
@@ -2368,7 +2368,7 @@ func {{ template "testname" . }}_tags_ComputedTag_OnUpdate_Add(t *testing.T) {
23682368
func {{ template "testname" . }}_tags_ComputedTag_OnUpdate_Replace(t *testing.T) {
23692369
{{- template "Init" . }}
23702370

2371-
{{ template "Test" . }}(t, resource.TestCase{
2371+
{{ template "Test" . }}(ctx, t, resource.TestCase{
23722372
{{ template "TestCaseSetupNoProviders" . }}
23732373
Steps: []resource.TestStep{
23742374
{
@@ -2465,7 +2465,7 @@ func {{ template "testname" . }}_tags_ComputedTag_OnUpdate_Replace(t *testing.T)
24652465
func {{ template "testname" . }}_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T) {
24662466
{{- template "Init" . }}
24672467

2468-
{{ template "Test" . }}(t, resource.TestCase{
2468+
{{ template "Test" . }}(ctx, t, resource.TestCase{
24692469
{{ template "TestCaseSetupNoProviders" . }}
24702470
Steps: []resource.TestStep{
24712471
// 1: Create
@@ -2637,7 +2637,7 @@ func {{ template "testname" . }}_tags_IgnoreTags_Overlap_DefaultTag(t *testing.T
26372637
func {{ template "testname" . }}_tags_IgnoreTags_Overlap_ResourceTag(t *testing.T) {
26382638
{{- template "Init" . }}
26392639

2640-
{{ template "Test" . }}(t, resource.TestCase{
2640+
{{ template "Test" . }}(ctx, t, resource.TestCase{
26412641
{{ template "TestCaseSetupNoProviders" . }}
26422642
Steps: []resource.TestStep{
26432643
// 1: Create

0 commit comments

Comments
 (0)