From 8d448f86d44903ea697a77955ee0f48b676183a4 Mon Sep 17 00:00:00 2001
From: Josh Bradley <joshbradley@microsoft.com>
Date: Sat, 4 Jan 2025 03:13:13 -0500
Subject: [PATCH] update common bicep variable name

---
 infra/deploy.sh  | 2 +-
 infra/main.bicep | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/infra/deploy.sh b/infra/deploy.sh
index df32468..efbece1 100755
--- a/infra/deploy.sh
+++ b/infra/deploy.sh
@@ -329,7 +329,7 @@ deployAzureResources () {
         --resource-group $RESOURCE_GROUP \
         --template-file ./main.bicep \
         --parameters "resourceBaseName=$RESOURCE_BASE_NAME" \
-        --parameters "resourceGroupName=$RESOURCE_GROUP" \
+        --parameters "resourceGroup=$RESOURCE_GROUP" \
         --parameters "apimName=$APIM_NAME" \
         --parameters "apimTier=$APIM_TIER" \
         --parameters "apiPublisherName=$PUBLISHER_NAME" \
diff --git a/infra/main.bicep b/infra/main.bicep
index 4d9c2ce..c2e52e7 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -20,14 +20,14 @@ Managed Identity
 @minLength(1)
 @maxLength(64)
 @description('Name of the resource group that GraphRAG will be deployed in.')
-param resourceGroupName string
+param resourceGroup string
 
 @description('Unique name to append to each resource')
 param resourceBaseName string = ''
-var resourceBaseNameFinal = !empty(resourceBaseName) ? resourceBaseName : toLower(uniqueString('${subscription().id}/resourceGroups/${resourceGroupName}'))
+var resourceBaseNameFinal = !empty(resourceBaseName) ? resourceBaseName : toLower(uniqueString('${subscription().id}/resourceGroups/${resourceGroup}'))
 
 @description('Cloud region for all resources')
-param location string = resourceGroup().location
+param location string = az.resourceGroup().location
 
 @description('Principal/Object ID of the deployer. Will be used to assign admin roles to the AKS cluster.')
 param deployerPrincipalId string
@@ -58,7 +58,7 @@ param cosmosDbName string = ''
 param aiSearchName string = ''
 
 var abbrs = loadJsonContent('abbreviations.json')
-var tags = { 'azd-env-name': resourceGroupName }
+var tags = { 'azd-env-name': resourceGroup }
 var workloadIdentityName = '${abbrs.managedIdentityUserAssignedIdentities}${resourceBaseNameFinal}'
 var aksServiceAccountName = '${aksNamespace}-workload-sa'
 var workloadIdentitySubject = 'system:serviceaccount:${aksNamespace}:${aksServiceAccountName}'