Skip to content

fix: updated roleDefinitionIdOrName to use GUID and fixed CodeQL issue. #963

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.

Sign up for GitHub

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

Merged
Roopan-Microsoft merged 2 commits into from
Jun 16, 2026
+41 −41
Merged

fix: updated roleDefinitionIdOrName to use GUID and fixed CodeQL issue. #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c54c25
fix: updated roleDefinitionIdOrName to use GUID
vishalsvs7 Jun 15, 2026
f4da698
resolved copilot comments
vishalsvs7 Jun 15, 2026
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
6 changes: 3 additions & 3 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,17 +991,17 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.31.0' = {
roleAssignments: [
{
principalId: userAssignedIdentity.outputs.principalId
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' // Storage Blob Data Contributor
Comment thread
vishalsvs7 marked this conversation as resolved.
principalType: 'ServicePrincipal'
}
{
principalId: userAssignedIdentity.outputs.principalId
roleDefinitionIdOrName: 'Storage Account Contributor'
roleDefinitionIdOrName: '17d1049b-9a84-46fb-8f53-869881c3d3ab' // Storage Account Contributor
Comment thread
vishalsvs7 marked this conversation as resolved.
principalType: 'ServicePrincipal'
}
{
principalId: userAssignedIdentity.outputs.principalId
roleDefinitionIdOrName: 'Storage File Data Privileged Contributor'
roleDefinitionIdOrName: '69566ab7-960f-475b-8e7c-b3118f30c6bd' // Storage File Data Privileged Contributor
Comment thread
vishalsvs7 marked this conversation as resolved.
principalType: 'ServicePrincipal'
}
]
Expand Down
64 changes: 32 additions & 32 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "18442421312669656903"
"version": "0.44.1.10279",
"templateHash": "5914264828980253617"
}
},
"parameters": {
Expand Down Expand Up @@ -397,7 +397,7 @@
"sqlServerResourceName": "[format('sql-{0}', variables('solutionSuffix'))]",
"sqlDbModuleName": "[format('sqldb-{0}', variables('solutionSuffix'))]",
"webServerFarmResourceName": "[format('asp-{0}', variables('solutionSuffix'))]",
"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}",
"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}",
"backendWebSiteResourceName": "[format('api-{0}', variables('solutionSuffix'))]",
"webSiteResourceName": "[format('app-{0}', variables('solutionSuffix'))]"
},
Expand Down Expand Up @@ -4429,8 +4429,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "14263337584307645476"
"version": "0.44.1.10279",
"templateHash": "9627102454387562913"
}
},
"definitions": {
Expand Down Expand Up @@ -23927,8 +23927,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "16752595662856460651"
"version": "0.44.1.10279",
"templateHash": "5252655870199315922"
},
"name": "Cognitive Services",
"description": "This module deploys a Cognitive Service."
Expand Down Expand Up @@ -25076,8 +25076,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "10918733563560027648"
"version": "0.44.1.10279",
"templateHash": "13713786341946245413"
}
},
"definitions": {
Expand Down Expand Up @@ -26726,8 +26726,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "9910113619698591130"
"version": "0.44.1.10279",
"templateHash": "436403693822643644"
}
},
"definitions": {
Expand Down Expand Up @@ -26956,8 +26956,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "10918733563560027648"
"version": "0.44.1.10279",
"templateHash": "13713786341946245413"
}
},
"definitions": {
Expand Down Expand Up @@ -28606,8 +28606,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "9910113619698591130"
"version": "0.44.1.10279",
"templateHash": "436403693822643644"
}
},
"definitions": {
Expand Down Expand Up @@ -29628,9 +29628,9 @@
},
"dependsOn": [
"aiFoundryAiServices",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"virtualNetwork"
]
},
Expand Down Expand Up @@ -31811,8 +31811,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "2967490583129753981"
"version": "0.44.1.10279",
"templateHash": "14378911215964300033"
}
},
"parameters": {
Expand Down Expand Up @@ -31906,8 +31906,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "13704406247129243046"
"version": "0.44.1.10279",
"templateHash": "13879155259000477210"
}
},
"parameters": {
Expand Down Expand Up @@ -32001,17 +32001,17 @@
"value": [
{
"principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
"roleDefinitionIdOrName": "Storage Blob Data Contributor",
"roleDefinitionIdOrName": "ba92f5b4-2d11-453d-a403-e96b0029c9fe",
"principalType": "ServicePrincipal"
},
{
"principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
"roleDefinitionIdOrName": "Storage Account Contributor",
"roleDefinitionIdOrName": "17d1049b-9a84-46fb-8f53-869881c3d3ab",
"principalType": "ServicePrincipal"
},
{
"principalId": "[reference('userAssignedIdentity').outputs.principalId.value]",
"roleDefinitionIdOrName": "Storage File Data Privileged Contributor",
"roleDefinitionIdOrName": "69566ab7-960f-475b-8e7c-b3118f30c6bd",
"principalType": "ServicePrincipal"
}
]
Expand Down Expand Up @@ -39944,9 +39944,9 @@
}
},
"dependsOn": [
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageDfs)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
"userAssignedIdentity",
"virtualNetwork"
Expand Down Expand Up @@ -53766,8 +53766,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "6926177947269338708"
"version": "0.44.1.10279",
"templateHash": "18173420839042785423"
}
},
"definitions": {
Expand Down Expand Up @@ -54779,8 +54779,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "1585721918321980475"
"version": "0.44.1.10279",
"templateHash": "13783254618840971873"
},
"name": "Site App Settings",
"description": "This module deploys a Site App Setting."
Expand Down Expand Up @@ -55719,8 +55719,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "6926177947269338708"
"version": "0.44.1.10279",
"templateHash": "18173420839042785423"
}
},
"definitions": {
Expand Down Expand Up @@ -56732,8 +56732,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.43.8.12551",
"templateHash": "1585721918321980475"
"version": "0.44.1.10279",
"templateHash": "13783254618840971873"
},
"name": "Site App Settings",
"description": "This module deploys a Site App Setting."
Expand Down
6 changes: 3 additions & 3 deletions infra/main_custom.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,17 +975,17 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.31.0' = {
roleAssignments: [
{
principalId: userAssignedIdentity.outputs.principalId
roleDefinitionIdOrName: 'Storage Blob Data Contributor'
roleDefinitionIdOrName: 'ba92f5b4-2d11-453d-a403-e96b0029c9fe' // Storage Blob Data Contributor
Comment thread
vishalsvs7 marked this conversation as resolved.
principalType: 'ServicePrincipal'
}
{
principalId: userAssignedIdentity.outputs.principalId
roleDefinitionIdOrName: 'Storage Account Contributor'
roleDefinitionIdOrName: '17d1049b-9a84-46fb-8f53-869881c3d3ab' // Storage Account Contributor
Comment thread
vishalsvs7 marked this conversation as resolved.
principalType: 'ServicePrincipal'
}
{
principalId: userAssignedIdentity.outputs.principalId
roleDefinitionIdOrName: 'Storage File Data Privileged Contributor'
roleDefinitionIdOrName: '69566ab7-960f-475b-8e7c-b3118f30c6bd' // Storage File Data Privileged Contributor
Comment thread
vishalsvs7 marked this conversation as resolved.
principalType: 'ServicePrincipal'
}
]
Expand Down
4 changes: 2 additions & 2 deletions src/api/services/_patches/agent_framework_search_citations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

