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

Included Workload Profile, UDR and Azure Firewall into Terraform implementation #132

Merged
merged 14 commits into from
Feb 7, 2024
Merged

Included Workload Profile, UDR and Azure Firewall into Terraform implementation #132

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
031a4f5
fixed: securityRules = var.appGatewaySecurityRules.default
Jan 6, 2024
c3670ee
fixed: securityRules = var.appGatewaySecurityRules.default
Jan 6, 2024
15bb171
added Basic Firewall module and firewall policy
Jan 10, 2024
1d2f61f
added route table
Jan 10, 2024
fb1bf3e
added subnet delegation
Jan 12, 2024
3434644
minor fixes
Jan 13, 2024
b8bf26e
created firewall rules
Jan 13, 2024
627ca84
validated firewall rules
Jan 14, 2024
c53e665
formatting
Jan 14, 2024
7b24f08
resolved PR comments
HoussemDellai Feb 5, 2024
35f9f59
resolved PR comments
HoussemDellai Feb 6, 2024
5d8c69c
Merge branch 'Azure:main' into terraform-workload-profile-udr-fw
HoussemDellai Feb 6, 2024
d569b16
resolved PR comments
HoussemDellai Feb 7, 2024
c071c4f
Merge branch 'terraform-workload-profile-udr-fw' of https://github.co…
HoussemDellai Feb 7, 2024
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
194 changes: 95 additions & 99 deletions scenarios/aca-internal/bicep/modules/01-hub/modules/azureFirewall.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ param tags object = {}
@description('CIDR of the spoke infrastructure subnet.')
param spokeInfraSubnetAddressPrefix string

param azureFirewallSubnetManagementAddressPrefix string
param azureFirewallSubnetManagementAddressPrefix string

