Skip to content

Commit 1aab4e4

Browse files
musa-cfmusa-cf
authored
Merge pull request #5897 from zakcutner/ruleset/tests
Refactor test data files for `cloudflare_ruleset`
2 parents aee0019 + 0e3e399 commit 1aab4e4

File tree

30 files changed

+57
-57
lines changed

30 files changed

+57
-57
lines changed

‎internal/services/ruleset/resource_test.go

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -18,93 +18,93 @@ var configVariables = config.Variables{
1818
"zone_id": config.StringVariable(os.Getenv("CLOUDFLARE_ZONE_ID")),
1919
}
2020

21-
func TestAccCloudflareRuleset_Name(t *testing.T) {
21+
func TestAccCloudflareRuleset_Kind(t *testing.T) {
2222
resource.Test(t, resource.TestCase{
2323
PreCheck: func() { acctest.TestAccPreCheck(t) },
2424
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
2525
Steps: []resource.TestStep{
2626
{
27-
ConfigFile: config.TestNameFile("before.tf"),
27+
ConfigFile: config.TestNameFile("1.tf"),
2828
ConfigVariables: configVariables,
2929
ConfigPlanChecks: resource.ConfigPlanChecks{
3030
PreApply: []plancheck.PlanCheck{
3131
plancheck.ExpectResourceAction("cloudflare_ruleset.my_ruleset", plancheck.ResourceActionCreate),
3232
plancheck.ExpectKnownValue(
3333
"cloudflare_ruleset.my_ruleset",
34-
tfjsonpath.New("name"),
35-
knownvalue.StringExact("My ruleset"),
34+
tfjsonpath.New("kind"),
35+
knownvalue.StringExact("root"),
3636
),
3737
},
3838
},
3939
ConfigStateChecks: []statecheck.StateCheck{
4040
statecheck.ExpectKnownValue(
4141
"cloudflare_ruleset.my_ruleset",
42-
tfjsonpath.New("name"),
43-
knownvalue.StringExact("My ruleset"),
42+
tfjsonpath.New("kind"),
43+
knownvalue.StringExact("root"),
4444
),
4545
},
4646
},
4747
{
48-
ConfigFile: config.TestNameFile("after.tf"),
48+
ConfigFile: config.TestNameFile("2.tf"),
4949
ConfigVariables: configVariables,
5050
ConfigPlanChecks: resource.ConfigPlanChecks{
5151
PreApply: []plancheck.PlanCheck{
5252
plancheck.ExpectResourceAction("cloudflare_ruleset.my_ruleset", plancheck.ResourceActionReplace),
5353
plancheck.ExpectKnownValue(
5454
"cloudflare_ruleset.my_ruleset",
55-
tfjsonpath.New("name"),
56-
knownvalue.StringExact("My updated ruleset"),
55+
tfjsonpath.New("kind"),
56+
knownvalue.StringExact("custom"),
5757
),
5858
},
5959
},
6060
ConfigStateChecks: []statecheck.StateCheck{
6161
statecheck.ExpectKnownValue(
6262
"cloudflare_ruleset.my_ruleset",
63-
tfjsonpath.New("name"),
64-
knownvalue.StringExact("My updated ruleset"),
63+
tfjsonpath.New("kind"),
64+
knownvalue.StringExact("custom"),
6565
),
6666
},
6767
},
6868
},
6969
})
7070
}
7171

72-
func TestAccCloudflareRuleset_Description(t *testing.T) {
72+
func TestAccCloudflareRuleset_Name(t *testing.T) {
7373
resource.Test(t, resource.TestCase{
7474
PreCheck: func() { acctest.TestAccPreCheck(t) },
7575
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
7676
Steps: []resource.TestStep{
7777
{
78-
ConfigFile: config.TestNameFile("before.tf"),
78+
ConfigFile: config.TestNameFile("1.tf"),
7979
ConfigVariables: configVariables,
8080
ConfigPlanChecks: resource.ConfigPlanChecks{
8181
PreApply: []plancheck.PlanCheck{
8282
plancheck.ExpectResourceAction("cloudflare_ruleset.my_ruleset", plancheck.ResourceActionCreate),
8383
plancheck.ExpectKnownValue(
8484
"cloudflare_ruleset.my_ruleset",
85-
tfjsonpath.New("description"),
86-
knownvalue.StringExact("My ruleset description"),
85+
tfjsonpath.New("name"),
86+
knownvalue.StringExact("My ruleset"),
8787
),
8888
},
8989
},
9090
ConfigStateChecks: []statecheck.StateCheck{
9191
statecheck.ExpectKnownValue(
9292
"cloudflare_ruleset.my_ruleset",
93-
tfjsonpath.New("description"),
94-
knownvalue.StringExact("My ruleset description"),
93+
tfjsonpath.New("name"),
94+
knownvalue.StringExact("My ruleset"),
9595
),
9696
},
9797
},
9898
{
99-
ConfigFile: config.TestNameFile("after.tf"),
99+
ConfigFile: config.TestNameFile("2.tf"),
100100
ConfigVariables: configVariables,
101101
ConfigPlanChecks: resource.ConfigPlanChecks{
102102
PreApply: []plancheck.PlanCheck{
103-
plancheck.ExpectResourceAction("cloudflare_ruleset.my_ruleset", plancheck.ResourceActionUpdate),
103+
plancheck.ExpectResourceAction("cloudflare_ruleset.my_ruleset", plancheck.ResourceActionReplace),
104104
plancheck.ExpectKnownValue(
105105
"cloudflare_ruleset.my_ruleset",
106106
tfjsonpath.New("name"),
107-
knownvalue.StringExact("My updated ruleset description"),
107+
knownvalue.StringExact("My updated ruleset"),
108108
),
109109
},
110110
},
@@ -126,7 +126,7 @@ func TestAccCloudflareRuleset_Phase(t *testing.T) {
126126
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
127127
Steps: []resource.TestStep{
128128
{
129-
ConfigFile: config.TestNameFile("before.tf"),
129+
ConfigFile: config.TestNameFile("1.tf"),
130130
ConfigVariables: configVariables,
131131
ConfigPlanChecks: resource.ConfigPlanChecks{
132132
PreApply: []plancheck.PlanCheck{
@@ -147,7 +147,7 @@ func TestAccCloudflareRuleset_Phase(t *testing.T) {
147147
},
148148
},
149149
{
150-
ConfigFile: config.TestNameFile("after.tf"),
150+
ConfigFile: config.TestNameFile("2.tf"),
151151
ConfigVariables: configVariables,
152152
ConfigPlanChecks: resource.ConfigPlanChecks{
153153
PreApply: []plancheck.PlanCheck{
@@ -171,64 +171,64 @@ func TestAccCloudflareRuleset_Phase(t *testing.T) {
171171
})
172172
}
173173

174-
func TestAccCloudflareRuleset_Kind(t *testing.T) {
174+
func TestAccCloudflareRuleset_Description(t *testing.T) {
175175
resource.Test(t, resource.TestCase{
176176
PreCheck: func() { acctest.TestAccPreCheck(t) },
177177
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
178178
Steps: []resource.TestStep{
179179
{
180-
ConfigFile: config.TestNameFile("before.tf"),
180+
ConfigFile: config.TestNameFile("1.tf"),
181181
ConfigVariables: configVariables,
182182
ConfigPlanChecks: resource.ConfigPlanChecks{
183183
PreApply: []plancheck.PlanCheck{
184184
plancheck.ExpectResourceAction("cloudflare_ruleset.my_ruleset", plancheck.ResourceActionCreate),
185185
plancheck.ExpectKnownValue(
186186
"cloudflare_ruleset.my_ruleset",
187-
tfjsonpath.New("kind"),
188-
knownvalue.StringExact("root"),
187+
tfjsonpath.New("description"),
188+
knownvalue.StringExact("My ruleset description"),
189189
),
190190
},
191191
},
192192
ConfigStateChecks: []statecheck.StateCheck{
193193
statecheck.ExpectKnownValue(
194194
"cloudflare_ruleset.my_ruleset",
195-
tfjsonpath.New("kind"),
196-
knownvalue.StringExact("root"),
195+
tfjsonpath.New("description"),
196+
knownvalue.StringExact("My ruleset description"),
197197
),
198198
},
199199
},
200200
{
201-
ConfigFile: config.TestNameFile("after.tf"),
201+
ConfigFile: config.TestNameFile("2.tf"),
202202
ConfigVariables: configVariables,
203203
ConfigPlanChecks: resource.ConfigPlanChecks{
204204
PreApply: []plancheck.PlanCheck{
205-
plancheck.ExpectResourceAction("cloudflare_ruleset.my_ruleset", plancheck.ResourceActionReplace),
205+
plancheck.ExpectResourceAction("cloudflare_ruleset.my_ruleset", plancheck.ResourceActionUpdate),
206206
plancheck.ExpectKnownValue(
207207
"cloudflare_ruleset.my_ruleset",
208-
tfjsonpath.New("kind"),
209-
knownvalue.StringExact("custom"),
208+
tfjsonpath.New("name"),
209+
knownvalue.StringExact("My updated ruleset description"),
210210
),
211211
},
212212
},
213213
ConfigStateChecks: []statecheck.StateCheck{
214214
statecheck.ExpectKnownValue(
215215
"cloudflare_ruleset.my_ruleset",
216-
tfjsonpath.New("kind"),
217-
knownvalue.StringExact("custom"),
216+
tfjsonpath.New("name"),
217+
knownvalue.StringExact("My updated ruleset"),
218218
),
219219
},
220220
},
221221
},
222222
})
223223
}
224224

225-
func TestAccCloudflareRuleset_RuleLogging(t *testing.T) {
225+
func TestAccCloudflareRuleset_RulesLogging(t *testing.T) {
226226
resource.Test(t, resource.TestCase{
227227
PreCheck: func() { acctest.TestAccPreCheck(t) },
228228
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
229229
Steps: []resource.TestStep{
230230
{
231-
ConfigFile: config.TestNameFile("omitted.tf"),
231+
ConfigFile: config.TestNameFile("1.tf"),
232232
ConfigVariables: configVariables,
233233
ConfigPlanChecks: resource.ConfigPlanChecks{
234234
PreApply: []plancheck.PlanCheck{
@@ -261,7 +261,7 @@ func TestAccCloudflareRuleset_RuleLogging(t *testing.T) {
261261
},
262262
},
263263
{
264-
ConfigFile: config.TestNameFile("enabled.tf"),
264+
ConfigFile: config.TestNameFile("2.tf"),
265265
ConfigVariables: configVariables,
266266
ConfigPlanChecks: resource.ConfigPlanChecks{
267267
PreApply: []plancheck.PlanCheck{
@@ -283,7 +283,7 @@ func TestAccCloudflareRuleset_RuleLogging(t *testing.T) {
283283
},
284284
},
285285
{
286-
ConfigFile: config.TestNameFile("disabled.tf"),
286+
ConfigFile: config.TestNameFile("3.tf"),
287287
ConfigVariables: configVariables,
288288
ConfigPlanChecks: resource.ConfigPlanChecks{
289289
PreApply: []plancheck.PlanCheck{
@@ -325,7 +325,7 @@ func TestAccCloudflareRuleset_RuleLogging(t *testing.T) {
325325
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
326326
Steps: []resource.TestStep{
327327
{
328-
ConfigFile: config.TestNameFile("before.tf"),
328+
ConfigFile: config.TestNameFile("1.tf"),
329329
ConfigVariables: configVariables,
330330
ConfigPlanChecks: resource.ConfigPlanChecks{
331331
PreApply: []plancheck.PlanCheck{
@@ -368,7 +368,7 @@ func TestAccCloudflareRuleset_RuleLogging(t *testing.T) {
368368
},
369369
},
370370
{
371-
ConfigFile: config.TestNameFile("after.tf"),
371+
ConfigFile: config.TestNameFile("2.tf"),
372372
ConfigVariables: configVariables,
373373
ConfigPlanChecks: resource.ConfigPlanChecks{
374374
PreApply: []plancheck.PlanCheck{
@@ -415,7 +415,7 @@ func TestAccCloudflareRuleset_RuleLogging(t *testing.T) {
415415
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
416416
Steps: []resource.TestStep{
417417
{
418-
ConfigFile: config.TestNameFile("before.tf"),
418+
ConfigFile: config.TestNameFile("1.tf"),
419419
ConfigVariables: configVariables,
420420
ConfigPlanChecks: resource.ConfigPlanChecks{
421421
PreApply: []plancheck.PlanCheck{
@@ -458,7 +458,7 @@ func TestAccCloudflareRuleset_RuleLogging(t *testing.T) {
458458
},
459459
},
460460
{
461-
ConfigFile: config.TestNameFile("after.tf"),
461+
ConfigFile: config.TestNameFile("2.tf"),
462462
ConfigVariables: configVariables,
463463
ConfigPlanChecks: resource.ConfigPlanChecks{
464464
PreApply: []plancheck.PlanCheck{
@@ -506,7 +506,7 @@ func TestAccCloudflareRuleset_RuleLogging(t *testing.T) {
506506
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
507507
Steps: []resource.TestStep{
508508
{
509-
ConfigFile: config.TestNameFile("before.tf"),
509+
ConfigFile: config.TestNameFile("1.tf"),
510510
ConfigVariables: configVariables,
511511
ConfigPlanChecks: resource.ConfigPlanChecks{
512512
PreApply: []plancheck.PlanCheck{
@@ -549,7 +549,7 @@ func TestAccCloudflareRuleset_RuleLogging(t *testing.T) {
549549
},
550550
},
551551
{
552-
ConfigFile: config.TestNameFile("after.tf"),
552+
ConfigFile: config.TestNameFile("2.tf"),
553553
ConfigVariables: configVariables,
554554
ConfigPlanChecks: resource.ConfigPlanChecks{
555555
PreApply: []plancheck.PlanCheck{
@@ -597,14 +597,14 @@ func TestAccCloudflareRuleset_RuleLogging(t *testing.T) {
597597
})
598598
}
599599

600-
func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
600+
func TestAccCloudflareRuleset_RulesRef(t *testing.T) {
601601
t.Run("add", func(t *testing.T) {
602602
resource.Test(t, resource.TestCase{
603603
PreCheck: func() { acctest.TestAccPreCheck(t) },
604604
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
605605
Steps: []resource.TestStep{
606606
{
607-
ConfigFile: config.TestNameFile("before.tf"),
607+
ConfigFile: config.TestNameFile("1.tf"),
608608
ConfigVariables: configVariables,
609609
ConfigPlanChecks: resource.ConfigPlanChecks{
610610
PreApply: []plancheck.PlanCheck{
@@ -651,7 +651,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
651651
},
652652
},
653653
{
654-
ConfigFile: config.TestNameFile("after.tf"),
654+
ConfigFile: config.TestNameFile("2.tf"),
655655
ConfigVariables: configVariables,
656656
ConfigPlanChecks: resource.ConfigPlanChecks{
657657
PreApply: []plancheck.PlanCheck{
@@ -693,7 +693,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
693693
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
694694
Steps: []resource.TestStep{
695695
{
696-
ConfigFile: config.TestNameFile("before.tf"),
696+
ConfigFile: config.TestNameFile("1.tf"),
697697
ConfigVariables: configVariables,
698698
ConfigPlanChecks: resource.ConfigPlanChecks{
699699
PreApply: []plancheck.PlanCheck{
@@ -740,7 +740,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
740740
},
741741
},
742742
{
743-
ConfigFile: config.TestNameFile("after.tf"),
743+
ConfigFile: config.TestNameFile("2.tf"),
744744
ConfigVariables: configVariables,
745745
ConfigPlanChecks: resource.ConfigPlanChecks{
746746
PreApply: []plancheck.PlanCheck{
@@ -782,7 +782,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
782782
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
783783
Steps: []resource.TestStep{
784784
{
785-
ConfigFile: config.TestNameFile("before.tf"),
785+
ConfigFile: config.TestNameFile("1.tf"),
786786
ConfigVariables: configVariables,
787787
ConfigPlanChecks: resource.ConfigPlanChecks{
788788
PreApply: []plancheck.PlanCheck{
@@ -829,7 +829,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
829829
},
830830
},
831831
{
832-
ConfigFile: config.TestNameFile("after.tf"),
832+
ConfigFile: config.TestNameFile("2.tf"),
833833
ConfigVariables: configVariables,
834834
ConfigPlanChecks: resource.ConfigPlanChecks{
835835
PreApply: []plancheck.PlanCheck{
@@ -863,7 +863,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
863863
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
864864
Steps: []resource.TestStep{
865865
{
866-
ConfigFile: config.TestNameFile("before.tf"),
866+
ConfigFile: config.TestNameFile("1.tf"),
867867
ConfigVariables: configVariables,
868868
ConfigPlanChecks: resource.ConfigPlanChecks{
869869
PreApply: []plancheck.PlanCheck{
@@ -910,7 +910,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
910910
},
911911
},
912912
{
913-
ConfigFile: config.TestNameFile("after.tf"),
913+
ConfigFile: config.TestNameFile("2.tf"),
914914
ConfigVariables: configVariables,
915915
ConfigPlanChecks: resource.ConfigPlanChecks{
916916
PreApply: []plancheck.PlanCheck{
@@ -939,7 +939,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
939939
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
940940
Steps: []resource.TestStep{
941941
{
942-
ConfigFile: config.TestNameFile("before.tf"),
942+
ConfigFile: config.TestNameFile("1.tf"),
943943
ConfigVariables: configVariables,
944944
ConfigPlanChecks: resource.ConfigPlanChecks{
945945
PreApply: []plancheck.PlanCheck{
@@ -986,7 +986,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
986986
},
987987
},
988988
{
989-
ConfigFile: config.TestNameFile("after.tf"),
989+
ConfigFile: config.TestNameFile("2.tf"),
990990
ConfigVariables: configVariables,
991991
ConfigPlanChecks: resource.ConfigPlanChecks{
992992
PreApply: []plancheck.PlanCheck{
@@ -1020,7 +1020,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
10201020
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
10211021
Steps: []resource.TestStep{
10221022
{
1023-
ConfigFile: config.TestNameFile("before.tf"),
1023+
ConfigFile: config.TestNameFile("1.tf"),
10241024
ConfigVariables: configVariables,
10251025
ConfigPlanChecks: resource.ConfigPlanChecks{
10261026
PreApply: []plancheck.PlanCheck{
@@ -1067,7 +1067,7 @@ func TestAccCloudflareRuleset_RuleRef(t *testing.T) {
10671067
},
10681068
},
10691069
{
1070-
ConfigFile: config.TestNameFile("after.tf"),
1070+
ConfigFile: config.TestNameFile("2.tf"),
10711071
ConfigVariables: configVariables,
10721072
ConfigPlanChecks: resource.ConfigPlanChecks{
10731073
PreApply: []plancheck.PlanCheck{

‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Description/before.tf renamed to ‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Description/1.tf

File renamed without changes.

‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Description/after.tf renamed to ‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Description/2.tf

File renamed without changes.

‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Kind/before.tf renamed to ‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Kind/1.tf

File renamed without changes.

‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Kind/after.tf renamed to ‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Kind/2.tf

File renamed without changes.

‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Name/before.tf renamed to ‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Name/1.tf

File renamed without changes.

‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Name/after.tf renamed to ‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Name/2.tf

File renamed without changes.

‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Phase/before.tf renamed to ‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Phase/1.tf

File renamed without changes.

‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Phase/after.tf renamed to ‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_Phase/2.tf

File renamed without changes.

‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_RuleLogging/omitted.tf renamed to ‎internal/services/ruleset/testdata/TestAccCloudflareRuleset_RulesLogging/1.tf

File renamed without changes.

0 commit comments

Comments
 (0)