Skip to content

Commit a94dd9c

Browse files
refactor: update naming conventions for resources in Bicep files and add post-provision hooks in azure.yaml
1 parent b790dc5 commit a94dd9c

9 files changed

+37
-20
lines changed

azure.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,20 @@ deployment:
2424
solutionPrefix: ${parameters.solutionPrefix}
2525
otherLocation: ${parameters.otherLocation}
2626
baseUrl: ${parameters.baseUrl}
27+
28+
hooks:
29+
postprovision:
30+
windows:
31+
run: |
32+
Write-Host "Web app URL: "
33+
Write-Host "$env:WEB_APP_URL" -ForegroundColor Cyan
34+
shell: pwsh
35+
continueOnError: false
36+
interactive: true
37+
posix:
38+
run: |
39+
echo "Web app URL: "
40+
echo $WEB_APP_URL
41+
shell: sh
42+
continueOnError: false
43+
interactive: true

infra/deploy_ai_foundry.bicep

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ param embeddingModel string
1010
param embeddingDeploymentCapacity int
1111
param managedIdentityObjectId string
1212

13-
var storageName = '${solutionName}hubstorage'
13+
var storageName = 'st${solutionName}hub'
1414
var storageSkuName = 'Standard_LRS'
15-
var aiServicesName = '${solutionName}-aiservices'
15+
var aiServicesName = 'ais-${solutionName}'
1616
// var aiServicesName_m = '${solutionName}-aiservices_m'
1717
// var location_m = solutionLocation
18-
var applicationInsightsName = '${solutionName}-appinsights'
19-
var containerRegistryName = '${solutionName}acr'
20-
var keyvaultName = '${solutionName}-kv'
18+
var applicationInsightsName = 'appi-${solutionName}'
19+
var containerRegistryName = 'cr-${solutionName}'
20+
var keyvaultName = 'kv-${solutionName}'
2121
var location = solutionLocation //'eastus2'
22-
var aiHubName = '${solutionName}-aihub'
22+
var aiHubName = 'hub-${solutionName}'
2323
var aiHubFriendlyName = aiHubName
2424
var aiHubDescription = 'AI Hub'
25-
var aiProjectName = '${solutionName}-aiproject'
25+
var aiProjectName = 'proj-${solutionName}'
2626
var aiProjectFriendlyName = aiProjectName
27-
var aiSearchName = '${solutionName}-search'
28-
var workspaceName = '${solutionName}-workspace'
27+
var aiSearchName = 'srch-${solutionName}'
28+
var workspaceName = 'log-${solutionName}-hub'
2929
var aiModelDeployments = [
3030
{
3131
name: gptModelName

infra/deploy_app_service.bicep

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ param solutionName string
1212
// param identity string
1313

1414
@description('Name of App Service plan')
15-
param HostingPlanName string = '${ solutionName }-app-service-plan'
15+
param HostingPlanName string = 'asp-${ solutionName }'
1616

1717
@description('The pricing tier for the App Service plan')
1818
@allowed(
1919
['F1', 'D1', 'B1', 'B2', 'B3', 'S1', 'S2', 'S3', 'P1', 'P2', 'P3', 'P4','P0v3']
2020
)
2121
// param HostingPlanSku string = 'B1'
2222

23-
param HostingPlanSku string = 'P0v3'
23+
param HostingPlanSku string = 'B1'
2424

2525
@description('Name of Web App')
26-
param WebsiteName string = '${ solutionName }-app-service'
26+
param WebsiteName string = 'app-${ solutionName }'
2727

2828
// @description('Name of Application Insights')
2929
// param ApplicationInsightsName string = '${ solutionName }-app-insights'

infra/deploy_cosmos_db.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ param solutionName string
55
param solutionLocation string
66
param keyVaultName string
77

8-
var accountName = '${ solutionName }-cosmos'
8+
var accountName = 'cosmos-${ solutionName }'
99
var databaseName = 'db_conversation_history'
1010
var collectionName = 'conversations'
1111

infra/deploy_keyvault.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ param solutionName string
55
param solutionLocation string
66
param managedIdentityObjectId string
77

8-
var keyvaultName = '${solutionName}-kv'
8+
var keyvaultName = 'kv-${solutionName}'
99

1010
resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = {
1111
name: keyvaultName

infra/deploy_managed_identity.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ param solutionName string
1010
param solutionLocation string
1111

1212
@description('Name')
13-
param miName string = '${ solutionName }-managed-identity'
13+
param miName string = 'id-${ solutionName }'
1414

1515
resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
1616
name: miName

infra/deploy_post_deployment_scripts.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ param managedIdentityObjectId string
77
param managedIdentityClientId string
88
param storageAccountName string
99
param containerName string
10-
param containerAppName string = '${ solutionName }containerapp'
11-
param environmentName string = '${ solutionName }containerappenv'
10+
param containerAppName string = 'ca-${ solutionName }'
11+
param environmentName string = 'cae-${ solutionName }'
1212
param imageName string = 'python:3.11-alpine'
1313
param setupCopyKbFiles string = '${baseUrl}infra/scripts/copy_kb_files.sh'
1414
param setupCreateIndexScriptsUrl string = '${baseUrl}infra/scripts/run_create_index_scripts.sh'

infra/deploy_storage_account.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ param solutionName string
1010
param solutionLocation string
1111

1212
@description('Name')
13-
param saName string = '${ solutionName }storage'
13+
param saName string = 'st${ solutionName }'
1414

1515
param keyVaultName string
1616
param managedIdentityObjectId string

infra/main.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ var resourceGroupLocation = resourceGroup().location
6262
var solutionLocation = resourceGroupLocation
6363
var baseUrl = 'https://raw.githubusercontent.com/microsoft/document-generation-solution-accelerator/main/'
6464

65-
var ApplicationInsightsName = 'appins-${solutionPrefix}'
66-
var WorkspaceName = 'worksp-${solutionPrefix}'
65+
var ApplicationInsightsName = 'appi-${solutionPrefix}'
66+
var WorkspaceName = 'log-${solutionPrefix}'
6767

6868
// ========== Managed Identity ========== //
6969
module managedIdentityModule 'deploy_managed_identity.bicep' = {

0 commit comments

Comments
 (0)