From 4e1b1ba050cf8ba4141b51102ab3d01e9b7bc677 Mon Sep 17 00:00:00 2001
From: Josh Bradley <joshbradley@microsoft.com>
Date: Fri, 3 Jan 2025 13:49:26 -0500
Subject: [PATCH] revert bicep api version changes to a working condition

---
 infra/core/cosmosdb/cosmosdb.bicep | 14 +++++++-------
 infra/deploy.sh                    |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/infra/core/cosmosdb/cosmosdb.bicep b/infra/core/cosmosdb/cosmosdb.bicep
index 36ede46..1aecdb4 100644
--- a/infra/core/cosmosdb/cosmosdb.bicep
+++ b/infra/core/cosmosdb/cosmosdb.bicep
@@ -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
   name: 'graphrag'
   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
   name: 'jobs'
   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
   name: 'container-store'
   properties: {
@@ -168,12 +168,12 @@ resource containerStoreContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatab
   }
 }
 
-resource sqlRoleAssignment 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2023-11-15' = [
-  for id in roleDefinitionId: {
-    name: guid('${id}-${principalId}-${cosmosDb.id}')
+resource sqlRoleAssignment 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2024-11-15' = [
+  for roleId in roleDefinitionId: {
+    name: guid('${roleId}-${principalId}-${cosmosDb.id}')
     parent: cosmosDb
     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
       scope: cosmosDb.id
     }
diff --git a/infra/deploy.sh b/infra/deploy.sh
index 56fdaf8..92b2be1 100755
--- a/infra/deploy.sh
+++ b/infra/deploy.sh
@@ -264,11 +264,11 @@ createResourceGroupIfNotExists () {
     local location=$1
     local rg=$2
     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
         printf "No.\n"
         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"
     else
         printf "Yes.\n"
@@ -295,7 +295,7 @@ getAksCredentials () {
     local rg=$1
     local aks=$2
     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..."
     kubelogin convert-kubeconfig -l azurecli
     exitIfCommandFailed $? "Error logging into AKS, exiting..."