Skip to content

Rename variables and format Bicep before larger change #7

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

Merged
pamelafox merged 4 commits into from
Feb 21, 2025
Merged

Rename variables and format Bicep before larger change #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e818815
Format and rename vars
pamelafox Feb 21, 2025
8e1c0a9
Remove whitespace change
pamelafox Feb 21, 2025
b2c1f50
Remove whitespace change
pamelafox Feb 21, 2025
b629749
Remove whitespace change
pamelafox Feb 21, 2025
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
8 changes: 4 additions & 4 deletions infra/aca.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module app 'core/host/container-app-upsert.bicep' = {
}
}

output SERVICE_ACA_IDENTITY_PRINCIPAL_ID string = acaIdentity.properties.principalId
output SERVICE_ACA_NAME string = app.outputs.name
output SERVICE_ACA_URI string = app.outputs.uri
output SERVICE_ACA_IMAGE_NAME string = app.outputs.imageName
output identityPrincipalId string = acaIdentity.properties.principalId
output name string = app.outputs.name
output uri string = app.outputs.uri
output imageName string = app.outputs.imageName
25 changes: 9 additions & 16 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ param principalId string = ''

param acaExists bool = false

// Parameters for the Azure AI resource:
param aiServicesResourceGroupName string = ''
@minLength(1)
@description('Location for the Azure AI resource')
// https://learn.microsoft.com/azure/ai-studio/how-to/deploy-models-serverless-availability#deepseek-models-from-microsoft
Expand All @@ -38,7 +36,6 @@ param disableKeyBasedAuth bool = true
// Parameters for the specific Azure AI deployment:
param aiServicesDeploymentName string = 'DeepSeek-R1'


var resourceToken = toLower(uniqueString(subscription().id, name, location))
var tags = { 'azd-env-name': name }

Expand All @@ -48,10 +45,6 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
tags: tags
}

resource aiServicesResourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' existing = if (!empty(aiServicesResourceGroupName)) {
name: !empty(aiServicesResourceGroupName) ? aiServicesResourceGroupName : resourceGroup.name
}

var prefix = '${name}-${resourceToken}'

var aiServicesNameAndSubdomain = '${resourceToken}-aiservices'
Expand All @@ -64,7 +57,7 @@ module aiServices 'br/public:avm/res/cognitive-services/account:0.7.2' = {
tags: tags
kind: 'AIServices'
customSubDomainName: aiServicesNameAndSubdomain
sku: 'S0'
sku: 'S0'
publicNetworkAccess: 'Enabled'
deployments: [
{
Expand All @@ -78,7 +71,8 @@ module aiServices 'br/public:avm/res/cognitive-services/account:0.7.2' = {
name: 'GlobalStandard'
capacity: 1
}
}]
}
]
disableLocalAuth: disableKeyBasedAuth
roleAssignments: [
{
Expand Down Expand Up @@ -131,12 +125,11 @@ module aca 'aca.bicep' = {
}
}


module aiServicesRoleBackend 'core/security/role.bicep' = {
scope: aiServicesResourceGroup
scope: resourceGroup
name: 'aiservices-role-backend'
params: {
principalId: aca.outputs.SERVICE_ACA_IDENTITY_PRINCIPAL_ID
principalId: aca.outputs.identityPrincipalId
roleDefinitionId: 'a97b65f3-24c7-4388-baec-2e87135dc908'
principalType: 'ServicePrincipal'
}
Expand All @@ -148,10 +141,10 @@ output AZURE_TENANT_ID string = tenant().tenantId
output AZURE_DEEPSEEK_DEPLOYMENT string = aiServicesDeploymentName
output AZURE_INFERENCE_ENDPOINT string = 'https://${aiServices.outputs.name}.services.ai.azure.com/models'

output SERVICE_ACA_IDENTITY_PRINCIPAL_ID string = aca.outputs.SERVICE_ACA_IDENTITY_PRINCIPAL_ID
output SERVICE_ACA_NAME string = aca.outputs.SERVICE_ACA_NAME
output SERVICE_ACA_URI string = aca.outputs.SERVICE_ACA_URI
output SERVICE_ACA_IMAGE_NAME string = aca.outputs.SERVICE_ACA_IMAGE_NAME
output SERVICE_ACA_IDENTITY_PRINCIPAL_ID string = aca.outputs.identityPrincipalId
output SERVICE_ACA_NAME string = aca.outputs.name
output SERVICE_ACA_URI string = aca.outputs.uri
output SERVICE_ACA_IMAGE_NAME string = aca.outputs.imageName

output AZURE_CONTAINER_ENVIRONMENT_NAME string = containerApps.outputs.environmentName
output AZURE_CONTAINER_REGISTRY_ENDPOINT string = containerApps.outputs.registryLoginServer
Expand Down
Loading