Skip to content

fix: add conditional output handling for optional Bicep module references #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justinyoo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add conditional output handling for optional Bicep module references #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions infra/core/ai/ai-project.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ module applicationInsights '../monitor/applicationinsights.bicep' = if (shouldCr
location: location
tags: tags
name: 'appi-${resourceToken}'
logAnalyticsWorkspaceId: logAnalytics.outputs.id
logAnalyticsWorkspaceId: logAnalytics!.outputs.id
}
}

Expand Down Expand Up @@ -164,15 +164,15 @@ resource appInsightConnection 'Microsoft.CognitiveServices/accounts/projects/con
name: 'appi-connection'
properties: {
category: 'AppInsights'
target: applicationInsights.outputs.id
target: applicationInsights!.outputs.id
authType: 'ApiKey'
isSharedToAll: true
credentials: {
key: applicationInsights.outputs.connectionString
key: applicationInsights!.outputs.connectionString
}
metadata: {
ApiType: 'Azure'
ResourceId: applicationInsights.outputs.id
ResourceId: applicationInsights!.outputs.id
}
}
}
Expand Down Expand Up @@ -370,8 +370,8 @@ output aiServicesAccountName string = aiAccount.name
output aiServicesProjectName string = aiAccount::project.name
output aiServicesPrincipalId string = aiAccount.identity.principalId
output projectName string = aiAccount::project.name
output APPLICATIONINSIGHTS_CONNECTION_STRING string = shouldCreateAppInsights ? applicationInsights.outputs.connectionString : (hasExistingAppInsightsConnectionString ? existingApplicationInsightsConnectionString : '')
output APPLICATIONINSIGHTS_RESOURCE_ID string = shouldCreateAppInsights ? applicationInsights.outputs.id : (hasExistingAppInsightsConnectionString ? existingApplicationInsightsResourceId : '')
output APPLICATIONINSIGHTS_CONNECTION_STRING string = shouldCreateAppInsights ? applicationInsights!.outputs.connectionString : (hasExistingAppInsightsConnectionString ? existingApplicationInsightsConnectionString : '')
output APPLICATIONINSIGHTS_RESOURCE_ID string = shouldCreateAppInsights ? applicationInsights!.outputs.id : (hasExistingAppInsightsConnectionString ? existingApplicationInsightsResourceId : '')

// Grouped dependent resources outputs
output dependentResources object = {
Expand Down
11 changes: 6 additions & 5 deletions infra/core/host/acr.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,21 @@ module containerRegistry 'br/public:avm/res/container-registry/registry:0.1.1' =
location: location
tags: tags
publicNetworkAccess: 'Enabled'
roleAssignments:[
roleAssignments: concat([
{
principalId: principalId
principalType: principalType
roleDefinitionIdOrName: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f951dda-4ed3-4680-a7ca-43fe172d538d')
}
], !empty(aiServicesAccountName) && !empty(aiProjectName) ? [
// TODO SEPARATELY
{
// the foundry project itself can pull from the ACR
principalId: aiAccount::aiProject.identity.principalId
principalId: aiAccount::aiProject!.identity.principalId
principalType: 'ServicePrincipal'
roleDefinitionIdOrName: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f951dda-4ed3-4680-a7ca-43fe172d538d')
}
]
] : [])
}
}

Expand All @@ -70,7 +71,7 @@ module acrConnection '../ai/connection.bicep' = if (!empty(aiServicesAccountName
target: containerRegistry.outputs.loginServer
authType: 'ManagedIdentity'
credentials: {
clientId: aiAccount::aiProject.identity.principalId
clientId: aiAccount::aiProject!.identity.principalId
resourceId: containerRegistry.outputs.resourceId
}
isSharedToAll: true
Expand All @@ -84,4 +85,4 @@ module acrConnection '../ai/connection.bicep' = if (!empty(aiServicesAccountName
output containerRegistryName string = containerRegistry.outputs.name
output containerRegistryLoginServer string = containerRegistry.outputs.loginServer
output containerRegistryResourceId string = containerRegistry.outputs.resourceId
output containerRegistryConnectionName string = acrConnection.outputs.connectionName
output containerRegistryConnectionName string = !empty(aiServicesAccountName) && !empty(aiProjectName) ? acrConnection!.outputs.connectionName : ''
4 changes: 2 additions & 2 deletions infra/core/search/bing_custom_grounding.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@ module aiSearchConnection '../ai/connection.bicep' = if (!empty(aiServicesAccoun

// Outputs
output bingCustomGroundingName string = bingCustomSearch.name
output bingCustomGroundingConnectionName string = aiSearchConnection.outputs.connectionName
output bingCustomGroundingConnectionName string = !empty(aiServicesAccountName) && !empty(aiProjectName) ? aiSearchConnection!.outputs.connectionName : ''
output bingCustomGroundingResourceId string = bingCustomSearch.id
output bingCustomGroundingConnectionId string = aiSearchConnection.outputs.connectionId
output bingCustomGroundingConnectionId string = !empty(aiServicesAccountName) && !empty(aiProjectName) ? aiSearchConnection!.outputs.connectionId : ''
4 changes: 2 additions & 2 deletions infra/core/search/bing_grounding.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ module bingSearchConnection '../ai/connection.bicep' = if (!empty(aiServicesAcco
}

output bingGroundingName string = bingSearch.name
output bingGroundingConnectionName string = bingSearchConnection.outputs.connectionName
output bingGroundingConnectionName string = !empty(aiServicesAccountName) && !empty(aiProjectName) ? bingSearchConnection!.outputs.connectionName : ''
output bingGroundingResourceId string = bingSearch.id
output bingGroundingConnectionId string = bingSearchConnection.outputs.connectionId
output bingGroundingConnectionId string = !empty(aiServicesAccountName) && !empty(aiProjectName) ? bingSearchConnection!.outputs.connectionId : ''
2 changes: 1 addition & 1 deletion infra/core/storage/storage.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ module storageConnection '../ai/connection.bicep' = if (!empty(aiServicesAccount
output storageAccountName string = storageAccount.name
output storageAccountId string = storageAccount.id
output storageAccountPrincipalId string = storageAccount.identity.principalId
output storageConnectionName string = storageConnection.outputs.connectionName
output storageConnectionName string = !empty(aiServicesAccountName) && !empty(aiProjectName) ? storageConnection!.outputs.connectionName : ''