logger = logging.getLogger(__name__)

_PATCH_APPLIED = False
_PATCH_APPLIED = False # prevents reapplying patch in apply() guard
_CACHE_ATTR = "_kmsa_search_get_urls_cache"
_TARGET_METHOD = "_parse_chunk_from_openai"
_TARGET_CLASS = "RawOpenAIChatClient"
Expand Down Expand Up @@ -162,7 +162,7 @@ def _patched(self: Any, event: Any, *args: Any, **kwargs: Any) -> Any:
return result

setattr(target_cls, _TARGET_METHOD, _patched)
_PATCH_APPLIED = True
_PATCH_APPLIED = True # marks patch as applied (checked in apply() guard)
logger.info(
"Applied Azure AI Search citation patch on %s.%s (workaround for %s)",
_TARGET_CLASS, _TARGET_METHOD, _UPSTREAM_ISSUE,
Expand Down
2 changes: 1 addition & 1 deletion src/api/services/chat_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# Restore Azure AI Search per-document URL enrichment on streaming citations
# (regression at agent-framework GA; tracked upstream as microsoft/agent-framework#5995).
# Must be imported BEFORE the first FoundryAgent.run() call.
from services._patches import agent_framework_search_citations # noqa: F401
import services._patches.agent_framework_search_citations # noqa: F401 - patch applied for side effects on import

from cachetools import TTLCache

Expand Down
Loading