Skip to content

Commit f0dbe83

Browse files
vaishakdineshvaishakdinesh
authored
Merge pull request #5829 from cloudflare/vaishak/housekeeping
chore: housekeeping
2 parents f851277 + b64e4fc commit f0dbe83

File tree

5 files changed

+7
-107
lines changed

5 files changed

+7
-107
lines changed

‎internal/acctest/acctest.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ func (pc debugNonEmptyRefreshPlan) CheckPlan(ctx context.Context, req plancheck.
307307
bytes, _ := json.MarshalIndent(d, " ", " ")
308308
fmt.Printf("%s\n\n", string(bytes))
309309
}
310-
fmt.Println("---------\n")
310+
fmt.Println("---------")
311311
}
312312

313313
var pc plancheck.PlanCheck = debugNonEmptyRefreshPlan{}

‎internal/services/list_item/model.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ type ListItemModel struct {
2222
Hostname customfield.NestedObject[ListItemHostnameModel] `tfsdk:"hostname" json:"hostname,optional"`
2323
Redirect customfield.NestedObject[ListItemRedirectModel] `tfsdk:"redirect" json:"redirect,optional"`
2424
OperationID types.String `tfsdk:"operation_id" json:"operation_id,computed,no_refresh"`
25+
ModifiedOn types.String `tfsdk:"modified_on" json:"modified_on,computed"`
26+
CreatedOn types.String `tfsdk:"created_on" json:"created_on,computed"`
2527
}
2628

2729
func (m ListItemModel) MarshalJSON() (data []byte, err error) {

‎internal/services/ruleset/resource_test.go‎

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -210,101 +210,6 @@ func TestAccCloudflareRuleset_WAFManagedRulesetOWASP(t *testing.T) {
210210
})
211211
}
212212

