Skip to content

Commit a15dc79

Browse files
Avijit-MicrosoftAvijit-Microsoft
authored
chore: dev to main merge
2 parents f4cb41c + eab7705 commit a15dc79

11 files changed

Lines changed: 1272 additions & 1207 deletions

File tree

‎infra/main.bicep‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -991,17 +991,17 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.31.0' = {
991991
roleAssignments: [
992992
{
993993
principalId: userAssignedIdentity.outputs.principalId
994-
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
994+
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' // Storage Blob Data Contributor
995995
principalType: 'ServicePrincipal'
996996
}
997997
{
998998
principalId: userAssignedIdentity.outputs.principalId
999-
roleDefinitionIdOrName: 'Storage Account Contributor'
999+
roleDefinitionIdOrName: '17d1049b-9a84-46fb-8f53-869881c3d3ab' // Storage Account Contributor
10001000
principalType: 'ServicePrincipal'
10011001
}
10021002
{
10031003
principalId: userAssignedIdentity.outputs.principalId
1004-
roleDefinitionIdOrName: 'Storage File Data Privileged Contributor'
1004+
roleDefinitionIdOrName: '69566ab7-960f-475b-8e7c-b3118f30c6bd' // Storage File Data Privileged Contributor
10051005
principalType: 'ServicePrincipal'
10061006
}
10071007
]

