Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

resource/cloudflare_ruleset: fix state handler #1183

Merged
merged 1 commit into from
Sep 10, 2021
Merged

resource/cloudflare_ruleset: fix state handler #1183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 64 additions & 18 deletions cloudflare/resource_cloudflare_ruleset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"log"
"reflect"
"strings"

"github.com/cloudflare/cloudflare-go"
Expand Down Expand Up @@ -92,6 +93,7 @@ func resourceCloudflareRuleset() *schema.Resource {
},
"action_parameters": {
Type: schema.TypeList,
MaxItems: 1,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -313,7 +315,10 @@ func resourceCloudflareRulesetRead(d *schema.ResourceData, meta interface{}) err

d.Set("name", ruleset.Name)
d.Set("description", ruleset.Description)
d.Set("rules", buildStateFromRulesetRules(ruleset.Rules))

if err := d.Set("rules", buildStateFromRulesetRules(ruleset.Rules)); err != nil {
log.Fatalf("failed to set rules: %s", err)
}

return nil
}
Expand Down Expand Up @@ -361,30 +366,71 @@ func resourceCloudflareRulesetDelete(d *schema.ResourceData, meta interface{}) e
return nil
}

// receives the current rules and returns an interface for the state file
func buildStateFromRulesetRules(r []cloudflare.RulesetRule) interface{} {
var ruleset []interface{}
var rulesetRule map[string]interface{}

for _, rule := range r {
rulesetRule = make(map[string]interface{})
// buildStateFromRulesetRules receives the current ruleset rules and returns an
// interface for the state file
func buildStateFromRulesetRules(rules []cloudflare.RulesetRule) interface{} {
var rulesData []map[string]interface{}
for _, r := range rules {
rule := map[string]interface{}{
"id": r.ID,
"expression": r.Expression,
"action": r.Action,
"enabled": r.Enabled,
}

rulesetRule["expression"] = rule.Expression
rulesetRule["action"] = rule.Action
if rule.Description != "" {
rulesetRule["description"] = rule.Description
if r.Description != "" {
rule["description"] = r.Description
}

if rule.Enabled {
rulesetRule["enabled"] = "true"
} else {
rulesetRule["enabled"] = "false"
if !reflect.ValueOf(r.ActionParameters).IsNil() {
var actionParameters []map[string]interface{}
var overrides []map[string]interface{}
var idBasedOverrides []map[string]interface{}
var categoryBasedOverrides []map[string]interface{}

if !reflect.ValueOf(r.ActionParameters.Overrides).IsNil() {
for _, overrideRule := range r.ActionParameters.Overrides.Rules {
idBasedOverrides = append(idBasedOverrides, map[string]interface{}{
"id": overrideRule.ID,
"action": overrideRule.Action,
"enabled": overrideRule.Enabled,
"score_threshold": overrideRule.ScoreThreshold,
})
}

for _, overrideRule := range r.ActionParameters.Overrides.Categories {
categoryBasedOverrides = append(categoryBasedOverrides, map[string]interface{}{
"category": overrideRule.Category,
"action": overrideRule.Action,
"enabled": overrideRule.Enabled,
})
}

overrides = append(overrides, map[string]interface{}{
"categories": categoryBasedOverrides,
"rules": idBasedOverrides,
"enabled": r.ActionParameters.Overrides.Enabled,
})
}

actionParameters = append(actionParameters, map[string]interface{}{
"id": r.ActionParameters.ID,
"increment": r.ActionParameters.Increment,
// "headers": r.ActionParameters.Headers,
"overrides": overrides,
"products": r.ActionParameters.Products,
"ruleset": r.ActionParameters.Ruleset,
"uri": r.ActionParameters.URI,
// "version": r.ActionParameters.Version,
})

rule["action_parameters"] = actionParameters
}

ruleset = append(ruleset, rulesetRule)
rulesData = append(rulesData, rule)
}

return ruleset
return rulesData
}

// receives the resource config and builds a ruleset rule array
Expand Down
5 changes: 2 additions & 3 deletions cloudflare/resource_cloudflare_ruleset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ func TestAccCloudflareRuleset_WAFManagedRulesetWithIDBasedOverrides(t *testing.T
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.#", "1"),

resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.0.id", "efb7b8c949ac4650a09736fc376e9aee"),
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.0.overrides.#", "1"),

resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.0.overrides.0.rules.#", "2"),
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.0.overrides.0.rules.0.id", "5de7edfa648c4d6891dc3e7f84534ffa"),
resource.TestCheckResourceAttr(resourceName, "rules.0.action_parameters.0.overrides.0.rules.0.action", "log"),
Expand Down Expand Up @@ -546,8 +546,7 @@ func TestAccCloudflareRuleset_MagicTransitUpdateWithHigherPriority(t *testing.T)
{
Config: testAccCheckCloudflareRulesetMagicTransitMultiple(rnd, rnd, accountID),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
name, "name", rnd),
resource.TestCheckResourceAttr(name, "name", rnd),
resource.TestCheckResourceAttr(name, "rules.#", "2"),
resource.TestCheckResourceAttr(name, "rules.0.action", "block"),
resource.TestCheckResourceAttr(name, "rules.0.description", "Block UDP Ephemeral Ports"),
Expand Down