Skip to content

Commit

Permalink
update common bicep variable name
Browse files Browse the repository at this point in the history
  • Loading branch information
jgbradley1 committed Jan 4, 2025
1 parent 96dcd95 commit 8d448f8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion infra/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down
8 changes: 4 additions & 4 deletions infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}'
Expand Down

0 comments on commit 8d448f8

Please sign in to comment.