Skip to content

Commit 0c018ec

Browse files
Merge pull request #561 from microsoft/hb-allow-loc
chore: Update allowed Azure regions for solution location parameter
2 parents 07c7410 + f2c99ed commit 0c018ec

File tree

2 files changed

+29
-6
lines changed

2 files changed

+29
-6
lines changed

infra/main.bicep

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,19 @@ param solutionName string = 'docgen'
1414
@description('Optional. A unique text value for the solution. This is used to ensure resource names are unique for global resources. Defaults to a 5-character substring of the unique string generated from the subscription ID, resource group name, and solution name.')
1515
param solutionUniqueText string = substring(uniqueString(subscription().id, resourceGroup().name, solutionName), 0, 5)
1616

17-
@description('Optional. Azure location for the solution. If not provided, it defaults to the resource group location.')
18-
param location string = ''
17+
@allowed([
18+
'australiaeast'
19+
'centralus'
20+
'eastasia'
21+
'eastus2'
22+
'japaneast'
23+
'northeurope'
24+
'southeastasia'
25+
'uksouth'
26+
])
27+
@metadata({ azd: { type: 'location' } })
28+
@description('Required. Azure region for all services. Regions are restricted to guarantee compatibility with paired regions and replica locations for data redundancy and failover scenarios based on articles [Azure regions list](https://learn.microsoft.com/azure/reliability/regions-list) and [Azure Database for MySQL Flexible Server - Azure Regions](https://learn.microsoft.com/azure/mysql/flexible-server/overview#azure-regions).')
29+
param location string
1930

2031
@minLength(3)
2132
@description('Optional. Secondary location for databases creation(example:uksouth):')

infra/main.json

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.37.4.10188",
9-
"templateHash": "3241607047247621550"
9+
"templateHash": "9319012093725806760"
1010
},
1111
"name": "Document Generation Solution Accelerator",
1212
"description": "CSA CTO Gold Standard Solution Accelerator for Document Generation.\n"
@@ -31,9 +31,21 @@
3131
},
3232
"location": {
3333
"type": "string",
34-
"defaultValue": "",
34+
"allowedValues": [
35+
"australiaeast",
36+
"centralus",
37+
"eastasia",
38+
"eastus2",
39+
"japaneast",
40+
"northeurope",
41+
"southeastasia",
42+
"uksouth"
43+
],
3544
"metadata": {
36-
"description": "Optional. Azure location for the solution. If not provided, it defaults to the resource group location."
45+
"azd": {
46+
"type": "location"
47+
},
48+
"description": "Required. Azure region for all services. Regions are restricted to guarantee compatibility with paired regions and replica locations for data redundancy and failover scenarios based on articles [Azure regions list](https://learn.microsoft.com/azure/reliability/regions-list) and [Azure Database for MySQL Flexible Server - Azure Regions](https://learn.microsoft.com/azure/mysql/flexible-server/overview#azure-regions)."
3749
}
3850
},
3951
"secondaryLocation": {
@@ -26670,9 +26682,9 @@
2667026682
}
2667126683
},
2667226684
"dependsOn": [
26673-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
2667426685
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
2667526686
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
26687+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
2667626688
"logAnalyticsWorkspace",
2667726689
"network",
2667826690
"userAssignedIdentity"

0 commit comments

Comments
 (0)