Skip to content

Commit 8534777

Browse files
aniaroramsftaniaroramsft
authored
Merge pull request #219 from microsoft/bicep/arm-update
fix: arm template changes for unique id
2 parents 19a73f0 + 36207ac commit 8534777

File tree

4 files changed

+36
-92
lines changed

4 files changed

+36
-92
lines changed

‎infra/deploy_azure_function_rag.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ param sqlDbName string
1818
param sqlDbUser string
1919
@secure()
2020
param sqlDbPwd string
21-
param managedIdentityObjectId string
21+
// param managedIdentityObjectId string
2222
param imageTag string
2323
var functionAppName = '${solutionName}-rag-fn'
2424
var storageaccountname = '${solutionName}ragfnacc'

‎infra/deploy_storage_account.bicep‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ resource storageAccounts_default_data 'Microsoft.Storage/storageAccounts/blobSer
7474
denyEncryptionScopeOverride: false
7575
publicAccess: 'None'
7676
}
77-
dependsOn: [
78-
storageAccounts_resource
79-
]
8077
}
8178

8279
// resource storageAccounts_default_input 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = {

‎infra/main.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ module azureragFunctionsRag 'deploy_azure_function_rag.bicep' = {
216216
sqlDbUser:sqlDBModule.outputs.sqlDbUser
217217
sqlDbPwd:keyVault.getSecret('SQLDB-PASSWORD')
218218
aiProjectName:aifoundry.outputs.aiProjectName
219-
managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
219+
// managedIdentityObjectId:managedIdentityModule.outputs.managedIdentityOutput.objectId
220220
}
221221
dependsOn:[keyVault]
222222
}

‎infra/main.json‎