213-
func TestAccCloudflareRuleset_WAFManagedRulesetOWASPBlockXSSWithAnomalyOver60(t *testing.T) {
214-
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the WAF
215-
// service does not yet support the API tokens and it results in
216-
// misleading state error messages.
217-
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
218-
t.Setenv("CLOUDFLARE_API_TOKEN", "")
219-
}
220-
221-
rnd := utils.GenerateRandomResourceName()
222-
zoneID := os.Getenv("CLOUDFLARE_ZONE_ID")
223-
zoneName := os.Getenv("CLOUDFLARE_DOMAIN")
224-
resourceName := "cloudflare_ruleset." + rnd
225-
226-
resource.Test(t, resource.TestCase{
227-
PreCheck: func() { acctest.TestAccPreCheck(t) },
228-
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
229-
Steps: []resource.TestStep{
230-
{
231-
Config: testAccCheckCloudflareRulesetManagedWAFOWASPBlockXSSAndAnomalyOver60(rnd, "Cloudflare OWASP managed ruleset blocking all XSS and anomaly scores over 60", zoneID, zoneName),
232-
Check: resource.ComposeTestCheckFunc(
233-
resource.TestCheckResourceAttr(resourceName, "name", "Cloudflare OWASP managed ruleset blocking all XSS and anomaly scores over 60"),
234-
resource.TestCheckResourceAttr(resourceName, "description", rnd+" ruleset description"),
235-
resource.TestCheckResourceAttr(resourceName, "kind", "zone"),
236-
resource.TestCheckResourceAttr(resourceName, "phase", "http_request_firewall_managed"),
237-
238-
resource.TestCheckResourceAttr(resourceName, "rules.#", "2"),
239-
resource.TestCheckResourceAttr(resourceName, "rules.0.action", "execute"),
240-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.id", "efb7b8c949ac4650a09736fc376e9aee"),
241-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.categories.0.category", "xss"),
242-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.categories.0.action", "block"),
243-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.categories.0.enabled", "true"),
244-
245-
resource.TestCheckResourceAttr(resourceName, "rules.1.action", "execute"),
246-
resource.TestCheckResourceAttr(resourceName, "rules.1.action_parameters.id", "4814384a9e5d4991b9815dcfc25d2f1f"),
247-
resource.TestCheckResourceAttr(resourceName, "rules.1.action_parameters.overrides.rules.0.id", "6179ae15870a4bb7b2d480d4843b323c"),
248-
resource.TestCheckResourceAttr(resourceName, "rules.1.action_parameters.overrides.rules.0.action", "block"),
249-
resource.TestCheckResourceAttr(resourceName, "rules.1.action_parameters.overrides.rules.0.score_threshold", "60"),
250-
251-
resource.TestCheckResourceAttr(resourceName, "rules.0.expression", "true"),
252-
resource.TestCheckResourceAttr(resourceName, "rules.0.description", "zone"),
253-
),
254-
},
255-
},
256-
})
257-
}
258-
259-
func TestAccCloudflareRuleset_WAFManagedRulesetOWASPOnlyPL1(t *testing.T) {
260-
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the WAF
261-
// service does not yet support the API tokens and it results in
262-
// misleading state error messages.
263-
if os.Getenv("CLOUDFLARE_API_TOKEN") != "" {
264-
t.Setenv("CLOUDFLARE_API_TOKEN", "")
265-
}
266-
267-
rnd := utils.GenerateRandomResourceName()
268-
zoneID := os.Getenv("CLOUDFLARE_ZONE_ID")
269-
zoneName := os.Getenv("CLOUDFLARE_DOMAIN")
270-
resourceName := "cloudflare_ruleset." + rnd
271-
272-
resource.Test(t, resource.TestCase{
273-
PreCheck: func() { acctest.TestAccPreCheck(t) },
274-
ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
275-
Steps: []resource.TestStep{
276-
{
277-
Config: testAccCheckCloudflareRulesetManagedWAFOWASPOnlyPL1(rnd, "Cloudflare OWASP managed ruleset only setting PL1", zoneID, zoneName),
278-
Check: resource.ComposeTestCheckFunc(
279-
resource.TestCheckResourceAttr(resourceName, "name", "Cloudflare OWASP managed ruleset only setting PL1"),
280-
resource.TestCheckResourceAttr(resourceName, "description", rnd+" ruleset description"),
281-
resource.TestCheckResourceAttr(resourceName, "kind", "zone"),
282-
resource.TestCheckResourceAttr(resourceName, "phase", "http_request_firewall_managed"),
283-
284-
resource.TestCheckResourceAttr(resourceName, "rules.#", "1"),
285-
resource.TestCheckResourceAttr(resourceName, "rules.0.action", "execute"),
286-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.id", "4814384a9e5d4991b9815dcfc25d2f1f"),
287-
288-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.categories.0.category", "paranoia-level-2"),
289-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.categories.0.enabled", "false"),
290-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.categories.1.category", "paranoia-level-3"),
291-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.categories.1.enabled", "false"),
292-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.categories.2.category", "paranoia-level-4"),
293-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.categories.2.enabled", "false"),
294-
295-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.rules.0.id", "6179ae15870a4bb7b2d480d4843b323c"),
296-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.rules.0.action", "block"),
297-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.rules.0.score_threshold", "60"),
298-
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.overrides.rules.0.enabled", "true"),
299-
300-
resource.TestCheckResourceAttr(resourceName, "rules.0.expression", "true"),
301-
resource.TestCheckResourceAttr(resourceName, "rules.0.description", "zone"),
302-
),
303-
},
304-
},
305-
})
306-
}
307-
308213
func TestAccCloudflareRuleset_WAFManagedRulesetDeployMultiple(t *testing.T) {
309214
// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the WAF
310215
// service does not yet support the API tokens and it results in
@@ -2665,14 +2570,6 @@ func testAccCheckCloudflareRulesetManagedWAFOWASP(rnd, name, zoneID, zoneName st
26652570
return acctest.LoadTestCase("rulesetmanagedwafowasp.tf", rnd, name, zoneID, zoneName)
26662571
}
26672572

2668-
func testAccCheckCloudflareRulesetManagedWAFOWASPBlockXSSAndAnomalyOver60(rnd, name, zoneID, zoneName string) string {
2669-
return acctest.LoadTestCase("rulesetmanagedwafowaspblockxssandanomalyover60.tf", rnd, name, zoneID, zoneName)
2670-
}
2671-
2672-
func testAccCheckCloudflareRulesetManagedWAFOWASPOnlyPL1(rnd, name, zoneID, zoneName string) string {
2673-
return acctest.LoadTestCase("rulesetmanagedwafowasponlypl1.tf", rnd, name, zoneID, zoneName)
2674-
}
2675-
26762573
func testAccCheckCloudflareRulesetManagedWAFDeployMultiple(rnd, name, zoneID, zoneName string) string {
26772574
return acctest.LoadTestCase("rulesetmanagedwafdeploymultiple.tf", rnd, name, zoneID, zoneName)
26782575
}

‎internal/services/zone_dnssec/custom.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package zone_dnssec
33
import (
44
"context"
55

6-
"github.com/cloudflare/cloudflare-go/v4"
7-
"github.com/cloudflare/cloudflare-go/v4/dns"
8-
"github.com/cloudflare/cloudflare-go/v4/option"
6+
"github.com/cloudflare/cloudflare-go/v5"
7+
"github.com/cloudflare/cloudflare-go/v5/dns"
8+
"github.com/cloudflare/cloudflare-go/v5/option"
99
"github.com/cloudflare/terraform-provider-cloudflare/internal/logging"
1010
"github.com/hashicorp/terraform-plugin-framework/resource"
1111
)

‎scripts/run-ci-acceptance-tests‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ go test -run "^TestAcc" -count 1 \
137137
./internal/services/zero_trust_gateway_certificate \
138138
./internal/services/zero_trust_gateway_logging \
139139
./internal/services/zero_trust_gateway_proxy_endpoint \
140+
./internal/services/zero_trust_gateway_settings \
140141
./internal/services/zero_trust_list \
141142
./internal/services/zero_trust_organization \
142143
./internal/services/zero_trust_risk_behavior \

0 commit comments

Comments
 (0)