Skip to content

Commit 998dcdf

Browse files
TravisHilbertTravisHilbert
committed
Name changes
1 parent 5d5db22 commit 998dcdf

File tree

4 files changed

+44
-44
lines changed

4 files changed

+44
-44
lines changed

‎infra/deploy_ai_foundry.bicep‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ param aiServicesEndpoint string
99
param aiServicesKey string
1010
param aiServicesId string
1111

12-
var storageName = '${solutionName}hubstr'
12+
var storageName = '${solutionName}hubst'
1313
var storageSkuName = 'Standard_LRS'
1414
var aiServicesName = '${solutionName}-ais'
15-
var workspaceName = '${solutionName}-wrksp'
15+
var workspaceName = '${solutionName}-log'
1616
var keyvaultName = '${solutionName}-kv'
1717
var location = solutionLocation
18-
var azureAiHubName = '${solutionName}-aihub'
18+
var azureAiHubName = '${solutionName}-hub'
1919
var aiHubFriendlyName = azureAiHubName
2020
var aiHubDescription = 'AI Hub for KM template'
21-
var aiProjectName = '${solutionName}-aiprj'
21+
var aiProjectName = '${solutionName}-prj'
2222
var aiProjectFriendlyName = aiProjectName
2323
var aiSearchName = '${solutionName}-srch'
2424

‎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 }-mng-id'
13+
param miName string = '${ solutionName }-id'
1414

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

‎infra/main.bicep‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var deploymentType = 'GlobalStandard'
4747
var containerName = 'appstorage'
4848
var llmModel = 'gpt-4o'
4949
var storageSkuName = 'Standard_LRS'
50-
var storageContainerName = '${ResourcePrefix}cts'
50+
var storageContainerName = '${ResourcePrefix}cast'
5151
var gptModelVersion = '2024-08-06'
5252
var azureAiServicesName = '${ResourcePrefix}-ais'
5353

@@ -153,10 +153,10 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.9.1
153153
}
154154

