Skip to content

[Modules] Azure Firewall cross referencing PIP #1549

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

Merged
eriqua merged 3 commits into from
Jun 17, 2022
Merged

[Modules] Azure Firewall cross referencing PIP #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d13dc17
test cross referencing pip
eriqua Jun 17, 2022
f040b68
remove nested files
eriqua Jun 17, 2022
a943c68
cleanup and format doc
eriqua Jun 17, 2022
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
161 changes: 0 additions & 161 deletions arm/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress.bicep
View file
Open in desktop

This file was deleted.

61 changes: 0 additions & 61 deletions arm/Microsoft.Network/azureFirewalls/.bicep/nested_publicIPAddress_rbac.bicep
View file
Open in desktop

This file was deleted.

15 changes: 8 additions & 7 deletions arm/Microsoft.Network/azureFirewalls/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ var additionalPublicIpConfigurations_var = [for ipConfiguration in additionalPub
// 1. Use existing public ip
// 2. Use new public ip created in this module
// 3. Do not use a public ip if isCreateDefaultPublicIP is false

var subnet_var = {
subnet: {
id: '${vNetId}/subnets/AzureFirewallSubnet' // The subnet name must be AzureFirewallSubnet
Expand All @@ -148,12 +149,12 @@ var newPip = {
}

var ipConfigurations = concat([
{
name: 'IpConfAzureFirewallSubnet'
//Use existing public ip, new public ip created in this module, or none if isCreateDefaultPublicIP is false
properties: union(subnet_var, !empty(azureFirewallSubnetPublicIpId) ? existingPip : {}, (isCreateDefaultPublicIP ? newPip : {}))
}
], additionalPublicIpConfigurations_var)
{
name: 'IpConfAzureFirewallSubnet'
//Use existing public ip, new public ip created in this module, or none if isCreateDefaultPublicIP is false
properties: union(subnet_var, !empty(azureFirewallSubnetPublicIpId) ? existingPip : {}, (isCreateDefaultPublicIP ? newPip : {}))
}
], additionalPublicIpConfigurations_var)

// ----------------------------------------------------------------------------

Expand Down Expand Up @@ -189,7 +190,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
}

// create a public ip address if one is not provided and the flag is true
module publicIPAddress '.bicep/nested_publicIPAddress.bicep' = if (empty(azureFirewallSubnetPublicIpId) && isCreateDefaultPublicIP) {
module publicIPAddress '../../Microsoft.Network/publicIPAddresses/deploy.bicep' = if (empty(azureFirewallSubnetPublicIpId) && isCreateDefaultPublicIP) {
name: '${uniqueString(deployment().name, location)}-Firewall-PIP'
params: {
name: contains(publicIPAddressObject, 'name') ? (!(empty(publicIPAddressObject.name)) ? publicIPAddressObject.name : '${name}-pip') : '${name}-pip'
Expand Down