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

azurerm_firewall_policy_rule_collection_group - support description,destination_addresses,destination_urls,terminate_tls,web_categories #13190

Merged
merged 12 commits into from
Sep 3, 2021
Merged

azurerm_firewall_policy_rule_collection_group - support description,destination_addresses,destination_urls,terminate_tls,web_categories #13190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ffbd930
enhance firewall policy rule collection group to support Azure Firewa…
gro1m Aug 31, 2021
156647d
fix: convert tls_terminate condition to bool
gro1m Aug 31, 2021
c246487
make terrafmt
gro1m Aug 31, 2021
afe6fbc
fix web_categories in test
gro1m Sep 1, 2021
9145c33
set protocols attribute to optional as only required for Target FQDNs…
gro1m Sep 1, 2021
b1d34a5
resolve test conflicts
gro1m Sep 1, 2021
f175f12
update docs
gro1m Sep 1, 2021
706a2a2
fix tests
gro1m Sep 2, 2021
8d1760c
remove lifecycle ignore_changes blocks
gro1m Sep 2, 2021
b129128
add tests for Premium
gro1m Sep 2, 2021
05d3e67
all tests pass (also Premium)
gro1m Sep 2, 2021
0c2ba48
remove lifecycle ignore_changes
gro1m Sep 2, 2021
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
75 changes: 66 additions & 9 deletions internal/services/firewall/firewall_policy_rule_collection_group_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import (

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
azValidate "github.com/hashicorp/terraform-provider-azurerm/helpers/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/locks"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/firewall/parse"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/firewall/validate"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
"github.com/hashicorp/terraform-provider-azurerm/internal/timeouts"
"github.com/hashicorp/terraform-provider-azurerm/utils"
)
Expand Down Expand Up @@ -95,9 +95,14 @@ func resourceFirewallPolicyRuleCollectionGroup() *pluginsdk.Resource {
Required: true,
ValidateFunc: validate.FirewallPolicyRuleName(),
},
"description": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: validate.FirewallPolicyRuleName(),
},
"protocols": {
Type: pluginsdk.TypeSet,
Required: true,
Optional: true,
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"type": {
Expand Down Expand Up @@ -136,6 +141,18 @@ func resourceFirewallPolicyRuleCollectionGroup() *pluginsdk.Resource {
ValidateFunc: validation.StringIsNotEmpty,
},
},
"destination_addresses": {
Type: pluginsdk.TypeSet,
Optional: true,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.Any(
validation.IsIPAddress,
validation.IsCIDR,
validation.StringInSlice([]string{`*`}, false),
),
},
},
"destination_fqdns": {
Type: pluginsdk.TypeSet,
Optional: true,
Expand All @@ -144,6 +161,14 @@ func resourceFirewallPolicyRuleCollectionGroup() *pluginsdk.Resource {
ValidateFunc: validation.StringIsNotEmpty,
},
},
"destination_urls": {
Type: pluginsdk.TypeSet,
Optional: true,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
},
},
"destination_fqdn_tags": {
Type: pluginsdk.TypeSet,
Optional: true,
Expand All @@ -152,6 +177,18 @@ func resourceFirewallPolicyRuleCollectionGroup() *pluginsdk.Resource {
ValidateFunc: validation.StringIsNotEmpty,
},
},
"terminate_tls": {
Type: pluginsdk.TypeBool,
Optional: true,
},
"web_categories": {
Type: pluginsdk.TypeSet,
Optional: true,
Elem: &pluginsdk.Schema{
Type: pluginsdk.TypeString,
ValidateFunc: validation.StringIsNotEmpty,
},
},
},
},
},
Expand Down Expand Up @@ -564,13 +601,18 @@ func expandFirewallPolicyRuleApplication(input []interface{}) *[]network.BasicFi
})
}
output := &network.ApplicationRule{
Name: utils.String(condition["name"].(string)),
RuleType: network.RuleTypeApplicationRule,
Protocols: &protocols,
SourceAddresses: utils.ExpandStringSlice(condition["source_addresses"].(*pluginsdk.Set).List()),
SourceIPGroups: utils.ExpandStringSlice(condition["source_ip_groups"].(*pluginsdk.Set).List()),
TargetFqdns: utils.ExpandStringSlice(condition["destination_fqdns"].(*pluginsdk.Set).List()),
FqdnTags: utils.ExpandStringSlice(condition["destination_fqdn_tags"].(*pluginsdk.Set).List()),
Name: utils.String(condition["name"].(string)),
Description: utils.String(condition["description"].(string)),
RuleType: network.RuleTypeApplicationRule,
Protocols: &protocols,
SourceAddresses: utils.ExpandStringSlice(condition["source_addresses"].(*pluginsdk.Set).List()),
SourceIPGroups: utils.ExpandStringSlice(condition["source_ip_groups"].(*pluginsdk.Set).List()),
DestinationAddresses: utils.ExpandStringSlice(condition["destination_addresses"].(*pluginsdk.Set).List()),
TargetFqdns: utils.ExpandStringSlice(condition["destination_fqdns"].(*pluginsdk.Set).List()),
TargetUrls: utils.ExpandStringSlice(condition["destination_urls"].(*pluginsdk.Set).List()),
FqdnTags: utils.ExpandStringSlice(condition["destination_fqdn_tags"].(*pluginsdk.Set).List()),
TerminateTLS: utils.Bool(condition["terminate_tls"].(bool)),
WebCategories: utils.ExpandStringSlice(condition["web_categories"].(*pluginsdk.Set).List()),
}
result = append(result, output)
}
Expand Down Expand Up @@ -739,6 +781,16 @@ func flattenFirewallPolicyRuleApplication(input *[]network.BasicFirewallPolicyRu
name = *rule.Name
}

var description string
if rule.Description != nil {
description = *rule.Description
}

var terminate_tls bool
if rule.TerminateTLS != nil {
terminate_tls = *rule.TerminateTLS
}

protocols := make([]interface{}, 0)
if rule.Protocols != nil {
for _, protocol := range *rule.Protocols {
Expand All @@ -755,11 +807,16 @@ func flattenFirewallPolicyRuleApplication(input *[]network.BasicFirewallPolicyRu

output = append(output, map[string]interface{}{
"name": name,
"description": description,
"protocols": protocols,
"source_addresses": utils.FlattenStringSlice(rule.SourceAddresses),
"source_ip_groups": utils.FlattenStringSlice(rule.SourceIPGroups),
"destination_addresses": utils.FlattenStringSlice(rule.DestinationAddresses),
"destination_urls": utils.FlattenStringSlice(rule.TargetUrls),
"destination_fqdns": utils.FlattenStringSlice(rule.TargetFqdns),
"destination_fqdn_tags": utils.FlattenStringSlice(rule.FqdnTags),
"terminate_tls": terminate_tls,
"web_categories": utils.FlattenStringSlice(rule.WebCategories),
})
}

Expand Down
Loading