Skip to content

Commit

Permalink
Merge branch 'Azure:main' into ci-child-module-version-check
Browse files Browse the repository at this point in the history
  • Loading branch information
ReneHezser authored Dec 18, 2024
2 parents 16d43a8 + ec4aabf commit ea1c465
Show file tree
Hide file tree
Showing 21 changed files with 569 additions and 125 deletions.
10 changes: 10 additions & 0 deletions avm/ptn/network/private-link-private-dns-zones/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ var azureRegionGeoCodeShortNameAsKey = {
chilecentral: 'clc'
westus: 'wus'
swedensouth: 'sds'
usgovvirginia: 'ugv'
usgovtexas: 'ugt'
usgovarizona: 'uga'
usdodeast: 'ude'
usdodcentral: 'udc'
}

var azureRegionShortNameDisplayNameAsKey = {
Expand Down Expand Up @@ -243,6 +248,11 @@ var azureRegionShortNameDisplayNameAsKey = {
'west us 3': 'westus3'
'taiwan north': 'taiwannorth'
'sweden central': 'swedencentral'
'usgov virginia': 'usgovvirginia'
'usgov texas': 'usgovtexas'
'usgov arizona': 'usgovarizona'
'usdod east': 'usdodeast'
'usdod central': 'usdodcentral'
}

var locationLowered = toLower(location)
Expand Down
18 changes: 14 additions & 4 deletions avm/ptn/network/private-link-private-dns-zones/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.30.23.60470",
"templateHash": "6071389975562170906"
"version": "0.32.4.45862",
"templateHash": "92251714130346832"
},
"name": "avm/ptn/network/private-link-private-dns-zones",
"description": "Private Link Private DNS Zones",
Expand Down Expand Up @@ -234,7 +234,12 @@
"eastasia": "ea",
"chilecentral": "clc",
"westus": "wus",
"swedensouth": "sds"
"swedensouth": "sds",
"usgovvirginia": "ugv",
"usgovtexas": "ugt",
"usgovarizona": "uga",
"usdodeast": "ude",
"usdodcentral": "udc"
},
"azureRegionShortNameDisplayNameAsKey": {
"australia southeast": "australiasoutheast",
Expand Down Expand Up @@ -293,7 +298,12 @@
"south africa west": "southafricawest",
"west us 3": "westus3",
"taiwan north": "taiwannorth",
"sweden central": "swedencentral"
"sweden central": "swedencentral",
"usgov virginia": "usgovvirginia",
"usgov texas": "usgovtexas",
"usgov arizona": "usgovarizona",
"usdod east": "usdodeast",
"usdod central": "usdodcentral"
},
"locationLowered": "[toLower(parameters('location'))]",
"locationLoweredAndSpacesRemoved": "[if(contains(variables('locationLowered'), ' '), variables('azureRegionShortNameDisplayNameAsKey')[variables('locationLowered')], variables('locationLowered'))]",
Expand Down
4 changes: 2 additions & 2 deletions avm/ptn/network/private-link-private-dns-zones/version.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://aka.ms/bicep-registry-module-version-file-schema#",
"version": "0.2",
"version": "0.3",
"pathFilters": [
"./main.json"
]
}
}
Loading

0 comments on commit ea1c465

Please sign in to comment.