yujunjun/graphrag-accelerator
1
0
Fork 0
mirror of https://github.com/Azure-Samples/graphrag-accelerator.git synced 2025-10-12 09:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert bicep api version changes to a working condition

Browse Source
This commit is contained in:
Josh Bradley 2025-01-03 13:49:26 -05:00
parent 2f744c148a
commit 4e1b1ba050
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
infra/core/cosmosdb/cosmosdb.bicep
View File

@ -82,7 +82,7 @@ resource cosmosDb 'Microsoft.DocumentDB/databaseAccounts@2024-11-15' = {
} }
} }
resource graphragDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2022-11-15' = { resource graphragDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2024-11-15' = {
parent: cosmosDb parent: cosmosDb
name: 'graphrag' name: 'graphrag'
properties: { properties: {
@ -92,7 +92,7 @@ resource graphragDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@20
} }
} }
resource jobsContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2022-11-15' = { resource jobsContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2024-11-15' = {
parent: graphragDatabase parent: graphragDatabase
name: 'jobs' name: 'jobs'
properties: { properties: {
@ -130,7 +130,7 @@ resource jobsContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/conta
} }
} }
resource containerStoreContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2022-11-15' = { resource containerStoreContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2024-11-15' = {
parent: graphragDatabase parent: graphragDatabase
name: 'container-store' name: 'container-store'
properties: { properties: {
@ -168,12 +168,12 @@ resource containerStoreContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatab
} }
} }
resource sqlRoleAssignment 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2023-11-15' = [ resource sqlRoleAssignment 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2024-11-15' = [
for id in roleDefinitionId: { for roleId in roleDefinitionId: {
name: guid('${id}-${principalId}-${cosmosDb.id}') name: guid('${roleId}-${principalId}-${cosmosDb.id}')
parent: cosmosDb parent: cosmosDb
properties: { properties: {
roleDefinitionId: '${resourceGroup().id}/providers/Microsoft.DocumentDB/databaseAccounts/${cosmosDb.name}/sqlRoleDefinitions/${id}' roleDefinitionId: '${resourceGroup().id}/providers/Microsoft.DocumentDB/databaseAccounts/${cosmosDb.name}/sqlRoleDefinitions/${roleId}'
principalId: principalId principalId: principalId
scope: cosmosDb.id scope: cosmosDb.id
} }

6
infra/deploy.sh
View File

@ -264,11 +264,11 @@ createResourceGroupIfNotExists () {
local location=$1 local location=$1
local rg=$2 local rg=$2
printf "Checking if resource group $rg exists... " printf "Checking if resource group $rg exists... "
az group show -n $rg -o json >/dev/null 2>&1 az group show -n $rg -o json > /dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
printf "No.\n" printf "No.\n"
printf "Creating resource group... " printf "Creating resource group... "
az group create -l $location -n $rg >/dev/null 2>&1 az group create -l $location -n $rg > /dev/null 2>&1
printf "Done.\n" printf "Done.\n"
else else
printf "Yes.\n" printf "Yes.\n"
@ -295,7 +295,7 @@ getAksCredentials () {
local rg=$1 local rg=$1
local aks=$2 local aks=$2
printf "Getting AKS credentials... " printf "Getting AKS credentials... "
az aks get-credentials -g $rg -n $aks --overwrite-existing 2>&1 az aks get-credentials -g $rg -n $aks --overwrite-existing > /dev/null 2>&1
exitIfCommandFailed $? "Error getting AKS credentials, exiting..." exitIfCommandFailed $? "Error getting AKS credentials, exiting..."
kubelogin convert-kubeconfig -l azurecli kubelogin convert-kubeconfig -l azurecli
exitIfCommandFailed $? "Error logging into AKS, exiting..." exitIfCommandFailed $? "Error logging into AKS, exiting..."