Skip to content

Commit 523571c

Browse files
gdavisongdavison
authored
Merge pull request #46746 from hashicorp/td-elbv2-list-testcase-provider-factories
List Resource testing: Use `TestCase`-level provider factories
2 parents 325344b + 54a2488 commit 523571c

File tree

5 files changed

+90
-105
lines changed

5 files changed

+90
-105
lines changed

‎internal/service/elbv2/listener_list_test.go‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ func TestAccELBV2Listener_List_basic(t *testing.T) {
3939
PreCheck: func() {
4040
acctest.PreCheck(ctx, t)
4141
},
42-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
43-
CheckDestroy: testAccCheckListenerDestroy(ctx, t),
42+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
43+
CheckDestroy: testAccCheckListenerDestroy(ctx, t),
44+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
4445
Steps: []resource.TestStep{
4546
// Step 1: Setup
4647
{
47-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
48-
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_basic/"),
48+
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_basic/"),
4949
ConfigVariables: config.Variables{
5050
acctest.CtRName: config.StringVariable(rName),
5151
"resource_count": config.IntegerVariable(2),
@@ -61,9 +61,8 @@ func TestAccELBV2Listener_List_basic(t *testing.T) {
6161

6262
// Step 2: Query
6363
{
64-
Query: true,
65-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
66-
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_basic/"),
64+
Query: true,
65+
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_basic/"),
6766
ConfigVariables: config.Variables{
6867
acctest.CtRName: config.StringVariable(rName),
6968
"resource_count": config.IntegerVariable(2),
@@ -97,13 +96,13 @@ func TestAccELBV2Listener_List_includeResource(t *testing.T) {
9796
PreCheck: func() {
9897
acctest.PreCheck(ctx, t)
9998
},
100-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
101-
CheckDestroy: testAccCheckListenerDestroy(ctx, t),
99+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
100+
CheckDestroy: testAccCheckListenerDestroy(ctx, t),
101+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
102102
Steps: []resource.TestStep{
103103
// Step 1: Setup
104104
{
105-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
106-
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_include_resource/"),
105+
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_include_resource/"),
107106
ConfigVariables: config.Variables{
108107
acctest.CtRName: config.StringVariable(rName),
109108
"resource_count": config.IntegerVariable(1),
@@ -119,9 +118,8 @@ func TestAccELBV2Listener_List_includeResource(t *testing.T) {
119118

120119
// Step 2: Query
121120
{
122-
Query: true,
123-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
124-
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_include_resource/"),
121+
Query: true,
122+
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_include_resource/"),
125123
ConfigVariables: config.Variables{
126124
acctest.CtRName: config.StringVariable(rName),
127125
"resource_count": config.IntegerVariable(1),
@@ -195,13 +193,13 @@ func TestAccELBV2Listener_List_regionOverride(t *testing.T) {
195193
acctest.PreCheck(ctx, t)
196194
acctest.PreCheckMultipleRegion(t, 2)
197195
},
198-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
199-
CheckDestroy: testAccCheckListenerDestroy(ctx, t),
196+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
197+
CheckDestroy: testAccCheckListenerDestroy(ctx, t),
198+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
200199
Steps: []resource.TestStep{
201200
// Step 1: Setup
202201
{
203-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
204-
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_region_override/"),
202+
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_region_override/"),
205203
ConfigVariables: config.Variables{
206204
acctest.CtRName: config.StringVariable(rName),
207205
"resource_count": config.IntegerVariable(2),
@@ -218,9 +216,8 @@ func TestAccELBV2Listener_List_regionOverride(t *testing.T) {
218216

219217
// Step 2: Query
220218
{
221-
Query: true,
222-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
223-
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_region_override/"),
219+
Query: true,
220+
ConfigDirectory: config.StaticDirectory("testdata/Listener/list_region_override/"),
224221
ConfigVariables: config.Variables{
225222
acctest.CtRName: config.StringVariable(rName),
226223
"resource_count": config.IntegerVariable(2),

‎internal/service/elbv2/listener_rule_list_test.go‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ func TestAccELBV2ListenerRule_List_basic(t *testing.T) {
3939
PreCheck: func() {
4040
acctest.PreCheck(ctx, t)
4141
},
42-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
43-
CheckDestroy: testAccCheckListenerRuleDestroy(ctx, t),
42+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
43+
CheckDestroy: testAccCheckListenerRuleDestroy(ctx, t),
44+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
4445
Steps: []resource.TestStep{
4546
// Step 1: Setup
4647
{
47-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
48-
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_basic/"),
48+
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_basic/"),
4949
ConfigVariables: config.Variables{
5050
acctest.CtRName: config.StringVariable(rName),
5151
"resource_count": config.IntegerVariable(2),
@@ -61,9 +61,8 @@ func TestAccELBV2ListenerRule_List_basic(t *testing.T) {
6161

6262
// Step 2: Query
6363
{
64-
Query: true,
65-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
66-
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_basic/"),
64+
Query: true,
65+
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_basic/"),
6766
ConfigVariables: config.Variables{
6867
acctest.CtRName: config.StringVariable(rName),
6968
"resource_count": config.IntegerVariable(2),
@@ -97,13 +96,13 @@ func TestAccELBV2ListenerRule_List_includeResource(t *testing.T) {
9796
PreCheck: func() {
9897
acctest.PreCheck(ctx, t)
9998
},
100-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
101-
CheckDestroy: testAccCheckListenerRuleDestroy(ctx, t),
99+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
100+
CheckDestroy: testAccCheckListenerRuleDestroy(ctx, t),
101+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
102102
Steps: []resource.TestStep{
103103
// Step 1: Setup
104104
{
105-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
106-
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_include_resource/"),
105+
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_include_resource/"),
107106
ConfigVariables: config.Variables{
108107
acctest.CtRName: config.StringVariable(rName),
109108
"resource_count": config.IntegerVariable(1),
@@ -120,9 +119,8 @@ func TestAccELBV2ListenerRule_List_includeResource(t *testing.T) {
120119

121120
// Step 2: Query
122121
{
123-
Query: true,
124-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
125-
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_include_resource/"),
122+
Query: true,
123+
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_include_resource/"),
126124
ConfigVariables: config.Variables{
127125
acctest.CtRName: config.StringVariable(rName),
128126
"resource_count": config.IntegerVariable(1),
@@ -175,13 +173,13 @@ func TestAccELBV2ListenerRule_List_regionOverride(t *testing.T) {
175173
acctest.PreCheck(ctx, t)
176174
acctest.PreCheckMultipleRegion(t, 2)
177175
},
178-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
179-
CheckDestroy: testAccCheckListenerRuleDestroy(ctx, t),
176+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
177+
CheckDestroy: testAccCheckListenerRuleDestroy(ctx, t),
178+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
180179
Steps: []resource.TestStep{
181180
// Step 1: Setup
182181
{
183-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
184-
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_region_override/"),
182+
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_region_override/"),
185183
ConfigVariables: config.Variables{
186184
acctest.CtRName: config.StringVariable(rName),
187185
"resource_count": config.IntegerVariable(2),
@@ -198,9 +196,8 @@ func TestAccELBV2ListenerRule_List_regionOverride(t *testing.T) {
198196

199197
// Step 2: Query
200198
{
201-
Query: true,
202-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
203-
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_region_override/"),
199+
Query: true,
200+
ConfigDirectory: config.StaticDirectory("testdata/ListenerRule/list_region_override/"),
204201
ConfigVariables: config.Variables{
205202
acctest.CtRName: config.StringVariable(rName),
206203
"resource_count": config.IntegerVariable(2),

‎internal/service/elbv2/load_balancer_list_test.go‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ func TestAccELBV2LoadBalancer_List_basic(t *testing.T) {
4141
PreCheck: func() {
4242
acctest.PreCheck(ctx, t)
4343
},
44-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
45-
CheckDestroy: testAccCheckLoadBalancerDestroy(ctx, t),
44+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
45+
CheckDestroy: testAccCheckLoadBalancerDestroy(ctx, t),
46+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
4647
Steps: []resource.TestStep{
4748
// Step 1: Setup
4849
{
49-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
50-
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_basic/"),
50+
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_basic/"),
5151
ConfigVariables: config.Variables{
5252
acctest.CtRName: config.StringVariable(rName),
5353
"resource_count": config.IntegerVariable(2),
@@ -63,9 +63,8 @@ func TestAccELBV2LoadBalancer_List_basic(t *testing.T) {
6363

6464
// Step 2: Query
6565
{
66-
Query: true,
67-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
68-
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_basic/"),
66+
Query: true,
67+
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_basic/"),
6968
ConfigVariables: config.Variables{
7069
acctest.CtRName: config.StringVariable(rName),
7170
"resource_count": config.IntegerVariable(2),
@@ -99,13 +98,13 @@ func TestAccELBV2LoadBalancer_List_includeResource(t *testing.T) {
9998
PreCheck: func() {
10099
acctest.PreCheck(ctx, t)
101100
},
102-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
103-
CheckDestroy: testAccCheckLoadBalancerDestroy(ctx, t),
101+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
102+
CheckDestroy: testAccCheckLoadBalancerDestroy(ctx, t),
103+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
104104
Steps: []resource.TestStep{
105105
// Step 1: Setup
106106
{
107-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
108-
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_include_resource/"),
107+
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_include_resource/"),
109108
ConfigVariables: config.Variables{
110109
acctest.CtRName: config.StringVariable(rName),
111110
"resource_count": config.IntegerVariable(1),
@@ -121,9 +120,8 @@ func TestAccELBV2LoadBalancer_List_includeResource(t *testing.T) {
121120

122121
// Step 2: Query
123122
{
124-
Query: true,
125-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
126-
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_include_resource/"),
123+
Query: true,
124+
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_include_resource/"),
127125
ConfigVariables: config.Variables{
128126
acctest.CtRName: config.StringVariable(rName),
129127
"resource_count": config.IntegerVariable(1),
@@ -203,13 +201,13 @@ func TestAccELBV2LoadBalancer_List_regionOverride(t *testing.T) {
203201
acctest.PreCheck(ctx, t)
204202
acctest.PreCheckMultipleRegion(t, 2)
205203
},
206-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
207-
CheckDestroy: testAccCheckLoadBalancerDestroy(ctx, t),
204+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
205+
CheckDestroy: testAccCheckLoadBalancerDestroy(ctx, t),
206+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
208207
Steps: []resource.TestStep{
209208
// Step 1: Setup
210209
{
211-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
212-
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_region_override/"),
210+
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_region_override/"),
213211
ConfigVariables: config.Variables{
214212
acctest.CtRName: config.StringVariable(rName),
215213
"resource_count": config.IntegerVariable(2),
@@ -226,9 +224,8 @@ func TestAccELBV2LoadBalancer_List_regionOverride(t *testing.T) {
226224

227225
// Step 2: Query
228226
{
229-
Query: true,
230-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
231-
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_region_override/"),
227+
Query: true,
228+
ConfigDirectory: config.StaticDirectory("testdata/LoadBalancer/list_region_override/"),
232229
ConfigVariables: config.Variables{
233230
acctest.CtRName: config.StringVariable(rName),
234231
"resource_count": config.IntegerVariable(2),

‎internal/service/elbv2/target_group_list_test.go‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ func TestAccELBV2TargetGroup_List_basic(t *testing.T) {
4141
PreCheck: func() {
4242
acctest.PreCheck(ctx, t)
4343
},
44-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
45-
CheckDestroy: testAccCheckTargetGroupDestroy(ctx, t),
44+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
45+
CheckDestroy: testAccCheckTargetGroupDestroy(ctx, t),
46+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
4647
Steps: []resource.TestStep{
4748
// Step 1: Setup
4849
{
49-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
50-
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_basic/"),
50+
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_basic/"),
5151
ConfigVariables: config.Variables{
5252
acctest.CtRName: config.StringVariable(rName),
5353
"resource_count": config.IntegerVariable(2),
@@ -63,9 +63,8 @@ func TestAccELBV2TargetGroup_List_basic(t *testing.T) {
6363

6464
// Step 2: Query
6565
{
66-
Query: true,
67-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
68-
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_basic/"),
66+
Query: true,
67+
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_basic/"),
6968
ConfigVariables: config.Variables{
7069
acctest.CtRName: config.StringVariable(rName),
7170
"resource_count": config.IntegerVariable(2),
@@ -99,13 +98,13 @@ func TestAccELBV2TargetGroup_List_includeResource(t *testing.T) {
9998
PreCheck: func() {
10099
acctest.PreCheck(ctx, t)
101100
},
102-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
103-
CheckDestroy: testAccCheckTargetGroupDestroy(ctx, t),
101+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
102+
CheckDestroy: testAccCheckTargetGroupDestroy(ctx, t),
103+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
104104
Steps: []resource.TestStep{
105105
// Step 1: Setup
106106
{
107-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
108-
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_include_resource/"),
107+
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_include_resource/"),
109108
ConfigVariables: config.Variables{
110109
acctest.CtRName: config.StringVariable(rName),
111110
"resource_count": config.IntegerVariable(1),
@@ -121,9 +120,8 @@ func TestAccELBV2TargetGroup_List_includeResource(t *testing.T) {
121120

122121
// Step 2: Query
123122
{
124-
Query: true,
125-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
126-
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_include_resource/"),
123+
Query: true,
124+
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_include_resource/"),
127125
ConfigVariables: config.Variables{
128126
acctest.CtRName: config.StringVariable(rName),
129127
"resource_count": config.IntegerVariable(1),
@@ -194,13 +192,13 @@ func TestAccELBV2TargetGroup_List_regionOverride(t *testing.T) {
194192
acctest.PreCheck(ctx, t)
195193
acctest.PreCheckMultipleRegion(t, 2)
196194
},
197-
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
198-
CheckDestroy: testAccCheckTargetGroupDestroy(ctx, t),
195+
ErrorCheck: acctest.ErrorCheck(t, names.ELBV2ServiceID),
196+
CheckDestroy: testAccCheckTargetGroupDestroy(ctx, t),
197+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
199198
Steps: []resource.TestStep{
200199
// Step 1: Setup
201200
{
202-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
203-
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_region_override/"),
201+
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_region_override/"),
204202
ConfigVariables: config.Variables{
205203
acctest.CtRName: config.StringVariable(rName),
206204
"resource_count": config.IntegerVariable(2),
@@ -217,9 +215,8 @@ func TestAccELBV2TargetGroup_List_regionOverride(t *testing.T) {
217215

218216
// Step 2: Query
219217
{
220-
Query: true,
221-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
222-
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_region_override/"),
218+
Query: true,
219+
ConfigDirectory: config.StaticDirectory("testdata/TargetGroup/list_region_override/"),
223220
ConfigVariables: config.Variables{
224221
acctest.CtRName: config.StringVariable(rName),
225222
"resource_count": config.IntegerVariable(2),

0 commit comments

Comments
 (0)