Skip to content

Fixing Availability Zones Bug & Synapse PL Hub Bug #276

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
Marvin Buss (marvinbuss) merged 4 commits into from
Jan 24, 2022
Merged

Fixing Availability Zones Bug & Synapse PL Hub Bug #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f14f7cf
Fixing Availability Zones Bug
marvinbuss Jan 20, 2022
18f9b61
updated arm
marvinbuss Jan 20, 2022
ed359e3
fixed region issue for synapse pl hub
marvinbuss Jan 20, 2022
cdc0c3f
updated arm
marvinbuss Jan 20, 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
75 changes: 64 additions & 11 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "2556241326646259361"
"templateHash": "12904071157118301552"
}
},
"parameters": {
Expand Down Expand Up @@ -288,7 +288,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "6889799885640347788"
"templateHash": "7004950783398778434"
}
},
"parameters": {
Expand Down Expand Up @@ -393,6 +393,30 @@
"westus2",
"westus3"
],
"availabilityZoneRegions": [
"australiaeast",
"brazilsouth",
"canadacentral",
"centralus",
"centralindia",
"eastasia",
"eastus",
"eastus2",
"francecentral",
"germanywestcentral",
"japaneast",
"koreacentral",
"northeurope",
"norwayeast",
"uksouth",
"southeastasia",
"southcentralus",
"swedencentral",
"usgovvirginia",
"westeurope",
"westus2",
"westus3"
],
"firewallPolicyPremiumProperties": {
"intrusionDetection": {
"mode": "Deny",
Expand Down Expand Up @@ -567,11 +591,7 @@
"name": "[format('{0}-firewall', parameters('prefix'))]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
"zones": [
"1",
"2",
"3"
],
"zones": "[if(contains(variables('availabilityZoneRegions'), parameters('location')), createArray('1', '2', '3'), createArray())]",
"properties": {
"sku": {
"name": "AZFW_VNet",
Expand Down Expand Up @@ -3171,7 +3191,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "16711233143432259596"
"templateHash": "14201920356500171973"
}
},
"parameters": {
Expand Down Expand Up @@ -3242,7 +3262,7 @@
"_generator": {
"name": "bicep",
"version": "0.4.1124.51302",
"templateHash": "6413563287087229385"
"templateHash": "16240531194403531210"
}
},
"parameters": {
Expand All @@ -3264,14 +3284,47 @@
},
"variables": {
"synapsePrivatelinkHubNameCleaned": "[replace(parameters('synapsePrivatelinkHubName'), '-', '')]",
"synapsePrivatelinkHubPrivateEndpointName": "[format('{0}-private-endpoint', variables('synapsePrivatelinkHubNameCleaned'))]"
"synapsePrivatelinkHubPrivateEndpointName": "[format('{0}-private-endpoint', variables('synapsePrivatelinkHubNameCleaned'))]",
"synapsePrivatelinkHubRegions": [
"westus2",
"eastus",
"northeurope",
"westeurope",
"southeastasia",
"australiaeast",
"westcentralus",
"southcentralus",
"eastus2",
"uksouth",
"westus",
"australiasoutheast",
"eastasia",
"brazilsouth",
"centralus",
"centralindia",
"japaneast",
"northcentralus",
"canadacentral",
"canadaeast",
"koreacentral",
"southafricanorth",
"ukwest",
"japanwest",
"francecentral",
"switzerlandnorth",
"germanywestcentral",
"norwayeast",
"uaenorth",
"westus3",
"jioindiawest"
]
},
"resources": [
{
"type": "Microsoft.Synapse/privateLinkHubs",
"apiVersion": "2021-03-01",
"name": "[variables('synapsePrivatelinkHubNameCleaned')]",
"location": "[parameters('location')]",
"location": "[if(contains(variables('synapsePrivatelinkHubRegions'), parameters('location')), parameters('location'), 'northeurope')]",
"tags": "[parameters('tags')]",
"properties": {}
},
Expand Down
28 changes: 26 additions & 2 deletions infra/modules/network.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,30 @@ var firewallPremiumRegions = [
'westus2'
'westus3'
]
var availabilityZoneRegions = [
'australiaeast'
'brazilsouth'
'canadacentral'
'centralus'
'centralindia'
'eastasia'
'eastus'
'eastus2'
'francecentral'
'germanywestcentral'
'japaneast'
'koreacentral'
'northeurope'
'norwayeast'
'uksouth'
'southeastasia'
'southcentralus'
'swedencentral'
'usgovvirginia'
'westeurope'
'westus2'
'westus3'
]

// Firewall Policy Variables
var firewallPolicyPremiumProperties = {
Expand Down Expand Up @@ -264,11 +288,11 @@ resource firewall 'Microsoft.Network/azureFirewalls@2020-11-01' = if(enableDnsAn
]
location: location
tags: tags
zones: [
zones: contains(availabilityZoneRegions, location) ? [
'1'
'2'
'3'
]
] : []
properties: {
sku: {
name: 'AZFW_VNet'
Expand Down
35 changes: 34 additions & 1 deletion infra/modules/services/synapseprivatelinkhub.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,44 @@ param privateDnsZoneIdSynapseprivatelinkhub string
// Variables
var synapsePrivatelinkHubNameCleaned = replace(synapsePrivatelinkHubName, '-', '')
var synapsePrivatelinkHubPrivateEndpointName = '${synapsePrivatelinkHub.name}-private-endpoint'
var synapsePrivatelinkHubRegions = [
'westus2'
'eastus'
'northeurope'
'westeurope'
'southeastasia'
'australiaeast'
'westcentralus'
'southcentralus'
'eastus2'
'uksouth'
'westus'
'australiasoutheast'
'eastasia'
'brazilsouth'
'centralus'
'centralindia'
'japaneast'
'northcentralus'
'canadacentral'
'canadaeast'
'koreacentral'
'southafricanorth'
'ukwest'
'japanwest'
'francecentral'
'switzerlandnorth'
'germanywestcentral'
'norwayeast'
'uaenorth'
'westus3'
'jioindiawest'
]

// Resources
resource synapsePrivatelinkHub 'Microsoft.Synapse/privateLinkHubs@2021-03-01' = {
name: synapsePrivatelinkHubNameCleaned
location: location
location: contains(synapsePrivatelinkHubRegions, location) ? location : 'northeurope'
tags: tags
properties: {}
}
Expand Down