‎infra/main.json‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.43.8.12551",
9-
"templateHash": "18442421312669656903"
8+
"version": "0.44.1.10279",
9+
"templateHash": "5914264828980253617"
1010
}
1111
},
1212
"parameters": {
@@ -397,7 +397,7 @@
397397
"sqlServerResourceName": "[format('sql-{0}', variables('solutionSuffix'))]",
398398
"sqlDbModuleName": "[format('sqldb-{0}', variables('solutionSuffix'))]",
399399
"webServerFarmResourceName": "[format('asp-{0}', variables('solutionSuffix'))]",
400-
"reactAppLayoutConfig": "{\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}",
400+
"reactAppLayoutConfig": "{\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}",
401401
"backendWebSiteResourceName": "[format('api-{0}', variables('solutionSuffix'))]",
402402
"webSiteResourceName": "[format('app-{0}', variables('solutionSuffix'))]"
403403
},
@@ -4429,8 +4429,8 @@
44294429
"metadata": {
44304430
"_generator": {
44314431
"name": "bicep",
4432-
"version": "0.43.8.12551",
4433-
"templateHash": "14263337584307645476"
4432+
"version": "0.44.1.10279",
4433+
"templateHash": "9627102454387562913"
44344434
}
44354435
},
44364436
"definitions": {
@@ -23927,8 +23927,8 @@
2392723927
"metadata": {
2392823928
"_generator": {
2392923929
"name": "bicep",
23930-
"version": "0.43.8.12551",
23931-
"templateHash": "16752595662856460651"
23930+
"version": "0.44.1.10279",
23931+
"templateHash": "5252655870199315922"
2393223932
},
2393323933
"name": "Cognitive Services",
2393423934
"description": "This module deploys a Cognitive Service."
@@ -25076,8 +25076,8 @@
2507625076
"metadata": {
2507725077
"_generator": {
2507825078
"name": "bicep",
25079-
"version": "0.43.8.12551",
25080-
"templateHash": "10918733563560027648"
25079+
"version": "0.44.1.10279",
25080+
"templateHash": "13713786341946245413"
2508125081
}
2508225082
},
2508325083
"definitions": {
@@ -26726,8 +26726,8 @@
2672626726
"metadata": {
2672726727
"_generator": {
2672826728
"name": "bicep",
26729-
"version": "0.43.8.12551",
26730-
"templateHash": "9910113619698591130"
26729+
"version": "0.44.1.10279",
26730+
"templateHash": "436403693822643644"
2673126731
}
2673226732
},
2673326733
"definitions": {
@@ -26956,8 +26956,8 @@
2695626956
"metadata": {
2695726957
"_generator": {
2695826958
"name": "bicep",
26959-
"version": "0.43.8.12551",
26960-
"templateHash": "10918733563560027648"
26959+
"version": "0.44.1.10279",
26960+
"templateHash": "13713786341946245413"
2696126961
}
2696226962
},
2696326963
"definitions": {
@@ -28606,8 +28606,8 @@
2860628606
"metadata": {
2860728607
"_generator": {
2860828608
"name": "bicep",
28609-
"version": "0.43.8.12551",
28610-
"templateHash": "9910113619698591130"
28609+
"version": "0.44.1.10279",
28610+
"templateHash": "436403693822643644"
2861128611
}
2861228612
},
2861328613
"definitions": {
@@ -29628,9 +29628,9 @@
2962829628
},
2962929629
"dependsOn": [
2963029630
"aiFoundryAiServices",
29631-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
2963229631
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
2963329632
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
29633+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
2963429634
"virtualNetwork"
2963529635
]
2963629636
},
@@ -31811,8 +31811,8 @@
3181131811
"metadata": {
3181231812
"_generator": {
3181331813
"name": "bicep",
31814-
"version": "0.43.8.12551",
31815-
"templateHash": "2967490583129753981"
31814+
"version": "0.44.1.10279",
31815+
"templateHash": "14378911215964300033"
3181631816
}
3181731817
},
3181831818
"parameters": {
@@ -31906,8 +31906,8 @@
3190631906
"metadata": {
3190731907
"_generator": {
3190831908
"name": "bicep",
31909-
"version": "0.43.8.12551",
31910-
"templateHash": "13704406247129243046"
31909+
"version": "0.44.1.10279",
31910+
"templateHash": "13879155259000477210"
3191131911
}
3191231912
},
3191331913
"parameters": {
@@ -32001,17 +32001,17 @@
3200132001
"value": [
3200232002
{
3200332003
"principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
32004-
"roleDefinitionIdOrName": "Storage Blob Data Contributor",
32004+
"roleDefinitionIdOrName": "ba92f5b4-2d11-453d-a403-e96b0029c9fe",
3200532005
"principalType": "ServicePrincipal"
3200632006
},
3200732007
{
3200832008
"principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
32009-
"roleDefinitionIdOrName": "Storage Account Contributor",
32009+
"roleDefinitionIdOrName": "17d1049b-9a84-46fb-8f53-869881c3d3ab",
3201032010
"principalType": "ServicePrincipal"
3201132011
},
3201232012
{
3201332013
"principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
32014-
"roleDefinitionIdOrName": "Storage File Data Privileged Contributor",
32014+
"roleDefinitionIdOrName": "69566ab7-960f-475b-8e7c-b3118f30c6bd",
3201532015
"principalType": "ServicePrincipal"
3201632016
}
3201732017
]
@@ -39944,9 +39944,9 @@
3994439944
}
3994539945
},
3994639946
"dependsOn": [
39947+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
3994739948
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3994839949
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageDfs)]",
39949-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
3995039950
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
3995139951
"userAssignedIdentity",
3995239952
"virtualNetwork"
@@ -53766,8 +53766,8 @@
5376653766
"metadata": {
5376753767
"_generator": {
5376853768
"name": "bicep",
53769-
"version": "0.43.8.12551",
53770-
"templateHash": "6926177947269338708"
53769+
"version": "0.44.1.10279",
53770+
"templateHash": "18173420839042785423"
5377153771
}
5377253772
},
5377353773
"definitions": {
@@ -54779,8 +54779,8 @@
5477954779
"metadata": {
5478054780
"_generator": {
5478154781
"name": "bicep",
54782-
"version": "0.43.8.12551",
54783-
"templateHash": "1585721918321980475"
54782+
"version": "0.44.1.10279",
54783+
"templateHash": "13783254618840971873"
5478454784
},
5478554785
"name": "Site App Settings",
5478654786
"description": "This module deploys a Site App Setting."
@@ -55719,8 +55719,8 @@
5571955719
"metadata": {
5572055720
"_generator": {
5572155721
"name": "bicep",
55722-
"version": "0.43.8.12551",
55723-
"templateHash": "6926177947269338708"
55722+
"version": "0.44.1.10279",
55723+
"templateHash": "18173420839042785423"
5572455724
}
5572555725
},
5572655726
"definitions": {
@@ -56732,8 +56732,8 @@
5673256732
"metadata": {
5673356733
"_generator": {
5673456734
"name": "bicep",
56735-
"version": "0.43.8.12551",
56736-
"templateHash": "1585721918321980475"
56735+
"version": "0.44.1.10279",
56736+
"templateHash": "13783254618840971873"
5673756737
},
5673856738
"name": "Site App Settings",
5673956739
"description": "This module deploys a Site App Setting."

‎infra/main_custom.bicep‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -975,17 +975,17 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.31.0' = {
975975
roleAssignments: [
976976
{
977977
principalId: userAssignedIdentity.outputs.principalId
978-
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
978+
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' // Storage Blob Data Contributor
979979
principalType: 'ServicePrincipal'
980980
}
981981
{
982982
principalId: userAssignedIdentity.outputs.principalId
983-
roleDefinitionIdOrName: 'Storage Account Contributor'
983+
roleDefinitionIdOrName: '17d1049b-9a84-46fb-8f53-869881c3d3ab' // Storage Account Contributor
984984
principalType: 'ServicePrincipal'
985985
}
986986
{
987987
principalId: userAssignedIdentity.outputs.principalId
988-
roleDefinitionIdOrName: 'Storage File Data Privileged Contributor'
988+
roleDefinitionIdOrName: '69566ab7-960f-475b-8e7c-b3118f30c6bd' // Storage File Data Privileged Contributor
989989
principalType: 'ServicePrincipal'
990990
}
991991
]

‎infra/scripts/agent_scripts/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
aiohttp==3.13.4
1+
aiohttp==3.14.0
22
azure-identity==1.25.2
33
azure-ai-projects==2.1.0

0 commit comments

Comments
 (0)