var applicationRuleCollections = [
{
Expand Down Expand Up @@ -68,9 +68,9 @@ var applicationRuleCollections = [
spokeInfraSubnetAddressPrefix
]
targetFqdns: [
'*.blob.${environment().suffixes.storage}'
'*.blob.${environment().suffixes.storage}'
'login.microsoft.com'
'*.azurecr.io' //NOTE: for less permisive environment replace wildcard with actual(s) Container Registries
'*.azurecr.io' //NOTE: for less permisive environment replace wildcard with actual(s) Container Registries
'hub.docker.com'
'registry-1.docker.io'
'production.cloudflare.docker.com'
Expand All @@ -89,9 +89,7 @@ var applicationRuleCollections = [
]
targetFqdns: [
'*.identity.azure.net'
#disable-next-line no-hardcoded-env-urls
'login.microsoftonline.com'
#disable-next-line no-hardcoded-env-urls
'*.login.microsoftonline.com'
'*.login.microsoft.com'
]
Expand All @@ -108,8 +106,8 @@ var applicationRuleCollections = [
spokeInfraSubnetAddressPrefix
]
targetFqdns: [
'*${environment().suffixes.keyvaultDns}' //NOTE: for less permisive environment replace wildcard with actual(s) KeyVault
#disable-next-line no-hardcoded-env-urls
'*${environment().suffixes.keyvaultDns}' //NOTE: for less permisive environment replace wildcard with actual(s) KeyVault
#disable-next-line no-hardcoded-env-urls
'login.microsoft.com'
]
}
Expand All @@ -123,9 +121,9 @@ var applicationRuleCollections = [
type: 'allow'
}
priority: 120
rules: [
rules: [
{
fqdnTags: [ ]
fqdnTags: []
targetFqdns: [
'dc.applicationinsights.azure.com'
'dc.applicationinsights.microsoft.com'
Expand All @@ -141,7 +139,7 @@ var applicationRuleCollections = [
'*.monitor.azure.com'
]
name: 'allow-azure-monitor'
protocols: [
protocols: [
{
port: '443'
protocolType: 'HTTPS'
Expand All @@ -161,19 +159,19 @@ var applicationRuleCollections = [
type: 'allow'
}
priority: 130
rules: [
{
rules: [
{
name: 'allow-developer-services'
fqdnTags: [ ]
fqdnTags: []
targetFqdns: [
'github.com'
'*.github.com'
'ghcr.io'
'*.ghcr.io'
'*.nuget.org'
'*.blob.${environment().suffixes.storage}' // might replace wildcard with specific FQDN
'*.blob.${environment().suffixes.storage}' // might replace wildcard with specific FQDN
'*.table.${environment().suffixes.storage}' // might replace wildcard with specific FQDN
'*.servicebus.windows.net' // might replace wildcard with specific FQDN
'*.servicebus.windows.net' // might replace wildcard with specific FQDN
'githubusercontent.com'
'*.githubusercontent.com'
'dev.azure.com'
Expand All @@ -183,7 +181,7 @@ var applicationRuleCollections = [
'appservice.azureedge.net'
'*.azurewebsites.net'
]
protocols: [
protocols: [
{
port: '443'
protocolType: 'HTTPS'
Expand All @@ -193,11 +191,11 @@ var applicationRuleCollections = [
spokeInfraSubnetAddressPrefix
]
}
{
{
name: 'allow-certificate-dependencies'
fqdnTags: [ ]
fqdnTags: []
targetFqdns: [
'*.delivery.mp.microsoft.com'
'*.delivery.mp.microsoft.com'
'ctldl.windowsupdate.com'
'ocsp.msocsp.com'
'oneocsp.microsoft.com'
Expand All @@ -208,11 +206,11 @@ var applicationRuleCollections = [
'*.symcb.com'
'*.d-trust.net'
]
protocols: [
protocols: [
{
port: '80'
protocolType: 'HTTP'
}
}
{
port: '443'
protocolType: 'HTTPS'
Expand All @@ -227,90 +225,89 @@ var applicationRuleCollections = [
}
]

var networkRules = [
{
name: 'ace-allow-rules'
properties: {
action: {
type: 'allow'
}
priority: 100
// For more Azure resources (than KeyVault, ACR etc which we use here) you are using with Azure Firewall,
// please refer to the service tags documentation: https://learn.microsoft.com/azure/virtual-network/service-tags-overview#available-service-tags
rules: [
{
name: 'ace-general-allow-rule'
protocols: [
'Any'
]
sourceAddresses: [
spokeInfraSubnetAddressPrefix
]
destinationAddresses: [
'MicrosoftContainerRegistry' //For even less permisive environment, you can point to a specific MCR region, i.e. 'MicrosoftContainerRegistry.Westeurope'
'AzureFrontDoor.FirstParty'
]
destinationPorts: [
'443'
]
}
{
name: 'ace-acr-allow-rule'
protocols: [
'Any'
]
sourceAddresses: [
spokeInfraSubnetAddressPrefix
]
destinationAddresses: [
'AzureContainerRegistry' //For even less permisive environment, you can point to a specific ACR region, i.e. 'MicrosoftContainerRegistry.Westeurope'
'AzureActiveDirectory'
]
destinationPorts: [
'443'
]
}
{
name: 'ace-keyvault-allow-rule'
protocols: [
'Any'
]
sourceAddresses: [
spokeInfraSubnetAddressPrefix
]
destinationAddresses: [
'AzureKeyVault' //For even less permisive environment, you can point to a specific keyvault region, i.e. 'MicrosoftContainerRegistry.Westeurope'
'AzureActiveDirectory'
]
destinationPorts: [
'443'
]
}
{
name: 'ace-managedIdentity-allow-rule'
protocols: [
'Any'
]
sourceAddresses: [
spokeInfraSubnetAddressPrefix
]
destinationAddresses: [
'AzureActiveDirectory'
]
destinationPorts: [
'443'
]
}
var networkRules = [
{
name: 'ace-allow-rules'
properties: {
action: {
type: 'allow'
}
priority: 100
// For more Azure resources (than KeyVault, ACR etc which we use here) you are using with Azure Firewall,
// please refer to the service tags documentation: https://learn.microsoft.com/azure/virtual-network/service-tags-overview#available-service-tags
rules: [
{
name: 'ace-general-allow-rule'
protocols: [
'Any'
]
sourceAddresses: [
spokeInfraSubnetAddressPrefix
]
destinationAddresses: [
'MicrosoftContainerRegistry' //For even less permisive environment, you can point to a specific MCR region, i.e. 'MicrosoftContainerRegistry.Westeurope'
'AzureFrontDoor.FirstParty'
]
destinationPorts: [
'443'
]
}
}
]
{
name: 'ace-acr-allow-rule'
protocols: [
'Any'
]
sourceAddresses: [
spokeInfraSubnetAddressPrefix
]
destinationAddresses: [
'AzureContainerRegistry' //For even less permisive environment, you can point to a specific ACR region, i.e. 'MicrosoftContainerRegistry.Westeurope'
'AzureActiveDirectory'
]
destinationPorts: [
'443'
]
}
{
name: 'ace-keyvault-allow-rule'
protocols: [
'Any'
]
sourceAddresses: [
spokeInfraSubnetAddressPrefix
]
destinationAddresses: [
'AzureKeyVault' //For even less permisive environment, you can point to a specific keyvault region, i.e. 'MicrosoftContainerRegistry.Westeurope'
'AzureActiveDirectory'
]
destinationPorts: [
'443'
]
}
{
name: 'ace-managedIdentity-allow-rule'
protocols: [
'Any'
]
sourceAddresses: [
spokeInfraSubnetAddressPrefix
]
destinationAddresses: [
'AzureActiveDirectory'
]
destinationPorts: [
'443'
]
}
]
}
}
]

resource hubVnet 'Microsoft.Network/virtualNetworks@2022-11-01' existing = {
name: afwVNetName
}


resource fwManagementSubnet 'Microsoft.Network/virtualNetworks/subnets@2020-11-01' = {
parent: hubVnet
name: 'AzureFirewallManagementSubnet'
Expand Down Expand Up @@ -340,6 +337,5 @@ module afw '../../../../../shared/bicep/azureFirewalls/main.bicep' = {
}
}


output afwPrivateIp string = afw.outputs.privateIp
output afwId string = afw.outputs.resourceId
48 changes: 26 additions & 22 deletions scenarios/aca-internal/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
module "hub" {
source = "./modules/01-hub"
workloadName = var.workloadName
environment = var.environment
hubResourceGroupName = var.hubResourceGroupName
location = var.location
vnetAddressPrefixes = var.hubVnetAddressPrefixes
enableBastion = var.enableBastion
bastionSubnetAddressPrefixes = var.bastionSubnetAddressPrefixes
gatewaySubnetAddressPrefix = var.gatewaySubnetAddressPrefix
azureFirewallSubnetAddressPrefix = var.azureFirewallSubnetAddressPrefix
tags = var.tags
source = "./modules/01-hub"
workloadName = var.workloadName
environment = var.environment
hubResourceGroupName = var.hubResourceGroupName
location = var.location
vnetAddressPrefixes = var.hubVnetAddressPrefixes
enableBastion = var.enableBastion
bastionSubnetAddressPrefixes = var.bastionSubnetAddressPrefixes
gatewaySubnetAddressPrefix = var.gatewaySubnetAddressPrefix
azureFirewallSubnetAddressPrefix = var.azureFirewallSubnetAddressPrefix
azureFirewallSubnetManagementAddressPrefix = var.azureFirewallSubnetManagementAddressPrefix
infraSubnetAddressPrefix = var.infraSubnetAddressPrefix
tags = var.tags
}

module "spoke" {
Expand All @@ -30,6 +32,7 @@ module "spoke" {
vmLinuxSshAuthorizedKeys = var.vmLinuxSshAuthorizedKeys
vmJumpboxOSType = var.vmJumpboxOSType
jumpboxSubnetAddressPrefix = var.vmJumpBoxSubnetAddressPrefix
firewallPrivateIp = module.hub.firewallPrivateIp
tags = var.tags
}

Expand All @@ -48,6 +51,8 @@ module "supportingServices" {
keyVaultPullRoleAssignment = var.keyVaultPullRoleAssignment
clientIP = var.clientIP
logAnalyticsWorkspaceId = module.spoke.logAnalyticsWorkspaceId
supportingResourceGroupName = var.supportingResourceGroupName

vnetLinks = [
{
"name" = module.spoke.spokeVNetName
Expand All @@ -65,16 +70,16 @@ module "supportingServices" {
}

module "containerAppsEnvironment" {
source = "./modules/04-container-apps-environment"
workloadName = var.workloadName
environment = var.environment
location = var.location
spokeResourceGroupName = module.spoke.spokeResourceGroupName
hubResourceGroupName = module.hub.hubResourceGroupName
appInsightsName = var.appInsightsName
hubVnetId = module.hub.hubVnetId
spokeVnetId = module.spoke.spokeVNetId
spokeInfraSubnetId = module.spoke.spokeInfraSubnetId
source = "./modules/04-container-apps-environment"
workloadName = var.workloadName
environment = var.environment
location = var.location
spokeResourceGroupName = module.spoke.spokeResourceGroupName
hubResourceGroupName = module.hub.hubResourceGroupName
appInsightsName = var.appInsightsName
hubVnetId = module.hub.hubVnetId
spokeVnetId = module.spoke.spokeVNetId
spokeInfraSubnetId = module.spoke.spokeInfraSubnetId
logAnalyticsWorkspaceId = module.spoke.logAnalyticsWorkspaceId
vnetLinks = [
{
Expand Down Expand Up @@ -103,7 +108,6 @@ module "helloWorldApp" {
tags = var.tags
}


# If you would like to deploy an Application Gateway and have provided your IP address for KeyVault access, leave this module uncommented
# If you would like to keep your KeyVault private, comment out this module
module "applicationGateway" {
Expand Down
Loading
Loading