Skip to content

Commit 685fa90

Browse files
jar-bCopilot
jar-b
and
Copilot
authored
docdb: enable go-vcr support (#46742)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 8009351 commit 685fa90

16 files changed

+179
-175
lines changed

‎.ci/semgrep/acctest/vcr/random.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ rules:
1515
- "**/*_test.go"
1616
exclude:
1717
- "/internal/provider/sdkv2"
18-
- "/internal/service/docdb"
1918
- "/internal/service/ec2"
2019
- "/internal/service/networkflowmonitor"
2120
- "/internal/service/odb"
@@ -33,7 +32,6 @@ rules:
3332
- "**/*_test.go"
3433
exclude:
3534
- "/internal/provider/sdkv2"
36-
- "/internal/service/docdb"
3735
- "/internal/service/ec2"
3836
- "/internal/service/networkflowmonitor"
3937
- "/internal/service/odb"
@@ -51,7 +49,6 @@ rules:
5149
- "**/*_test.go"
5250
exclude:
5351
- "/internal/provider/sdkv2"
54-
- "/internal/service/docdb"
5552
- "/internal/service/ec2"
5653
- "/internal/service/networkflowmonitor"
5754
- "/internal/service/odb"

‎.ci/semgrep/acctest/vcr/test.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ rules:
1515
- "**/*_test.go"
1616
exclude:
1717
- "/internal/provider/sdkv2"
18-
- "/internal/service/docdb"
1918
- "/internal/service/ec2"
2019
- "/internal/service/networkflowmonitor"
2120
- "/internal/service/odb"
@@ -33,7 +32,6 @@ rules:
3332
- "**/*_test.go"
3433
exclude:
3534
- "/internal/provider/sdkv2"
36-
- "/internal/service/docdb"
3735
- "/internal/service/ec2"
3836
- "/internal/service/networkflowmonitor"
3937
- "/internal/service/odb"
@@ -51,7 +49,6 @@ rules:
5149
- "**/*_test.go"
5250
exclude:
5351
- "/internal/provider/sdkv2"
54-
- "/internal/service/docdb"
5552
- "/internal/service/ec2"
5653
- "/internal/service/networkflowmonitor"
5754
- "/internal/service/odb"

‎internal/service/docdb/cluster.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,8 +1151,8 @@ func findDBClusters(ctx context.Context, conn *docdb.Client, input *docdb.Descri
11511151
return output, nil
11521152
}
11531153

1154-
func statusDBCluster(ctx context.Context, conn *docdb.Client, id string) retry.StateRefreshFunc {
1155-
return func(_ context.Context) (any, string, error) {
1154+
func statusDBCluster(conn *docdb.Client, id string) retry.StateRefreshFunc {
1155+
return func(ctx context.Context) (any, string, error) {
11561156
output, err := findDBClusterByID(ctx, conn, id)
11571157

11581158
if retry.NotFound(err) {
@@ -1179,7 +1179,7 @@ func waitDBClusterAvailable(ctx context.Context, conn *docdb.Client, id string,
11791179
clusterStatusUpgrading,
11801180
},
11811181
Target: []string{clusterStatusAvailable},
1182-
Refresh: statusDBCluster(ctx, conn, id),
1182+
Refresh: statusDBCluster(conn, id),
11831183
Timeout: timeout,
11841184
MinTimeout: 10 * time.Second,
11851185
Delay: 30 * time.Second,
@@ -1203,7 +1203,7 @@ func waitDBClusterDeleted(ctx context.Context, conn *docdb.Client, id string, ti
12031203
clusterStatusModifying,
12041204
},
12051205
Target: []string{},
1206-
Refresh: statusDBCluster(ctx, conn, id),
1206+
Refresh: statusDBCluster(conn, id),
12071207
Timeout: timeout,
12081208
MinTimeout: 10 * time.Second,
12091209
Delay: 30 * time.Second,

‎internal/service/docdb/cluster_instance.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ func findDBInstances(ctx context.Context, conn *docdb.Client, input *docdb.Descr
445445
return output, nil
446446
}
447447

448-
func statusDBInstance(ctx context.Context, conn *docdb.Client, id string) retry.StateRefreshFunc {
449-
return func(_ context.Context) (any, string, error) {
448+
func statusDBInstance(conn *docdb.Client, id string) retry.StateRefreshFunc {
449+
return func(ctx context.Context) (any, string, error) {
450450
output, err := findDBInstanceByID(ctx, conn, id)
451451

452452
if retry.NotFound(err) {
@@ -479,7 +479,7 @@ func waitDBInstanceAvailable(ctx context.Context, conn *docdb.Client, id string,
479479
"upgrading",
480480
},
481481
Target: []string{"available"},
482-
Refresh: statusDBInstance(ctx, conn, id),
482+
Refresh: statusDBInstance(conn, id),
483483
Timeout: timeout,
484484
MinTimeout: 10 * time.Second,
485485
Delay: 30 * time.Second,
@@ -503,7 +503,7 @@ func waitDBInstanceDeleted(ctx context.Context, conn *docdb.Client, id string, t
503503
"deleting",
504504
},
505505
Target: []string{},
506-
Refresh: statusDBInstance(ctx, conn, id),
506+
Refresh: statusDBInstance(conn, id),
507507
Timeout: timeout,
508508
MinTimeout: 10 * time.Second,
509509
Delay: 30 * time.Second,

‎internal/service/docdb/cluster_instance_test.go‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"testing"
1010

1111
awstypes "github.com/aws/aws-sdk-go-v2/service/docdb/types"
12-
sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
1312
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1413
"github.com/hashicorp/terraform-plugin-testing/terraform"
1514
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
@@ -22,9 +21,9 @@ func TestAccDocDBClusterInstance_basic(t *testing.T) {
2221
ctx := acctest.Context(t)
2322
var v awstypes.DBInstance
2423
resourceName := "aws_docdb_cluster_instance.test"
25-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
24+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
2625

27-
resource.ParallelTest(t, resource.TestCase{
26+
acctest.ParallelTest(ctx, t, resource.TestCase{
2827
PreCheck: func() { acctest.PreCheck(ctx, t) },
2928
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
3029
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -88,9 +87,9 @@ func TestAccDocDBClusterInstance_disappears(t *testing.T) {
8887
ctx := acctest.Context(t)
8988
var v awstypes.DBInstance
9089
resourceName := "aws_docdb_cluster_instance.test"
91-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
90+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
9291

93-
resource.ParallelTest(t, resource.TestCase{
92+
acctest.ParallelTest(ctx, t, resource.TestCase{
9493
PreCheck: func() { acctest.PreCheck(ctx, t) },
9594
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
9695
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -112,9 +111,9 @@ func TestAccDocDBClusterInstance_identifierGenerated(t *testing.T) {
112111
ctx := acctest.Context(t)
113112
var v awstypes.DBInstance
114113
resourceName := "aws_docdb_cluster_instance.test"
115-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
114+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
116115

117-
resource.ParallelTest(t, resource.TestCase{
116+
acctest.ParallelTest(ctx, t, resource.TestCase{
118117
PreCheck: func() { acctest.PreCheck(ctx, t) },
119118
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
120119
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -145,9 +144,9 @@ func TestAccDocDBClusterInstance_identifierPrefix(t *testing.T) {
145144
ctx := acctest.Context(t)
146145
var v awstypes.DBInstance
147146
resourceName := "aws_docdb_cluster_instance.test"
148-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
147+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
149148

150-
resource.ParallelTest(t, resource.TestCase{
149+
acctest.ParallelTest(ctx, t, resource.TestCase{
151150
PreCheck: func() { acctest.PreCheck(ctx, t) },
152151
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
153152
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -179,9 +178,9 @@ func TestAccDocDBClusterInstance_tags(t *testing.T) {
179178
ctx := acctest.Context(t)
180179
var v awstypes.DBInstance
181180
resourceName := "aws_docdb_cluster_instance.test"
182-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
181+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
183182

184-
resource.ParallelTest(t, resource.TestCase{
183+
acctest.ParallelTest(ctx, t, resource.TestCase{
185184
PreCheck: func() { acctest.PreCheck(ctx, t) },
186185
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
187186
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -230,9 +229,9 @@ func TestAccDocDBClusterInstance_performanceInsights(t *testing.T) {
230229
var v awstypes.DBInstance
231230
resourceName := "aws_docdb_cluster_instance.test"
232231
rNamePrefix := acctest.ResourcePrefix
233-
rName := sdkacctest.RandomWithPrefix(rNamePrefix)
232+
rName := acctest.RandomWithPrefix(t, rNamePrefix)
234233

235-
resource.ParallelTest(t, resource.TestCase{
234+
acctest.ParallelTest(ctx, t, resource.TestCase{
236235
PreCheck: func() { acctest.PreCheck(ctx, t) },
237236
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
238237
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -266,9 +265,9 @@ func TestAccDocDBClusterInstance_az(t *testing.T) {
266265
ctx := acctest.Context(t)
267266
var v awstypes.DBInstance
268267
resourceName := "aws_docdb_cluster_instance.test"
269-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
268+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
270269

271-
resource.ParallelTest(t, resource.TestCase{
270+
acctest.ParallelTest(ctx, t, resource.TestCase{
272271
PreCheck: func() { acctest.PreCheck(ctx, t) },
273272
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
274273
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -299,9 +298,9 @@ func TestAccDocDBClusterInstance_kmsKey(t *testing.T) {
299298
ctx := acctest.Context(t)
300299
var v awstypes.DBInstance
301300
resourceName := "aws_docdb_cluster_instance.test"
302-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
301+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
303302

304-
resource.ParallelTest(t, resource.TestCase{
303+
acctest.ParallelTest(ctx, t, resource.TestCase{
305304
PreCheck: func() { acctest.PreCheck(ctx, t) },
306305
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
307306
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -332,9 +331,9 @@ func TestAccDocDBClusterInstance_copyTagsToSnapshot(t *testing.T) {
332331
ctx := acctest.Context(t)
333332
var v awstypes.DBInstance
334333
resourceName := "aws_docdb_cluster_instance.test"
335-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
334+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
336335

337-
resource.ParallelTest(t, resource.TestCase{
336+
acctest.ParallelTest(ctx, t, resource.TestCase{
338337
PreCheck: func() { acctest.PreCheck(ctx, t) },
339338
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
340339
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,

‎internal/service/docdb/cluster_parameter_group_test.go‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
awstypes "github.com/aws/aws-sdk-go-v2/service/docdb/types"
1313
sdkid "github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
14-
sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
1514
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1615
"github.com/hashicorp/terraform-plugin-testing/terraform"
1716
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
@@ -24,9 +23,9 @@ func TestAccDocDBClusterParameterGroup_basic(t *testing.T) {
2423
ctx := acctest.Context(t)
2524
var v awstypes.DBClusterParameterGroup
2625
resourceName := "aws_docdb_cluster_parameter_group.test"
27-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
26+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
2827

29-
resource.ParallelTest(t, resource.TestCase{
28+
acctest.ParallelTest(ctx, t, resource.TestCase{
3029
PreCheck: func() { acctest.PreCheck(ctx, t) },
3130
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
3231
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -58,9 +57,9 @@ func TestAccDocDBClusterParameterGroup_disappears(t *testing.T) {
5857
ctx := acctest.Context(t)
5958
var v awstypes.DBClusterParameterGroup
6059
resourceName := "aws_docdb_cluster_parameter_group.test"
61-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
60+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
6261

63-
resource.ParallelTest(t, resource.TestCase{
62+
acctest.ParallelTest(ctx, t, resource.TestCase{
6463
PreCheck: func() { acctest.PreCheck(ctx, t) },
6564
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
6665
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -83,7 +82,7 @@ func TestAccDocDBClusterParameterGroup_nameGenerated(t *testing.T) {
8382
var v awstypes.DBClusterParameterGroup
8483
resourceName := "aws_docdb_cluster_parameter_group.test"
8584

86-
resource.ParallelTest(t, resource.TestCase{
85+
acctest.ParallelTest(ctx, t, resource.TestCase{
8786
PreCheck: func() { acctest.PreCheck(ctx, t) },
8887
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
8988
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -111,7 +110,7 @@ func TestAccDocDBClusterParameterGroup_namePrefix(t *testing.T) {
111110
var v awstypes.DBClusterParameterGroup
112111
resourceName := "aws_docdb_cluster_parameter_group.test"
113112

114-
resource.ParallelTest(t, resource.TestCase{
113+
acctest.ParallelTest(ctx, t, resource.TestCase{
115114
PreCheck: func() { acctest.PreCheck(ctx, t) },
116115
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
117116
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -138,9 +137,9 @@ func TestAccDocDBClusterParameterGroup_description(t *testing.T) {
138137
ctx := acctest.Context(t)
139138
var v awstypes.DBClusterParameterGroup
140139
resourceName := "aws_docdb_cluster_parameter_group.test"
141-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
140+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
142141

143-
resource.ParallelTest(t, resource.TestCase{
142+
acctest.ParallelTest(ctx, t, resource.TestCase{
144143
PreCheck: func() { acctest.PreCheck(ctx, t) },
145144
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
146145
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -166,9 +165,9 @@ func TestAccDocDBClusterParameterGroup_systemParameter(t *testing.T) {
166165
ctx := acctest.Context(t)
167166
var v awstypes.DBClusterParameterGroup
168167
resourceName := "aws_docdb_cluster_parameter_group.test"
169-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
168+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
170169

171-
resource.ParallelTest(t, resource.TestCase{
170+
acctest.ParallelTest(ctx, t, resource.TestCase{
172171
PreCheck: func() { acctest.PreCheck(ctx, t) },
173172
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
174173
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -195,9 +194,9 @@ func TestAccDocDBClusterParameterGroup_parameter(t *testing.T) {
195194
ctx := acctest.Context(t)
196195
var v awstypes.DBClusterParameterGroup
197196
resourceName := "aws_docdb_cluster_parameter_group.test"
198-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
197+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
199198

200-
resource.ParallelTest(t, resource.TestCase{
199+
acctest.ParallelTest(ctx, t, resource.TestCase{
201200
PreCheck: func() { acctest.PreCheck(ctx, t) },
202201
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
203202
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -240,9 +239,9 @@ func TestAccDocDBClusterParameterGroup_tags(t *testing.T) {
240239
ctx := acctest.Context(t)
241240
var v awstypes.DBClusterParameterGroup
242241
resourceName := "aws_docdb_cluster_parameter_group.test"
243-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
242+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
244243

245-
resource.ParallelTest(t, resource.TestCase{
244+
acctest.ParallelTest(ctx, t, resource.TestCase{
246245
PreCheck: func() { acctest.PreCheck(ctx, t) },
247246
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
248247
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,

‎internal/service/docdb/cluster_snapshot.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ func findClusterSnapshots(ctx context.Context, conn *docdb.Client, input *docdb.
235235
return output, nil
236236
}
237237

238-
func statusClusterSnapshot(ctx context.Context, conn *docdb.Client, id string) retry.StateRefreshFunc {
239-
return func(_ context.Context) (any, string, error) {
238+
func statusClusterSnapshot(conn *docdb.Client, id string) retry.StateRefreshFunc {
239+
return func(ctx context.Context) (any, string, error) {
240240
output, err := findClusterSnapshotByID(ctx, conn, id)
241241

242242
if retry.NotFound(err) {
@@ -255,7 +255,7 @@ func waitClusterSnapshotCreated(ctx context.Context, conn *docdb.Client, id stri
255255
stateConf := &retry.StateChangeConf{
256256
Pending: []string{clusterSnapshotStatusCreating},
257257
Target: []string{clusterSnapshotStatusAvailable},
258-
Refresh: statusClusterSnapshot(ctx, conn, id),
258+
Refresh: statusClusterSnapshot(conn, id),
259259
Timeout: timeout,
260260
MinTimeout: 10 * time.Second,
261261
Delay: 5 * time.Second,

‎internal/service/docdb/cluster_snapshot_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010

1111
"github.com/YakDriver/regexache"
1212
awstypes "github.com/aws/aws-sdk-go-v2/service/docdb/types"
13-
sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
1413
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
1514
"github.com/hashicorp/terraform-plugin-testing/terraform"
1615
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
@@ -22,10 +21,10 @@ import (
2221
func TestAccDocDBClusterSnapshot_basic(t *testing.T) {
2322
ctx := acctest.Context(t)
2423
var dbClusterSnapshot awstypes.DBClusterSnapshot
25-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
24+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
2625
resourceName := "aws_docdb_cluster_snapshot.test"
2726

28-
resource.ParallelTest(t, resource.TestCase{
27+
acctest.ParallelTest(ctx, t, resource.TestCase{
2928
PreCheck: func() { acctest.PreCheck(ctx, t) },
3029
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
3130
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
@@ -60,10 +59,10 @@ func TestAccDocDBClusterSnapshot_basic(t *testing.T) {
6059
func TestAccDocDBClusterSnapshot_disappears(t *testing.T) {
6160
ctx := acctest.Context(t)
6261
var dbClusterSnapshot awstypes.DBClusterSnapshot
63-
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
62+
rName := acctest.RandomWithPrefix(t, acctest.ResourcePrefix)
6463
resourceName := "aws_docdb_cluster_snapshot.test"
6564

66-
resource.ParallelTest(t, resource.TestCase{
65+
acctest.ParallelTest(ctx, t, resource.TestCase{
6766
PreCheck: func() { acctest.PreCheck(ctx, t) },
6867
ErrorCheck: acctest.ErrorCheck(t, names.DocDBServiceID),
6968
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,

0 commit comments

Comments
 (0)