Skip to content

Commit f759ce1

Browse files
Roopan-MicrosoftRoopan-Microsoft
authored
Merge pull request #368 from microsoft/gh-issue-fix-2apr
refactor: update naming conventions for resources in Bicep files
2 parents 5f7962b + 2f6f62b commit f759ce1

10 files changed

+73
-56
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' = {

‎infra/main.json‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"metadata": {
55
"_generator": {
66
"name": "bicep",
7-
"version": "0.34.1.11899",
8-
"templateHash": "10534846592360054965"
7+
"version": "0.34.44.8038",
8+
"templateHash": "745056846550767942"
99
}
1010
},
1111
"parameters": {
@@ -93,8 +93,8 @@
9393
"resourceGroupLocation": "[resourceGroup().location]",
9494
"solutionLocation": "[variables('resourceGroupLocation')]",
9595
"baseUrl": "https://raw.githubusercontent.com/microsoft/document-generation-solution-accelerator/main/",
96-
"ApplicationInsightsName": "[format('appins-{0}', variables('solutionPrefix'))]",
97-
"WorkspaceName": "[format('worksp-{0}', variables('solutionPrefix'))]"
96+
"ApplicationInsightsName": "[format('appi-{0}', variables('solutionPrefix'))]",
97+
"WorkspaceName": "[format('log-{0}', variables('solutionPrefix'))]"
9898
},
9999
"resources": [
100100
{
@@ -150,8 +150,8 @@
150150
"metadata": {
151151
"_generator": {
152152
"name": "bicep",
153-
"version": "0.34.1.11899",
154-
"templateHash": "5321954130579291970"
153+
"version": "0.34.44.8038",
154+
"templateHash": "16854919160820907978"
155155
}
156156
},
157157
"parameters": {
@@ -171,7 +171,7 @@
171171
},
172172
"miName": {
173173
"type": "string",
174-
"defaultValue": "[format('{0}-managed-identity', parameters('solutionName'))]",
174+
"defaultValue": "[format('id-{0}', parameters('solutionName'))]",
175175
"metadata": {
176176
"description": "Name"
177177
}
@@ -243,8 +243,8 @@
243243
"metadata": {
244244
"_generator": {
245245
"name": "bicep",
246-
"version": "0.34.1.11899",
247-
"templateHash": "15644309813710584263"
246+
"version": "0.34.44.8038",
247+
"templateHash": "998804936838864872"
248248
}
249249
},
250250
"parameters": {
@@ -264,7 +264,7 @@
264264
}
265265
},
266266
"variables": {
267-
"keyvaultName": "[format('{0}-kv', parameters('solutionName'))]"
267+
"keyvaultName": "[format('kv-{0}', parameters('solutionName'))]"
268268
},
269269
"resources": [
270270
{
@@ -383,8 +383,8 @@
383383
"metadata": {
384384
"_generator": {
385385
"name": "bicep",
386-
"version": "0.34.1.11899",
387-
"templateHash": "6241332452423283350"
386+
"version": "0.34.44.8038",
387+
"templateHash": "15569997416548251984"
388388
}
389389
},
390390
"parameters": {
@@ -420,20 +420,20 @@
420420
}
421421
},
422422
"variables": {
423-
"storageName": "[format('{0}hubstorage', parameters('solutionName'))]",
423+
"storageName": "[format('st{0}hub', parameters('solutionName'))]",
424424
"storageSkuName": "Standard_LRS",
425-
"aiServicesName": "[format('{0}-aiservices', parameters('solutionName'))]",
426-
"applicationInsightsName": "[format('{0}-appinsights', parameters('solutionName'))]",
427-
"containerRegistryName": "[format('{0}acr', parameters('solutionName'))]",
428-
"keyvaultName": "[format('{0}-kv', parameters('solutionName'))]",
425+
"aiServicesName": "[format('ais-{0}', parameters('solutionName'))]",
426+
"applicationInsightsName": "[format('appi-{0}', parameters('solutionName'))]",
427+
"containerRegistryName": "[format('cr-{0}', parameters('solutionName'))]",
428+
"keyvaultName": "[format('kv-{0}', parameters('solutionName'))]",
429429
"location": "[parameters('solutionLocation')]",
430-
"aiHubName": "[format('{0}-aihub', parameters('solutionName'))]",
430+
"aiHubName": "[format('hub-{0}', parameters('solutionName'))]",
431431
"aiHubFriendlyName": "[variables('aiHubName')]",
432432
"aiHubDescription": "AI Hub",
433-
"aiProjectName": "[format('{0}-aiproject', parameters('solutionName'))]",
433+
"aiProjectName": "[format('proj-{0}', parameters('solutionName'))]",
434434
"aiProjectFriendlyName": "[variables('aiProjectName')]",
435-
"aiSearchName": "[format('{0}-search', parameters('solutionName'))]",
436-
"workspaceName": "[format('{0}-workspace', parameters('solutionName'))]",
435+
"aiSearchName": "[format('srch-{0}', parameters('solutionName'))]",
436+
"workspaceName": "[format('log-{0}-hub', parameters('solutionName'))]",
437437
"aiModelDeployments": [
438438
{
439439
"name": "[parameters('gptModelName')]",
@@ -981,8 +981,8 @@
981981
"metadata": {
982982
"_generator": {
983983
"name": "bicep",
984-
"version": "0.34.1.11899",
985-
"templateHash": "5169332991642386736"
984+
"version": "0.34.44.8038",
985+
"templateHash": "4051638923493896337"
986986
}
987987
},
988988
"parameters": {
@@ -1002,7 +1002,7 @@
10021002
},
10031003
"saName": {
10041004
"type": "string",
1005-
"defaultValue": "[format('{0}storage', parameters('solutionName'))]",
1005+
"defaultValue": "[format('st{0}', parameters('solutionName'))]",
10061006
"metadata": {
10071007
"description": "Name"
10081008
}
@@ -1210,8 +1210,8 @@
12101210
"metadata": {
12111211
"_generator": {
12121212
"name": "bicep",
1213-
"version": "0.34.1.11899",
1214-
"templateHash": "12565043404933150402"
1213+
"version": "0.34.44.8038",
1214+
"templateHash": "4077975888118623954"
12151215
}
12161216
},
12171217
"parameters": {
@@ -1225,14 +1225,14 @@
12251225
},
12261226
"HostingPlanName": {
12271227
"type": "string",
1228-
"defaultValue": "[format('{0}-app-service-plan', parameters('solutionName'))]",
1228+
"defaultValue": "[format('asp-{0}', parameters('solutionName'))]",
12291229
"metadata": {
12301230
"description": "Name of App Service plan"
12311231
}
12321232
},
12331233
"HostingPlanSku": {
12341234
"type": "string",
1235-
"defaultValue": "P0v3",
1235+
"defaultValue": "B1",
12361236
"allowedValues": [
12371237
"F1",
12381238
"D1",
@@ -1254,7 +1254,7 @@
12541254
},
12551255
"WebsiteName": {
12561256
"type": "string",
1257-
"defaultValue": "[format('{0}-app-service', parameters('solutionName'))]",
1257+
"defaultValue": "[format('app-{0}', parameters('solutionName'))]",
12581258
"metadata": {
12591259
"description": "Name of Web App"
12601260
}
@@ -1696,8 +1696,8 @@
16961696
"metadata": {
16971697
"_generator": {
16981698
"name": "bicep",
1699-
"version": "0.34.1.11899",
1700-
"templateHash": "11157199356947505887"
1699+
"version": "0.34.44.8038",
1700+
"templateHash": "6611317231290784098"
17011701
}
17021702
},
17031703
"parameters": {
@@ -1730,7 +1730,7 @@
17301730
}
17311731
},
17321732
"variables": {
1733-
"accountName": "[format('{0}-cosmos', parameters('solutionName'))]",
1733+
"accountName": "[format('cosmos-{0}', parameters('solutionName'))]",
17341734
"databaseName": "db_conversation_history",
17351735
"collectionName": "conversations",
17361736
"containers": [
@@ -1919,8 +1919,8 @@
19191919
"metadata": {
19201920
"_generator": {
19211921
"name": "bicep",
1922-
"version": "0.34.1.11899",
1923-
"templateHash": "16100001477502640669"
1922+
"version": "0.34.44.8038",
1923+
"templateHash": "17578272684671627358"
19241924
}
19251925
},
19261926
"parameters": {
@@ -1953,11 +1953,11 @@
19531953
},
19541954
"containerAppName": {
19551955
"type": "string",
1956-
"defaultValue": "[format('{0}containerapp', parameters('solutionName'))]"
1956+
"defaultValue": "[format('ca-{0}', parameters('solutionName'))]"
19571957
},
19581958
"environmentName": {
19591959
"type": "string",
1960-
"defaultValue": "[format('{0}containerappenv', parameters('solutionName'))]"
1960+
"defaultValue": "[format('cae-{0}', parameters('solutionName'))]"
19611961
},
19621962
"imageName": {
19631963
"type": "string",

0 commit comments

Comments
 (0)