Skip to content

Commit bf9162d

Browse files
fix: Dev v4 to main merge
2 parents 22aa354 + 0c35778 commit bf9162d

6 files changed

Lines changed: 16 additions & 15 deletions

File tree

infra/scripts/assign_azure_ai_user_role.sh renamed to infra/scripts/assign_foundry_user_role.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
resource_group="$1"
55
aif_resource_id="$2"
66
principal_ids="$3"
7+
managedIdentityClientId="$4"
78

89

910
# Authenticate with Azure

infra/scripts/cosmosdb_and_ai_user_role_assignment.sh renamed to infra/scripts/cosmosdb_and_foundry_user_role_assignment.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ fi
153153
echo "add_cosmosdb_access.sh completed successfully."
154154

155155

156-
# Call add_cosmosdb_access.sh
157-
echo "Running assign_azure_ai_user_role.sh"
158-
bash infra/scripts/assign_azure_ai_user_role.sh "$resourceGroupName" "$aif_resource_id" "$principal_ids" "$managedIdentityClientId"
156+
# Call assign_foundry_user_role.sh
157+
echo "Running assign_foundry_user_role.sh"
158+
bash infra/scripts/assign_foundry_user_role.sh "$resourceGroupName" "$aif_resource_id" "$principal_ids" "$managedIdentityClientId"
159159
if [ $? -ne 0 ]; then
160-
echo "Error: assign_azure_ai_user_role.sh failed."
160+
echo "Error: assign_foundry_user_role.sh failed."
161161
exit 1
162162
fi
163-
echo "assign_azure_ai_user_role.sh completed successfully."
163+
echo "assign_foundry_user_role.sh completed successfully."

src/App/src/hooks/usePlanWebSocket.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ export function usePlanWebSocket({
209209
steps: [],
210210
next_steps: [],
211211
content: formatErrorMessage(errorContent),
212-
raw_data: finalMessage || '',
212+
raw_data: finalMessage,
213213
};
214214
dispatch(addAgentMessage(errorAgent));
215215
dispatch(planFailedFinal());

src/App/uv.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/backend/uv.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/mcp_server/uv.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)