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

new resource: azurerm_firewall_policy_rule_collection_group #8603

Merged
merged 8 commits into from
Oct 30, 2020
Merged

new resource: azurerm_firewall_policy_rule_collection_group #8603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e5627d
new resource /data source: azurerm_firewall_policy_rule_collection_group
magodo Jun 19, 2020
d38128c
remove data source `azurerm_firewall_policy_rule_collection_group`
magodo Oct 12, 2020
e581597
update per review
magodo Oct 12, 2020
4b3e7de
format
magodo Oct 14, 2020
b3f3020
remove data source from registration
magodo Oct 14, 2020
79cc061
network rule add `destination_fqdns` && fix a delete bug
magodo Oct 15, 2020
e70290e
make goimports
magodo Oct 15, 2020
35d3cba
opt in ID formatter
magodo Oct 27, 2020
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
5 changes: 5 additions & 0 deletions azurerm/internal/services/network/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type Client struct {
ExpressRouteGatewaysClient *network.ExpressRouteGatewaysClient
ExpressRoutePeeringsClient *network.ExpressRouteCircuitPeeringsClient
FirewallPolicyClient *network.FirewallPoliciesClient
FirewallPolicyRuleGroupClient *network.FirewallPolicyRuleCollectionGroupsClient
HubVirtualNetworkConnectionClient *network.HubVirtualNetworkConnectionsClient
InterfacesClient *network.InterfacesClient
IPGroupsClient *network.IPGroupsClient
Expand Down Expand Up @@ -88,6 +89,9 @@ func NewClient(o *common.ClientOptions) *Client {
FirewallPolicyClient := network.NewFirewallPoliciesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&FirewallPolicyClient.Client, o.ResourceManagerAuthorizer)

FirewallPolicyRuleGroupClient := network.NewFirewallPolicyRuleCollectionGroupsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&FirewallPolicyRuleGroupClient.Client, o.ResourceManagerAuthorizer)

HubVirtualNetworkConnectionClient := network.NewHubVirtualNetworkConnectionsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
o.ConfigureClient(&HubVirtualNetworkConnectionClient.Client, o.ResourceManagerAuthorizer)

Expand Down Expand Up @@ -202,6 +206,7 @@ func NewClient(o *common.ClientOptions) *Client {
ExpressRouteGatewaysClient: &ExpressRouteGatewaysClient,
ExpressRoutePeeringsClient: &ExpressRoutePeeringsClient,
FirewallPolicyClient: &FirewallPolicyClient,
FirewallPolicyRuleGroupClient: &FirewallPolicyRuleGroupClient,
HubVirtualNetworkConnectionClient: &HubVirtualNetworkConnectionClient,
InterfacesClient: &InterfacesClient,
IPGroupsClient: &IpGroupsClient,
Expand Down
9 changes: 9 additions & 0 deletions azurerm/internal/services/network/firewall_policy_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"time"

"github.com/hashicorp/go-azure-helpers/response"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/locks"

"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/location"

Expand All @@ -23,6 +24,8 @@ import (
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)

const azureFirewallPolicyResourceName = "azurerm_firewall_policy"

func resourceArmFirewallPolicy() *schema.Resource {
return &schema.Resource{
Create: resourceArmFirewallPolicyCreateUpdate,
Expand Down Expand Up @@ -192,6 +195,9 @@ func resourceArmFirewallPolicyCreateUpdate(d *schema.ResourceData, meta interfac
props.FirewallPolicyPropertiesFormat.BasePolicy = &network.SubResource{ID: utils.String(id.(string))}
}

locks.ByName(name, azureFirewallPolicyResourceName)
defer locks.UnlockByName(name, azureFirewallPolicyResourceName)

if _, err := client.CreateOrUpdate(ctx, resourceGroup, name, props); err != nil {
return fmt.Errorf("creating Firewall Policy %q (Resource Group %q): %+v", name, resourceGroup, err)
}
Expand Down Expand Up @@ -276,6 +282,9 @@ func resourceArmFirewallPolicyDelete(d *schema.ResourceData, meta interface{}) e
return err
}

locks.ByName(id.Name, azureFirewallPolicyResourceName)
defer locks.UnlockByName(id.Name, azureFirewallPolicyResourceName)

future, err := client.Delete(ctx, id.ResourceGroup, id.Name)
if err != nil {
return fmt.Errorf("deleting Firewall Policy %q (Resource Group %q): %+v", id.Name, id.ResourceGroup, err)
Expand Down
Loading