155155
module databaseAccount 'br/public:avm/res/document-db/database-account:0.9.0' = {
156-
name: toLower('${ResourcePrefix}database')
156+
name: toLower('${ResourcePrefix}cosmos')
157157
params: {
158158
// Required parameters
159-
name: toLower('${ResourcePrefix}databaseAccount')
159+
name: toLower('${ResourcePrefix}cosno')
160160
// Non-required parameters
161161
enableAnalyticalStorage: true
162162
location: dblocation
@@ -220,7 +220,7 @@ module databaseAccount 'br/public:avm/res/document-db/database-account:0.9.0' =
220220
}
221221

222222
module containerAppFrontend 'br/public:avm/res/app/container-app:0.13.0' = {
223-
name: toLower('${ResourcePrefix}Frontend')
223+
name: toLower('${ResourcePrefix}-Fnt-ca')
224224
params: {
225225
managedIdentities: {
226226
systemAssigned: true
@@ -250,15 +250,15 @@ module containerAppFrontend 'br/public:avm/res/app/container-app:0.13.0' = {
250250
scaleMinReplicas: 1
251251
scaleMaxReplicas: 1
252252
environmentResourceId: containerAppsEnvironment.outputs.resourceId
253-
name: toLower('${ResourcePrefix}Frontend')
253+
name: toLower('${ResourcePrefix}Fnt')
254254
// Non-required parameters
255255
location: location
256256
}
257257
}
258258

259259

260260
resource containerAppBackend 'Microsoft.App/containerApps@2023-05-01' = {
261-
name: toLower('${ResourcePrefix}Backend')
261+
name: toLower('${ResourcePrefix}Bck-ca')
262262
location: location
263263
identity: {
264264
type: 'SystemAssigned'

‎infra/main.json‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.34.44.8038",
8-
"templateHash": "372840055428460103"
8+
"templateHash": "1388245659062904286"
99
}
1010
},
1111
"parameters": {
@@ -68,7 +68,7 @@
6868
"containerName": "appstorage",
6969
"llmModel": "gpt-4o",
7070
"storageSkuName": "Standard_LRS",
71-
"storageContainerName": "[format('{0}cts', variables('ResourcePrefix'))]",
71+
"storageContainerName": "[format('{0}cast', variables('ResourcePrefix'))]",
7272
"gptModelVersion": "2024-08-06",
7373
"azureAiServicesName": "[format('{0}-ais', variables('ResourcePrefix'))]",
7474
"aiModelDeployments": [
@@ -134,7 +134,7 @@
134134
{
135135
"type": "Microsoft.App/containerApps",
136136
"apiVersion": "2023-05-01",
137-
"name": "[toLower(format('{0}Backend', variables('ResourcePrefix')))]",
137+
"name": "[toLower(format('{0}Bck-ca', variables('ResourcePrefix')))]",
138138
"location": "[variables('location')]",
139139
"identity": {
140140
"type": "SystemAssigned"
@@ -159,7 +159,7 @@
159159
"env": [
160160
{
161161
"name": "COSMOSDB_ENDPOINT",
162-
"value": "[reference(resourceId('Microsoft.Resources/deployments', toLower(format('{0}database', variables('ResourcePrefix')))), '2022-09-01').outputs.endpoint.value]"
162+
"value": "[reference(resourceId('Microsoft.Resources/deployments', toLower(format('{0}cosmos', variables('ResourcePrefix')))), '2022-09-01').outputs.endpoint.value]"
163163
},
164164
{
165165
"name": "COSMOSDB_DATABASE",
@@ -229,7 +229,7 @@
229229
"dependsOn": [
230230
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_ai_foundry')]",
231231
"[resourceId('Microsoft.Resources/deployments', toLower(format('{0}conAppsEnv', variables('ResourcePrefix'))))]",
232-
"[resourceId('Microsoft.Resources/deployments', toLower(format('{0}database', variables('ResourcePrefix'))))]",
232+
"[resourceId('Microsoft.Resources/deployments', toLower(format('{0}cosmos', variables('ResourcePrefix'))))]",
233233
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageContainerName'))]"
234234
]
235235
},
@@ -290,28 +290,28 @@
290290
"type": "Microsoft.Authorization/roleAssignments",
291291
"apiVersion": "2022-04-01",
292292
"scope": "[format('Microsoft.Storage/storageAccounts/{0}', variables('storageContainerName'))]",
293-
"name": "[guid(resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix')))), 'Storage Blob Data Contributor')]",
293+
"name": "[guid(resourceId('Microsoft.App/containerApps', toLower(format('{0}Bck-ca', variables('ResourcePrefix')))), 'Storage Blob Data Contributor')]",
294294
"properties": {
295295
"roleDefinitionId": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe')]",
296-
"principalId": "[reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix')))), '2023-05-01', 'full').identity.principalId]"
296+
"principalId": "[reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}Bck-ca', variables('ResourcePrefix')))), '2023-05-01', 'full').identity.principalId]"
297297
},
298298
"dependsOn": [
299-
"[resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix'))))]",
299+
"[resourceId('Microsoft.App/containerApps', toLower(format('{0}Bck-ca', variables('ResourcePrefix'))))]",
300300
"[resourceId('Microsoft.Storage/storageAccounts', variables('storageContainerName'))]"
301301
]
302302
},
303303
{
304304
"type": "Microsoft.Authorization/roleAssignments",
305305
"apiVersion": "2022-04-01",
306306
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', variables('azureAiServicesName'))]",
307-
"name": "[guid(resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix')))), variables('openAiContributorRoleId'))]",
307+
"name": "[guid(resourceId('Microsoft.App/containerApps', toLower(format('{0}Bck-ca', variables('ResourcePrefix')))), variables('openAiContributorRoleId'))]",
308308
"properties": {
309309
"roleDefinitionId": "[subscriptionResourceId('Microsoft.Authorization/roleDefinitions', variables('openAiContributorRoleId'))]",
310-
"principalId": "[reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix')))), '2023-05-01', 'full').identity.principalId]"
310+
"principalId": "[reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}Bck-ca', variables('ResourcePrefix')))), '2023-05-01', 'full').identity.principalId]"
311311
},
312312
"dependsOn": [
313313
"[resourceId('Microsoft.CognitiveServices/accounts', variables('azureAiServicesName'))]",
314-
"[resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix'))))]"
314+
"[resourceId('Microsoft.App/containerApps', toLower(format('{0}Bck-ca', variables('ResourcePrefix'))))]"
315315
]
316316
},
317317
{
@@ -354,7 +354,7 @@
354354
"_generator": {
355355
"name": "bicep",
356356
"version": "0.34.44.8038",
357-
"templateHash": "15524749849693178338"
357+
"templateHash": "107965290127824528"
358358
}
359359
},
360360
"parameters": {
@@ -374,7 +374,7 @@
374374
},
375375
"miName": {
376376
"type": "string",
377-
"defaultValue": "[format('{0}-mng-id', parameters('solutionName'))]",
377+
"defaultValue": "[format('{0}-id', parameters('solutionName'))]",
378378
"metadata": {
379379
"description": "Name"
380380
}
@@ -590,7 +590,7 @@
590590
"_generator": {
591591
"name": "bicep",
592592
"version": "0.34.44.8038",
593-
"templateHash": "1990190368109519471"
593+
"templateHash": "9573081501419024290"
594594
}
595595
},
596596
"parameters": {
@@ -623,16 +623,16 @@
623623
}
624624
},
625625
"variables": {
626-
"storageName": "[format('{0}hubstr', parameters('solutionName'))]",
626+
"storageName": "[format('{0}hubst', parameters('solutionName'))]",
627627
"storageSkuName": "Standard_LRS",
628628
"aiServicesName": "[format('{0}-ais', parameters('solutionName'))]",
629-
"workspaceName": "[format('{0}-wrksp', parameters('solutionName'))]",
629+
"workspaceName": "[format('{0}-log', parameters('solutionName'))]",
630630
"keyvaultName": "[format('{0}-kv', parameters('solutionName'))]",
631631
"location": "[parameters('solutionLocation')]",
632-
"aiHubName": "[format('{0}-aihub', parameters('solutionName'))]",
633-
"aiHubFriendlyName": "[variables('aiHubName')]",
632+
"azureAiHubName": "[format('{0}-hub', parameters('solutionName'))]",
633+
"aiHubFriendlyName": "[variables('azureAiHubName')]",
634634
"aiHubDescription": "AI Hub for KM template",
635-
"aiProjectName": "[format('{0}-aiprj', parameters('solutionName'))]",
635+
"aiProjectName": "[format('{0}-prj', parameters('solutionName'))]",
636636
"aiProjectFriendlyName": "[variables('aiProjectName')]",
637637
"aiSearchName": "[format('{0}-srch', parameters('solutionName'))]",
638638
"storageNameCleaned": "[replace(variables('storageName'), '-', '')]"
@@ -641,7 +641,7 @@
641641
{
642642
"type": "Microsoft.MachineLearningServices/workspaces/connections",
643643
"apiVersion": "2024-07-01-preview",
644-
"name": "[format('{0}/{1}', variables('aiHubName'), format('{0}-connection-AzureOpenAI', variables('aiHubName')))]",
644+
"name": "[format('{0}/{1}', variables('azureAiHubName'), format('{0}-connection-AzureOpenAI', variables('azureAiHubName')))]",
645645
"properties": {
646646
"category": "AIServices",
647647
"target": "[parameters('aiServicesEndpoint')]",
@@ -656,7 +656,7 @@
656656
}
657657
},
658658
"dependsOn": [
659-
"[resourceId('Microsoft.MachineLearningServices/workspaces', variables('aiHubName'))]"
659+
"[resourceId('Microsoft.MachineLearningServices/workspaces', variables('azureAiHubName'))]"
660660
]
661661
},
662662
{
@@ -742,7 +742,7 @@
742742
{
743743
"type": "Microsoft.MachineLearningServices/workspaces",
744744
"apiVersion": "2023-08-01-preview",
745-
"name": "[variables('aiHubName')]",
745+
"name": "[variables('azureAiHubName')]",
746746
"location": "[variables('location')]",
747747
"identity": {
748748
"type": "SystemAssigned"
@@ -769,10 +769,10 @@
769769
},
770770
"properties": {
771771
"friendlyName": "[variables('aiProjectFriendlyName')]",
772-
"hubResourceId": "[resourceId('Microsoft.MachineLearningServices/workspaces', variables('aiHubName'))]"
772+
"hubResourceId": "[resourceId('Microsoft.MachineLearningServices/workspaces', variables('azureAiHubName'))]"
773773
},
774774
"dependsOn": [
775-
"[resourceId('Microsoft.MachineLearningServices/workspaces', variables('aiHubName'))]"
775+
"[resourceId('Microsoft.MachineLearningServices/workspaces', variables('azureAiHubName'))]"
776776
]
777777
},
778778
{
@@ -1571,15 +1571,15 @@
15711571
{
15721572
"type": "Microsoft.Resources/deployments",
15731573
"apiVersion": "2022-09-01",
1574-
"name": "[toLower(format('{0}database', variables('ResourcePrefix')))]",
1574+
"name": "[toLower(format('{0}cosmos', variables('ResourcePrefix')))]",
15751575
"properties": {
15761576
"expressionEvaluationOptions": {
15771577
"scope": "inner"
15781578
},
15791579
"mode": "Incremental",
15801580
"parameters": {
15811581
"name": {
1582-
"value": "[toLower(format('{0}databaseAccount', variables('ResourcePrefix')))]"
1582+
"value": "[toLower(format('{0}cosno', variables('ResourcePrefix')))]"
15831583
},
15841584
"enableAnalyticalStorage": {
15851585
"value": true
@@ -5387,7 +5387,7 @@
53875387
{
53885388
"type": "Microsoft.Resources/deployments",
53895389
"apiVersion": "2022-09-01",
5390-
"name": "[toLower(format('{0}Frontend', variables('ResourcePrefix')))]",
5390+
"name": "[toLower(format('{0}-Fnt-ca', variables('ResourcePrefix')))]",
53915391
"properties": {
53925392
"expressionEvaluationOptions": {
53935393
"scope": "inner"
@@ -5408,7 +5408,7 @@
54085408
"env": [
54095409
{
54105410
"name": "API_URL",
5411-
"value": "[format('https://{0}', reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix')))), '2023-05-01').configuration.ingress.fqdn)]"
5411+
"value": "[format('https://{0}', reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}Bck-ca', variables('ResourcePrefix')))), '2023-05-01').configuration.ingress.fqdn)]"
54125412
}
54135413
],
54145414
"image": "[format('cmsacontainerreg.azurecr.io/cmsafrontend:{0}', variables('imageVersion'))]",
@@ -5436,7 +5436,7 @@
54365436
"value": "[reference(resourceId('Microsoft.Resources/deployments', toLower(format('{0}conAppsEnv', variables('ResourcePrefix')))), '2022-09-01').outputs.resourceId.value]"
54375437
},
54385438
"name": {
5439-
"value": "[toLower(format('{0}Frontend', variables('ResourcePrefix')))]"
5439+
"value": "[toLower(format('{0}Fnt', variables('ResourcePrefix')))]"
54405440
},
54415441
"location": {
54425442
"value": "[variables('location')]"
@@ -6608,7 +6608,7 @@
66086608
}
66096609
},
66106610
"dependsOn": [
6611-
"[resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix'))))]",
6611+
"[resourceId('Microsoft.App/containerApps', toLower(format('{0}Bck-ca', variables('ResourcePrefix'))))]",
66126612
"[resourceId('Microsoft.Resources/deployments', toLower(format('{0}conAppsEnv', variables('ResourcePrefix'))))]",
66136613
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]"
66146614
]
@@ -6643,7 +6643,7 @@
66436643
}
66446644
},
66456645
"scriptContent": {
6646-
"value": "[format('az cosmosdb sql role assignment create --resource-group \"{0}\" --account-name \"{1}\" --role-definition-id \"{2}\" --scope \"{3}\" --principal-id \"{4}\"', resourceGroup().name, reference(resourceId('Microsoft.Resources/deployments', toLower(format('{0}database', variables('ResourcePrefix')))), '2022-09-01').outputs.name.value, resourceId('Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions', split(format('{0}/00000000-0000-0000-0000-000000000002', toLower(format('{0}database', variables('ResourcePrefix')))), '/')[0], split(format('{0}/00000000-0000-0000-0000-000000000002', toLower(format('{0}database', variables('ResourcePrefix')))), '/')[1]), reference(resourceId('Microsoft.Resources/deployments', toLower(format('{0}database', variables('ResourcePrefix')))), '2022-09-01').outputs.resourceId.value, reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix')))), '2023-05-01', 'full').identity.principalId)]"
6646+
"value": "[format('az cosmosdb sql role assignment create --resource-group \"{0}\" --account-name \"{1}\" --role-definition-id \"{2}\" --scope \"{3}\" --principal-id \"{4}\"', resourceGroup().name, reference(resourceId('Microsoft.Resources/deployments', toLower(format('{0}cosmos', variables('ResourcePrefix')))), '2022-09-01').outputs.name.value, resourceId('Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions', split(format('{0}/00000000-0000-0000-0000-000000000002', toLower(format('{0}cosmos', variables('ResourcePrefix')))), '/')[0], split(format('{0}/00000000-0000-0000-0000-000000000002', toLower(format('{0}cosmos', variables('ResourcePrefix')))), '/')[1]), reference(resourceId('Microsoft.Resources/deployments', toLower(format('{0}cosmos', variables('ResourcePrefix')))), '2022-09-01').outputs.resourceId.value, reference(resourceId('Microsoft.App/containerApps', toLower(format('{0}Bck-ca', variables('ResourcePrefix')))), '2023-05-01', 'full').identity.principalId)]"
66476647
}
66486648
},
66496649
"template": {
@@ -7172,8 +7172,8 @@
71727172
}
71737173
},
71747174
"dependsOn": [
7175-
"[resourceId('Microsoft.App/containerApps', toLower(format('{0}Backend', variables('ResourcePrefix'))))]",
7176-
"[resourceId('Microsoft.Resources/deployments', toLower(format('{0}database', variables('ResourcePrefix'))))]",
7175+
"[resourceId('Microsoft.App/containerApps', toLower(format('{0}Bck-ca', variables('ResourcePrefix'))))]",
7176+
"[resourceId('Microsoft.Resources/deployments', toLower(format('{0}cosmos', variables('ResourcePrefix'))))]",
71777177
"[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', subscription().subscriptionId, resourceGroup().name), 'Microsoft.Resources/deployments', 'deploy_managed_identity')]"
71787178
]
71797179
}

0 commit comments

Comments
 (0)