Merge pull request #536 from Pavel-Koev/block_duration-fix

Fixing block duration fields

Author: BrachaY

incapsula/client_incap_rule.go

@@ -10,29 +10,29 @@ import (
 
 // IncapRule is a struct that encompasses all the properties of an IncapRule
 type IncapRule struct {
-	Name                  string               `json:"name"`
-	Action                string               `json:"action"`
-	Filter                string               `json:"filter,omitempty"`
-	ResponseCode          int                  `json:"response_code,omitempty"`
-	AddMissing            bool                 `json:"add_missing,omitempty"`
-	RewriteExisting       *bool                `json:"rewrite_existing,omitempty"`
-	From                  string               `json:"from,omitempty"`
-	To                    string               `json:"to,omitempty"`
-	RewriteName           string               `json:"rewrite_name,omitempty"`
-	DCID                  int                  `json:"dc_id,omitempty"`
-	PortForwardingContext string               `json:"port_forwarding_context,omitempty"`
-	PortForwardingValue   string               `json:"port_forwarding_value,omitempty"`
-	RateContext           string               `json:"rate_context,omitempty"`
-	RateInterval          int                  `json:"rate_interval,omitempty"`
-	ErrorType             string               `json:"error_type,omitempty"`
-	ErrorResponseFormat   string               `json:"error_response_format,omitempty"`
-	ErrorResponseData     string               `json:"error_response_data,omitempty"`
-	MultipleDeletions     bool                 `json:"multiple_deletions,omitempty"`
-	OverrideWafRule       string               `json:"overrideWafRule,omitempty"`
-	OverrideWafAction     string               `json:"overrideWafAction,omitempty"`
-	Enabled               bool                 `json:"enabled"`
-	SendNotifications     *bool                `json:"sendNotifications,omitempty"`
-	BlockDurationDetails  BlockDurationDetails `json:"blockDurationDetails,omitempty"`
+	Name                  string                `json:"name"`
+	Action                string                `json:"action"`
+	Filter                string                `json:"filter,omitempty"`
+	ResponseCode          int                   `json:"response_code,omitempty"`
+	AddMissing            bool                  `json:"add_missing,omitempty"`
+	RewriteExisting       *bool                 `json:"rewrite_existing,omitempty"`
+	From                  string                `json:"from,omitempty"`
+	To                    string                `json:"to,omitempty"`
+	RewriteName           string                `json:"rewrite_name,omitempty"`
+	DCID                  int                   `json:"dc_id,omitempty"`
+	PortForwardingContext string                `json:"port_forwarding_context,omitempty"`
+	PortForwardingValue   string                `json:"port_forwarding_value,omitempty"`
+	RateContext           string                `json:"rate_context,omitempty"`
+	RateInterval          int                   `json:"rate_interval,omitempty"`
+	ErrorType             string                `json:"error_type,omitempty"`
+	ErrorResponseFormat   string                `json:"error_response_format,omitempty"`
+	ErrorResponseData     string                `json:"error_response_data,omitempty"`
+	MultipleDeletions     bool                  `json:"multiple_deletions,omitempty"`
+	OverrideWafRule       string                `json:"overrideWafRule,omitempty"`
+	OverrideWafAction     string                `json:"overrideWafAction,omitempty"`
+	Enabled               bool                  `json:"enabled"`
+	SendNotifications     *bool                 `json:"sendNotifications,omitempty"`
+	BlockDurationDetails  *BlockDurationDetails `json:"blockDurationDetails,omitempty"`
 }
 
 type BlockDurationDetails struct {

incapsula/resource_incap_rule.go

@@ -214,13 +214,17 @@ func resourceIncapRuleCreate(d *schema.ResourceData, m interface{}) error {
 		sendNotifications = &valBool
 	}
 
-	blockDurationDetails := BlockDurationDetails{
+	blockDurationDetails := &BlockDurationDetails{
 		BlockDurationType: d.Get("block_duration_type").(string),
 		BlockDuration:     d.Get("block_duration").(int),
 		BlockDurationMin:  d.Get("block_duration_min").(int),
 		BlockDurationMax:  d.Get("block_duration_max").(int),
 	}
 
+	if blockDurationDetails.BlockDurationType == "" {
+		blockDurationDetails = nil
+	}
+
 	rule := IncapRule{
 		Name:                  d.Get("name").(string),
 		Action:                action,
@@ -303,10 +307,12 @@ func resourceIncapRuleRead(d *schema.ResourceData, m interface{}) error {
 	if rule.SendNotifications != nil {
 		d.Set("send_notifications", strconv.FormatBool(*rule.SendNotifications))
 	}
-	d.Set("block_duration_type", rule.BlockDurationDetails.BlockDurationType)
-	d.Set("block_duration", rule.BlockDurationDetails.BlockDuration)
-	d.Set("block_duration_min", rule.BlockDurationDetails.BlockDurationMin)
-	d.Set("block_duration_max", rule.BlockDurationDetails.BlockDurationMax)
+	if rule.BlockDurationDetails != nil {
+		d.Set("block_duration_type", rule.BlockDurationDetails.BlockDurationType)
+		d.Set("block_duration", rule.BlockDurationDetails.BlockDuration)
+		d.Set("block_duration_min", rule.BlockDurationDetails.BlockDurationMin)
+		d.Set("block_duration_max", rule.BlockDurationDetails.BlockDurationMax)
+	}
 
 	action := d.Get("action").(string)
 
@@ -344,13 +350,17 @@ func resourceIncapRuleUpdate(d *schema.ResourceData, m interface{}) error {
 		sendNotifications = &valBool
 	}
 
-	blockDurationDetails := BlockDurationDetails{
+	blockDurationDetails := &BlockDurationDetails{
 		BlockDurationType: d.Get("block_duration_type").(string),
 		BlockDuration:     d.Get("block_duration").(int),
 		BlockDurationMin:  d.Get("block_duration_min").(int),
 		BlockDurationMax:  d.Get("block_duration_max").(int),
 	}
 
+	if blockDurationDetails.BlockDurationType == "" {
+		blockDurationDetails = nil
+	}
+
 	rule := IncapRule{
 		Name:                  d.Get("name").(string),
 		Action:                action,