Skip to content

Commit 5327f2f

Browse files
Merge pull request #594 from microsoft/hb-allow-loc
chore: update allowed regions and baseURL
2 parents 0185648 + c1a0f73 commit 5327f2f

File tree

2 files changed

+29
-7
lines changed

2 files changed

+29
-7
lines changed

infra/main.bicep

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ param solutionName string = 'kmgen'
2020
])
2121
param location string
2222

23+
@allowed([
24+
'australiaeast'
25+
'eastus'
26+
'eastus2'
27+
'francecentral'
28+
'japaneast'
29+
'swedencentral'
30+
'uksouth'
31+
'westus'
32+
'westus3'
33+
])
2334
@metadata({
2435
azd: {
2536
type: 'location'
@@ -157,7 +168,7 @@ var solutionSuffix = toLower(trim(replace(
157168
)))
158169

159170
var acrName = 'kmcontainerreg'
160-
var baseUrl = 'https://raw.githubusercontent.com/microsoft/Conversation-Knowledge-Mining-Solution-Accelerator/dev/'
171+
var baseUrl = 'https://raw.githubusercontent.com/microsoft/Conversation-Knowledge-Mining-Solution-Accelerator/main/'
161172
// @description('Optional. Key vault reference and secret settings for the module\'s secrets export.')
162173
// param secretsExportConfiguration secretsExportConfigurationType?
163174
// Replica regions list based on article in [Azure regions list](https://learn.microsoft.com/azure/reliability/regions-list) and [Enhance resilience by replicating your Log Analytics workspace across regions](https://learn.microsoft.com/azure/azure-monitor/logs/workspace-replication#supported-regions) for supported regions for Log Analytics Workspace.

infra/main.json

Lines changed: 17 additions & 6 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": "3826453715287152928"
9+
"templateHash": "18295975344394141399"
1010
}
1111
},
1212
"parameters": {
@@ -40,6 +40,17 @@
4040
},
4141
"aiServiceLocation": {
4242
"type": "string",
43+
"allowedValues": [
44+
"australiaeast",
45+
"eastus",
46+
"eastus2",
47+
"francecentral",
48+
"japaneast",
49+
"swedencentral",
50+
"uksouth",
51+
"westus",
52+
"westus3"
53+
],
4354
"metadata": {
4455
"azd": {
4556
"type": "location",
@@ -289,7 +300,7 @@
289300
"variables": {
290301
"solutionSuffix": "[toLower(trim(replace(replace(replace(replace(replace(replace(format('{0}{1}', parameters('solutionName'), parameters('solutionUniqueText')), '-', ''), '_', ''), '.', ''), '/', ''), ' ', ''), '*', '')))]",
291302
"acrName": "kmcontainerreg",
292-
"baseUrl": "https://raw.githubusercontent.com/microsoft/Conversation-Knowledge-Mining-Solution-Accelerator/dev/",
303+
"baseUrl": "https://raw.githubusercontent.com/microsoft/Conversation-Knowledge-Mining-Solution-Accelerator/main/",
293304
"replicaRegionPairs": {
294305
"australiaeast": "australiasoutheast",
295306
"centralus": "westus",
@@ -32820,9 +32831,9 @@
3282032831
}
3282132832
},
3282232833
"dependsOn": [
32823-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
32824-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
3282532834
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
32835+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
32836+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
3282632837
"logAnalyticsWorkspace",
3282732838
"network",
3282832839
"userAssignedIdentity"
@@ -35149,8 +35160,8 @@
3514935160
},
3515035161
"dependsOn": [
3515135162
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
35152-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
3515335163
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
35164+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
3515435165
"logAnalyticsWorkspace",
3515535166
"network",
3515635167
"userAssignedIdentity"
@@ -43515,8 +43526,8 @@
4351543526
},
4351643527
"dependsOn": [
4351743528
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
43518-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
4351943529
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageDfs)]",
43530+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
4352043531
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
4352143532
"network",
4352243533
"userAssignedIdentity"

0 commit comments

Comments
 (0)