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

azurerm_firewall_policy_rule_collection_group: support description for nat/network rules #23354

Merged
merged 1 commit into from
Sep 22, 2023
Merged

azurerm_firewall_policy_rule_collection_group: support description for nat/network rules #23354

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
15 changes: 15 additions & 0 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 @@ -9,6 +9,7 @@ import (
"strconv"
"time"

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-helpers/lang/response"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
Expand Down Expand Up @@ -236,6 +237,11 @@ func resourceFirewallPolicyRuleCollectionGroup() *pluginsdk.Resource {
Required: true,
ValidateFunc: validation.StringIsNotEmpty,
},
"description": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: validation.StringIsNotEmpty,
},
"protocols": {
Type: pluginsdk.TypeList,
Required: true,
Expand Down Expand Up @@ -349,6 +355,11 @@ func resourceFirewallPolicyRuleCollectionGroup() *pluginsdk.Resource {
Required: true,
ValidateFunc: validation.StringIsNotEmpty,
},
"description": {
Type: pluginsdk.TypeString,
Optional: true,
ValidateFunc: validation.StringIsNotEmpty,
},
"protocols": {
Type: pluginsdk.TypeList,
Required: true,
Expand Down Expand Up @@ -659,6 +670,7 @@ func expandFirewallPolicyRuleNetwork(input []interface{}) *[]network.BasicFirewa
DestinationIPGroups: utils.ExpandStringSlice(condition["destination_ip_groups"].([]interface{})),
DestinationFqdns: utils.ExpandStringSlice(condition["destination_fqdns"].([]interface{})),
DestinationPorts: utils.ExpandStringSlice(condition["destination_ports"].([]interface{})),
Description: pointer.To(condition["description"].(string)),
}
result = append(result, output)
}
Expand Down Expand Up @@ -691,6 +703,7 @@ func expandFirewallPolicyRuleNat(input []interface{}) (*[]network.BasicFirewallP
DestinationAddresses: &destinationAddresses,
DestinationPorts: utils.ExpandStringSlice(condition["destination_ports"].([]interface{})),
TranslatedPort: utils.String(strconv.Itoa(condition["translated_port"].(int))),
Description: pointer.To(condition["description"].(string)),
}
if condition["translated_address"].(string) != "" {
output.TranslatedAddress = utils.String(condition["translated_address"].(string))
Expand Down Expand Up @@ -890,6 +903,7 @@ func flattenFirewallPolicyRuleNetwork(input *[]network.BasicFirewallPolicyRule)
"destination_ip_groups": utils.FlattenStringSlice(rule.DestinationIPGroups),
"destination_fqdns": utils.FlattenStringSlice(rule.DestinationFqdns),
"destination_ports": utils.FlattenStringSlice(rule.DestinationPorts),
"description": pointer.From(rule.Description),
})
}
return output, nil
Expand Down Expand Up @@ -951,6 +965,7 @@ func flattenFirewallPolicyRuleNat(input *[]network.BasicFirewallPolicyRule) ([]i
"translated_address": translatedAddress,
"translated_port": translatedPort,
"translated_fqdn": translatedFQDN,
"description": pointer.From(rule.Description),
})
}
return output, nil
Expand Down
3 changes: 3 additions & 0 deletions internal/services/firewall/firewall_policy_rule_collection_group_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,13 +259,15 @@ resource "azurerm_firewall_policy_rule_collection_group" "test" {
action = "Deny"
rule {
name = "network_rule_collection1_rule1"
description = "network_rule_collection1_rule1"
protocols = ["TCP", "UDP"]
source_addresses = ["10.0.0.1"]
destination_addresses = ["192.168.1.1", "ApiManagement"]
destination_ports = ["80", "1000-2000"]
}
rule {
name = "network_rule_collection1_rule2"
description = "network_rule_collection1_rule2"
protocols = ["TCP", "UDP"]
source_addresses = ["10.0.0.1"]
destination_fqdns = ["time.windows.com"]
Expand All @@ -292,6 +294,7 @@ resource "azurerm_firewall_policy_rule_collection_group" "test" {
action = "Dnat"
rule {
name = "nat_rule_collection1_rule1"
description = "nat_rule_collection1_rule1"
protocols = ["TCP", "UDP"]
source_addresses = ["10.0.0.1", "10.0.0.2"]
destination_address = "192.168.1.1"
Expand Down
4 changes: 4 additions & 0 deletions website/docs/r/firewall_policy_rule_collection_group.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ A `network_rule` (network rule) block supports the following:

* `name` - (Required) The name which should be used for this rule.

* `description` - (Optional) The description which should be used for this rule.

* `protocols` - (Required) Specifies a list of network protocols this rule applies to. Possible values are `Any`, `TCP`, `UDP`, `ICMP`.

* `destination_ports` - (Required) Specifies a list of destination ports.
Expand All @@ -183,6 +185,8 @@ A `nat_rule` (NAT rule) block supports the following:

* `name` - (Required) The name which should be used for this rule.

* `description` - (Optional) The description which should be used for this rule.

* `protocols` - (Required) Specifies a list of network protocols this rule applies to. Possible values are `TCP`, `UDP`.

* `source_addresses` - (Optional) Specifies a list of source IP addresses (including CIDR, IP range and `*`).
Expand Down
Loading