Skip to content

Commit

Permalink
Simplify
Browse files Browse the repository at this point in the history
Signed-off-by: Sune Keller <absukl@almbrand.dk>
  • Loading branch information
sirlatrom committed Mar 18, 2020
1 parent cd7d32c commit 865a985
Showing 1 changed file with 4 additions and 15 deletions.
Expand Up @@ -1436,9 +1436,8 @@ func resourceArmApplicationGatewayCreateUpdate(d *schema.ResourceData, meta inte
gateway.ApplicationGatewayPropertiesFormat.WebApplicationFirewallConfiguration = expandApplicationGatewayWafConfig(d)
}

if res, ok := d.GetOk("firewall_policy_id"); ok {
vs := res.([]interface{})
id := vs[0].(string)
if v, ok := d.GetOk("firewall_policy_id"); ok {
id := v.(string)
gateway.ApplicationGatewayPropertiesFormat.FirewallPolicy = &network.SubResource{
ID: &id,
}
Expand Down Expand Up @@ -1623,8 +1622,8 @@ func resourceArmApplicationGatewayRead(d *schema.ResourceData, meta interface{})
return fmt.Errorf("Error setting `waf_configuration`: %+v", setErr)
}

if setErr := d.Set("firewall_policy_id", flattenApplicationGatewayFirewallPolicy(props.FirewallPolicy)); setErr != nil {
return fmt.Errorf("Error setting `firewall_policy_id`: %+v", setErr)
if props.FirewallPolicy != nil {
d.Set("firewall_policy_id", props.FirewallPolicy.ID)
}
}

Expand Down Expand Up @@ -3609,16 +3608,6 @@ func flattenApplicationGatewayWafConfig(input *network.ApplicationGatewayWebAppl
return results
}

func flattenApplicationGatewayFirewallPolicy(input *network.SubResource) string {
output := ""

if input.ID != nil {
output = *input.ID
}

return output
}

func expandApplicationGatewayFirewallDisabledRuleGroup(d []interface{}) *[]network.ApplicationGatewayFirewallDisabledRuleGroup {
if len(d) == 0 {
return nil
Expand Down

0 comments on commit 865a985

Please sign in to comment.