Lines changed: 34 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"metadata": {
55
"_generator": {
66
"name": "bicep",
7-
"version": "0.33.93.31351",
8-
"templateHash": "9583552693408867324"
7+
"version": "0.28.1.47646",
8+
"templateHash": "12766041167398442432"
99
}
1010
},
1111
"parameters": {
@@ -97,10 +97,10 @@
9797
}
9898
},
9999
"variables": {
100-
"solutionPrefix": "[parameters('environmentName')]",
101100
"gptModelVersion": "2024-02-15-preview",
101+
"uniqueId": "[toLower(uniqueString(subscription().id, parameters('environmentName'), resourceGroup().location))]",
102+
"solutionPrefix": "[format('km{0}', padLeft(take(variables('uniqueId'), 12), 12, '0'))]",
102103
"resourceGroupLocation": "[resourceGroup().location]",
103-
"resourceGroupName": "[resourceGroup().name]",
104104
"solutionLocation": "[variables('resourceGroupLocation')]",
105105
"baseUrl": "https://raw.githubusercontent.com/microsoft/Conversation-Knowledge-Mining-Solution-Accelerator/main/"
106106
},
@@ -129,8 +129,8 @@
129129
"metadata": {
130130
"_generator": {
131131
"name": "bicep",
132-
"version": "0.33.93.31351",
133-
"templateHash": "4123789684929590981"
132+
"version": "0.28.1.47646",
133+
"templateHash": "14133192615685065374"
134134
}
135135
},
136136
"parameters": {
@@ -221,8 +221,8 @@
221221
"metadata": {
222222
"_generator": {
223223
"name": "bicep",
224-
"version": "0.33.93.31351",
225-
"templateHash": "4388214478635448075"
224+
"version": "0.28.1.47646",
225+
"templateHash": "9096960510978747660"
226226
}
227227
},
228228
"parameters": {
@@ -365,8 +365,8 @@
365365
"metadata": {
366366
"_generator": {
367367
"name": "bicep",
368-
"version": "0.33.93.31351",
369-
"templateHash": "18123322246729358641"
368+
"version": "0.28.1.47646",
369+
"templateHash": "17067117464506504820"
370370
}
371371
},
372372
"parameters": {
@@ -1057,8 +1057,8 @@
10571057
"metadata": {
10581058
"_generator": {
10591059
"name": "bicep",
1060-
"version": "0.33.93.31351",
1061-
"templateHash": "1505719283486163574"
1060+
"version": "0.28.1.47646",
1061+
"templateHash": "17222683008908251854"
10621062
}
10631063
},
10641064
"parameters": {
@@ -1078,7 +1078,7 @@
10781078
},
10791079
"saName": {
10801080
"type": "string",
1081-
"defaultValue": "[format('{0}storageaccount', parameters('solutionName'))]",
1081+
"defaultValue": "[format('{0}storage', parameters('solutionName'))]",
10821082
"metadata": {
10831083
"description": "Name"
10841084
}
@@ -1155,8 +1155,7 @@
11551155
"publicAccess": "None"
11561156
},
11571157
"dependsOn": [
1158-
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('saName'), 'default')]",
1159-
"[resourceId('Microsoft.Storage/storageAccounts', parameters('saName'))]"
1158+
"[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('saName'), 'default')]"
11601159
]
11611160
},
11621161
{
@@ -1241,8 +1240,8 @@
12411240
"metadata": {
12421241
"_generator": {
12431242
"name": "bicep",
1244-
"version": "0.33.93.31351",
1245-
"templateHash": "3100365088410602500"
1243+
"version": "0.28.1.47646",
1244+
"templateHash": "6528561682505001396"
12461245
}
12471246
},
12481247
"parameters": {
@@ -1289,7 +1288,7 @@
12891288
"resources": [
12901289
{
12911290
"copy": {
1292-
"name": "database::list",
1291+
"name": "list",
12931292
"count": "[length(variables('containers'))]"
12941293
},
12951294
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
@@ -1447,8 +1446,8 @@
14471446
"metadata": {
14481447
"_generator": {
14491448
"name": "bicep",
1450-
"version": "0.33.93.31351",
1451-
"templateHash": "6170430466600233564"
1449+
"version": "0.28.1.47646",
1450+
"templateHash": "6997300029110879816"
14521451
}
14531452
},
14541453
"parameters": {
@@ -1621,8 +1620,8 @@
16211620
"metadata": {
16221621
"_generator": {
16231622
"name": "bicep",
1624-
"version": "0.33.93.31351",
1625-
"templateHash": "509460209037223451"
1623+
"version": "0.28.1.47646",
1624+
"templateHash": "1311463012511991186"
16261625
}
16271626
},
16281627
"parameters": {
@@ -1704,8 +1703,8 @@
17041703
"metadata": {
17051704
"_generator": {
17061705
"name": "bicep",
1707-
"version": "0.33.93.31351",
1708-
"templateHash": "16955379019952955448"
1706+
"version": "0.28.1.47646",
1707+
"templateHash": "3736288497878109757"
17091708
}
17101709
},
17111710
"parameters": {
@@ -1792,9 +1791,6 @@
17921791
},
17931792
"secretName": "SQLDB-PASSWORD"
17941793
}
1795-
},
1796-
"managedIdentityObjectId": {
1797-
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.objectId]"
17981794
}
17991795
},
18001796
"template": {
@@ -1803,8 +1799,8 @@
18031799
"metadata": {
18041800
"_generator": {
18051801
"name": "bicep",
1806-
"version": "0.33.93.31351",
1807-
"templateHash": "8291781429768450130"
1802+
"version": "0.28.1.47646",
1803+
"templateHash": "3075889647785880770"
18081804
}
18091805
},
18101806
"parameters": {
@@ -1829,16 +1825,13 @@
18291825
"sqlDbPwd": {
18301826
"type": "securestring"
18311827
},
1832-
"managedIdentityObjectId": {
1833-
"type": "string"
1834-
},
18351828
"imageTag": {
18361829
"type": "string"
18371830
}
18381831
},
18391832
"variables": {
18401833
"functionAppName": "[format('{0}-charts-fn', parameters('solutionName'))]",
1841-
"storageaccountname": "[format('{0}chartsfnacc', parameters('solutionName'))]",
1834+
"storageaccountname": "[format('{0}chartfnacc', parameters('solutionName'))]",
18421835
"dockerImage": "[format('DOCKER|kmcontainerreg.azurecr.io/km-charts-function:{0}', parameters('imageTag'))]",
18431836
"environmentName": "[format('{0}-charts-fn-env', parameters('solutionName'))]"
18441837
},
@@ -1953,7 +1946,6 @@
19531946
},
19541947
"dependsOn": [
19551948
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry')]",
1956-
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]",
19571949
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_sql_db')]"
19581950
]
19591951
},
@@ -2034,9 +2026,6 @@
20342026
},
20352027
"aiProjectName": {
20362028
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiProjectName.value]"
2037-
},
2038-
"managedIdentityObjectId": {
2039-
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.objectId]"
20402029
}
20412030
},
20422031
"template": {
@@ -2045,8 +2034,8 @@
20452034
"metadata": {
20462035
"_generator": {
20472036
"name": "bicep",
2048-
"version": "0.33.93.31351",
2049-
"templateHash": "10412104505605413963"
2037+
"version": "0.28.1.47646",
2038+
"templateHash": "7978725857339866942"
20502039
}
20512040
},
20522041
"parameters": {
@@ -2098,9 +2087,6 @@
20982087
"sqlDbPwd": {
20992088
"type": "securestring"
21002089
},
2101-
"managedIdentityObjectId": {
2102-
"type": "string"
2103-
},
21042090
"imageTag": {
21052091
"type": "string"
21062092
}
@@ -2275,7 +2261,6 @@
22752261
},
22762262
"dependsOn": [
22772263
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry')]",
2278-
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]",
22792264
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_sql_db')]"
22802265
]
22812266
},
@@ -2291,9 +2276,6 @@
22912276
"parameters": {
22922277
"solutionName": {
22932278
"value": "[variables('solutionPrefix')]"
2294-
},
2295-
"identity": {
2296-
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.id]"
22972279
}
22982280
},
22992281
"template": {
@@ -2302,8 +2284,8 @@
23022284
"metadata": {
23032285
"_generator": {
23042286
"name": "bicep",
2305-
"version": "0.33.93.31351",
2306-
"templateHash": "11904916764630875140"
2287+
"version": "0.28.1.47646",
2288+
"templateHash": "5504175264354263888"
23072289
}
23082290
},
23092291
"parameters": {
@@ -2312,9 +2294,6 @@
23122294
"metadata": {
23132295
"description": "Specifies the location for resources."
23142296
}
2315-
},
2316-
"identity": {
2317-
"type": "string"
23182297
}
23192298
},
23202299
"variables": {
@@ -2340,8 +2319,7 @@
23402319
},
23412320
"dependsOn": [
23422321
"[resourceId('Microsoft.Resources/deployments', 'deploy_azure_function_charts')]",
2343-
"[resourceId('Microsoft.Resources/deployments', 'deploy_azure_function_rag')]",
2344-
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]"
2322+
"[resourceId('Microsoft.Resources/deployments', 'deploy_azure_function_rag')]"
23452323
]
23462324
},
23472325
{
@@ -2358,15 +2336,9 @@
23582336
"imageTag": {
23592337
"value": "[parameters('imageTag')]"
23602338
},
2361-
"identity": {
2362-
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity'), '2022-09-01').outputs.managedIdentityOutput.value.id]"
2363-
},
23642339
"solutionName": {
23652340
"value": "[variables('solutionPrefix')]"
23662341
},
2367-
"solutionLocation": {
2368-
"value": "[variables('solutionLocation')]"
2369-
},
23702342
"AzureOpenAIEndpoint": {
23712343
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.aiServicesTarget.value]"
23722344
},
@@ -2408,14 +2380,6 @@
24082380
"AZURE_COSMOSDB_ACCOUNT": {
24092381
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosAccountName.value]"
24102382
},
2411-
"AZURE_COSMOSDB_ACCOUNT_KEY": {
2412-
"reference": {
2413-
"keyVault": {
2414-
"id": "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.KeyVault/vaults', reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry'), '2022-09-01').outputs.keyvaultName.value)]"
2415-
},
2416-
"secretName": "AZURE-COSMOSDB-ACCOUNT-KEY"
2417-
}
2418-
},
24192383
"AZURE_COSMOSDB_CONVERSATIONS_CONTAINER": {
24202384
"value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_cosmos_db'), '2022-09-01').outputs.cosmosContainerName.value]"
24212385
},
@@ -2432,8 +2396,8 @@
24322396
"metadata": {
24332397
"_generator": {
24342398
"name": "bicep",
2435-
"version": "0.33.93.31351",
2436-
"templateHash": "1923507558856922316"
2399+
"version": "0.28.1.47646",
2400+
"templateHash": "10345305852452938336"
24372401
}
24382402
},
24392403
"parameters": {
@@ -2445,15 +2409,6 @@
24452409
"description": "Solution Name"
24462410
}
24472411
},
2448-
"solutionLocation": {
2449-
"type": "string",
2450-
"metadata": {
2451-
"description": "Solution Location"
2452-
}
2453-
},
2454-
"identity": {
2455-
"type": "string"
2456-
},
24572412
"HostingPlanName": {
24582413
"type": "string",
24592414
"defaultValue": "[format('{0}-app-service-plan', parameters('solutionName'))]",
@@ -2554,13 +2509,6 @@
25542509
"description": "Azure Cosmos DB Account"
25552510
}
25562511
},
2557-
"AZURE_COSMOSDB_ACCOUNT_KEY": {
2558-
"type": "securestring",
2559-
"defaultValue": "",
2560-
"metadata": {
2561-
"description": "Azure Cosmos DB Account Key"
2562-
}
2563-
},
25642512
"AZURE_COSMOSDB_CONVERSATIONS_CONTAINER": {
25652513
"type": "string",
25662514
"defaultValue": "",
@@ -2588,7 +2536,7 @@
25882536
},
25892537
"variables": {
25902538
"WebAppImageName": "[format('DOCKER|kmcontainerreg.azurecr.io/km-app:{0}', parameters('imageTag'))]",
2591-
"REACT_APP_LAYOUT_CONFIG": "{\r\n \"appConfig\": {\r\n \"THREE_COLUMN\": {\r\n \"DASHBOARD\": 50,\r\n \"CHAT\": 33,\r\n \"CHATHISTORY\": 17\r\n },\r\n \"TWO_COLUMN\": {\r\n \"DASHBOARD_CHAT\": {\r\n \"DASHBOARD\": 65,\r\n \"CHAT\": 35\r\n },\r\n \"CHAT_CHATHISTORY\": {\r\n \"CHAT\": 80,\r\n \"CHATHISTORY\": 20\r\n }\r\n }\r\n },\r\n \"charts\": [\r\n {\r\n \"id\": \"SATISFIED\",\r\n \"name\": \"Satisfied\",\r\n \"type\": \"card\",\r\n \"layout\": { \"row\": 1, \"column\": 1, \"height\": 11 }\r\n },\r\n {\r\n \"id\": \"TOTAL_CALLS\",\r\n \"name\": \"Total Calls\",\r\n \"type\": \"card\",\r\n \"layout\": { \"row\": 1, \"column\": 2, \"span\": 1 }\r\n },\r\n {\r\n \"id\": \"AVG_HANDLING_TIME\",\r\n \"name\": \"Average Handling Time\",\r\n \"type\": \"card\",\r\n \"layout\": { \"row\": 1, \"column\": 3, \"span\": 1 }\r\n },\r\n {\r\n \"id\": \"SENTIMENT\",\r\n \"name\": \"Topics Overview\",\r\n \"type\": \"donutchart\",\r\n \"layout\": { \"row\": 2, \"column\": 1, \"width\": 40, \"height\": 44.5 }\r\n },\r\n {\r\n \"id\": \"AVG_HANDLING_TIME_BY_TOPIC\",\r\n \"name\": \"Average Handling Time By Topic\",\r\n \"type\": \"bar\",\r\n \"layout\": { \"row\": 2, \"column\": 2, \"row-span\": 2, \"width\": 60 }\r\n },\r\n {\r\n \"id\": \"TOPICS\",\r\n \"name\": \"Trending Topics\",\r\n \"type\": \"table\",\r\n \"layout\": { \"row\": 3, \"column\": 1, \"span\": 2 }\r\n },\r\n {\r\n \"id\": \"KEY_PHRASES\",\r\n \"name\": \"Key Phrases\",\r\n \"type\": \"wordcloud\",\r\n \"layout\": { \"row\": 3, \"column\": 2, \"height\": 44.5 }\r\n }\r\n ]\r\n}"
2539+
"REACT_APP_LAYOUT_CONFIG": "{\n \"appConfig\": {\n \"THREE_COLUMN\": {\n \"DASHBOARD\": 50,\n \"CHAT\": 33,\n \"CHATHISTORY\": 17\n },\n \"TWO_COLUMN\": {\n \"DASHBOARD_CHAT\": {\n \"DASHBOARD\": 65,\n \"CHAT\": 35\n },\n \"CHAT_CHATHISTORY\": {\n \"CHAT\": 80,\n \"CHATHISTORY\": 20\n }\n }\n },\n \"charts\": [\n {\n \"id\": \"SATISFIED\",\n \"name\": \"Satisfied\",\n \"type\": \"card\",\n \"layout\": { \"row\": 1, \"column\": 1, \"height\": 11 }\n },\n {\n \"id\": \"TOTAL_CALLS\",\n \"name\": \"Total Calls\",\n \"type\": \"card\",\n \"layout\": { \"row\": 1, \"column\": 2, \"span\": 1 }\n },\n {\n \"id\": \"AVG_HANDLING_TIME\",\n \"name\": \"Average Handling Time\",\n \"type\": \"card\",\n \"layout\": { \"row\": 1, \"column\": 3, \"span\": 1 }\n },\n {\n \"id\": \"SENTIMENT\",\n \"name\": \"Topics Overview\",\n \"type\": \"donutchart\",\n \"layout\": { \"row\": 2, \"column\": 1, \"width\": 40, \"height\": 44.5 }\n },\n {\n \"id\": \"AVG_HANDLING_TIME_BY_TOPIC\",\n \"name\": \"Average Handling Time By Topic\",\n \"type\": \"bar\",\n \"layout\": { \"row\": 2, \"column\": 2, \"row-span\": 2, \"width\": 60 }\n },\n {\n \"id\": \"TOPICS\",\n \"name\": \"Trending Topics\",\n \"type\": \"table\",\n \"layout\": { \"row\": 3, \"column\": 1, \"span\": 2 }\n },\n {\n \"id\": \"KEY_PHRASES\",\n \"name\": \"Key Phrases\",\n \"type\": \"wordcloud\",\n \"layout\": { \"row\": 3, \"column\": 2, \"height\": 44.5 }\n }\n ]\n}"
25922540
},
25932541
"resources": [
25942542
{
@@ -2747,7 +2695,6 @@
27472695
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry')]",
27482696
"[resourceId('Microsoft.Resources/deployments', 'deploy_azure_function_urls')]",
27492697
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_cosmos_db')]",
2750-
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]",
27512698
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_sql_db')]"
27522699
]
27532700
}

0 commit comments

Comments
 (0)