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.

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

fix: Added fixed uksouth and ukwest locations for avm.res.network.trafficmanagerprofile #3354

Merged
merged 29 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f81637b
Add service-fabric cluster worklfow
lsnoddy Mar 12, 2024
a916a14
Edit workflow name
lsnoddy Mar 12, 2024
5befa86
Fixed workflow paths
lsnoddy Mar 12, 2024
0c06b49
Merge branch 'anchor' of https://github.com/lsnoddy/bicep-registry-mo…
lsnoddy Mar 22, 2024
f8636f2
Merge branch 'main' of https://github.com/lsnoddy/bicep-registry-modules
lsnoddy May 15, 2024
a4beb52
Merge branch 'Azure:main' into main
lsnoddy Jun 13, 2024
f39a978
Merge branch 'Azure:main' into main
lsnoddy Jun 17, 2024
2ea25f9
Merge branch 'Azure:main' into main
lsnoddy Sep 13, 2024
14cd4d5
Use enforcedLocation due to quota limitation in westEurope
lsnoddy Sep 13, 2024
e024230
Change enforcedLocation
lsnoddy Sep 13, 2024
d4283f4
test eastus location
lsnoddy Sep 13, 2024
4f9364e
Update readme and json files
lsnoddy Sep 13, 2024
ada367d
test
lsnoddy Sep 13, 2024
59f9125
test
lsnoddy Sep 13, 2024
8044ed7
Enforce westus3 location due to capacity limitation
lsnoddy Sep 23, 2024
58eddea
test
lsnoddy Sep 23, 2024
ce4752e
test new location due to capacity limit
lsnoddy Sep 23, 2024
523cfc4
Update locations due to capacity limitation
lsnoddy Sep 23, 2024
431720d
Remove default location overwrite
lsnoddy Sep 23, 2024
b87c888
test
lsnoddy Sep 23, 2024
e3cf62d
test
lsnoddy Sep 23, 2024
1af6c53
test
lsnoddy Sep 23, 2024
257f388
Updated dependency locations due to capacity limitations
lsnoddy Sep 24, 2024
35e5b56
test
lsnoddy Sep 24, 2024
53bf8e1
Update readme
lsnoddy Sep 24, 2024
088d778
Add enforcedLocation uksouth and ukwest due to App Service plan capac…
lsnoddy Sep 24, 2024
4361e59
Rebuild main.json with latest bicep cli version
lsnoddy Sep 26, 2024
abb3582
Remove resourceLocation param and used primary enforcedLocation
lsnoddy Sep 26, 2024
8dc3764
Remove webappLocation outputs and use variable values instead
lsnoddy Sep 26, 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
8 changes: 4 additions & 4 deletions avm/res/network/trafficmanagerprofile/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ module trafficmanagerprofile 'br/public:avm/res/network/trafficmanagerprofile:<v
{
name: 'webApp01Endpoint'
properties: {
endpointLocation: 'eastus'
endpointLocation: '<endpointLocation>'
endpointStatus: 'Enabled'
priority: 1
targetResourceId: '<targetResourceId>'
Expand All @@ -268,7 +268,7 @@ module trafficmanagerprofile 'br/public:avm/res/network/trafficmanagerprofile:<v
{
name: 'webApp02Endpoint'
properties: {
endpointLocation: 'westus'
endpointLocation: '<endpointLocation>'
endpointStatus: 'Enabled'
priority: 2
targetResourceId: '<targetResourceId>'
Expand Down Expand Up @@ -334,7 +334,7 @@ module trafficmanagerprofile 'br/public:avm/res/network/trafficmanagerprofile:<v
{
"name": "webApp01Endpoint",
"properties": {
"endpointLocation": "eastus",
"endpointLocation": "<endpointLocation>",
"endpointStatus": "Enabled",
"priority": 1,
"targetResourceId": "<targetResourceId>",
Expand All @@ -345,7 +345,7 @@ module trafficmanagerprofile 'br/public:avm/res/network/trafficmanagerprofile:<v
{
"name": "webApp02Endpoint",
"properties": {
"endpointLocation": "westus",
"endpointLocation": "<endpointLocation>",
"endpointStatus": "Enabled",
"priority": 2,
"targetResourceId": "<targetResourceId>",
Expand Down
4 changes: 2 additions & 2 deletions avm/res/network/trafficmanagerprofile/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.29.47.4906",
"templateHash": "2090813965996228671"
"version": "0.28.1.47646",
eriqua marked this conversation as resolved.
Show resolved Hide resolved
"templateHash": "9403273795949037926"
},
"name": "Traffic Manager Profiles",
"description": "This module deploys a Traffic Manager Profile.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,9 @@ output webApp01ResourceId string = webApp01.id

@description('The resource ID of the second created Web Application')
output webApp02ResourceId string = webApp02.id

@description('The location of the first created Web Application')
output webApp01Location string = webApp01.location

@description('The location of the second created Web Application')
output webApp02Location string = webApp02.location
eriqua marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ param resourceGroupName string = 'dep-${namePrefix}-network.trafficmanagerprofil
@description('Optional. The location to deploy resources to.')
param resourceLocation string = deployment().location
eriqua marked this conversation as resolved.
Show resolved Hide resolved

#disable-next-line no-hardcoded-location
var enforcedLocation01 = 'uksouth'

#disable-next-line no-hardcoded-location
var enforcedLocation02 = 'ukwest'

@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
param serviceShort string = 'ntmpwaf'

Expand Down Expand Up @@ -41,8 +47,8 @@ module nestedDependencies 'dependencies.bicep' = {
serverFarmName02: 'dep-${namePrefix}-sf-${serviceShort}02'
webApp01Name: 'dep-${namePrefix}-wa-${serviceShort}01'
webApp02Name: 'dep-${namePrefix}-wa-${serviceShort}02'
location01: 'eastus'
location02: 'westus'
location01: enforcedLocation01
location02: enforcedLocation02
}
}

Expand Down Expand Up @@ -107,7 +113,7 @@ module testDeployment '../../../main.bicep' = [
targetResourceId: nestedDependencies.outputs.webApp01ResourceId
weight: 1
priority: 1
endpointLocation: 'eastus'
endpointLocation: nestedDependencies.outputs.webApp01Location
eriqua marked this conversation as resolved.
Show resolved Hide resolved
endpointStatus: 'Enabled'
}
}
Expand All @@ -118,7 +124,7 @@ module testDeployment '../../../main.bicep' = [
targetResourceId: nestedDependencies.outputs.webApp02ResourceId
weight: 1
priority: 2
endpointLocation: 'westus'
endpointLocation: nestedDependencies.outputs.webApp02Location
eriqua marked this conversation as resolved.
Show resolved Hide resolved
endpointStatus: 'Enabled'
}
}
Expand Down