Skip to content

Commit 83ef105

Browse files
tags chnaged
1 parent e45b056 commit 83ef105

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

infra/main.bicep

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ module appIdentity 'br/public:avm/res/managed-identity/user-assigned-identity:0.
184184
params: {
185185
name: userAssignedIdentityResourceName
186186
location: solutionLocation
187-
tags: tags
187+
tags: allTags
188188
enableTelemetry: enableTelemetry
189189
}
190190
}
@@ -218,7 +218,7 @@ module logAnalyticsWorkspace 'br/public:avm/res/operational-insights/workspace:0
218218
dataSources: enablePrivateNetworking
219219
? [
220220
{
221-
tags: tags
221+
tags: allTags
222222
eventLogName: 'Application'
223223
eventTypes: [
224224
{
@@ -282,7 +282,7 @@ module virtualNetwork './modules/virtualNetwork.bicep' = if (enablePrivateNetwor
282282
name: 'vnet-${solutionSuffix}'
283283
addressPrefixes: ['10.0.0.0/20']
284284
location: location
285-
tags: tags
285+
tags: allTags
286286
logAnalyticsWorkspaceId: enableMonitoring ? logAnalyticsWorkspaceResourceId : ''
287287
resourceSuffix: solutionSuffix
288288
enableTelemetry: enableTelemetry
@@ -312,7 +312,7 @@ module bastionHost 'br/public:avm/res/network/bastion-host:0.6.1' = if (enablePr
312312
}
313313
]
314314
: null
315-
tags: tags
315+
tags: allTags
316316
enableTelemetry: enableTelemetry
317317
publicIPAddressObject: {
318318
name: 'pip-${bastionHostName}'
@@ -330,7 +330,7 @@ module jumpboxVM 'br/public:avm/res/compute/virtual-machine:0.15.0' = if (enable
330330
location: location
331331
adminUsername: vmAdminUsername ?? 'JumpboxAdminUser'
332332
adminPassword: vmAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
333-
tags: tags
333+
tags: allTags
334334
zone: 0
335335
imageReference: {
336336
offer: 'WindowsServer'
@@ -437,7 +437,7 @@ module avmPrivateDnsZones 'br/public:avm/res/network/private-dns-zone:0.7.1' = [
437437
name: 'dns-zone-${i}'
438438
params: {
439439
name: zone
440-
tags: tags
440+
tags: allTags
441441
enableTelemetry: enableTelemetry
442442
virtualNetworkLinks: [
443443
{
@@ -535,7 +535,7 @@ module storageAccount 'br/public:avm/res/storage/storage-account:0.20.0' = {
535535
]
536536
}
537537
}
538-
dependsOn: [keyvault]
538+
// dependsOn: [keyvault]
539539
}
540540

541541
//========== AVM WAF ========== //
@@ -566,13 +566,13 @@ var processCosmosContainerName = 'processes'
566566
var agentTelemetryCosmosContainerName = 'agent_telemetry'
567567

568568
// ==========Key Vault Module ========== //
569-
var keyVaultName = 'KV-${solutionSuffix}' // Key Vault name must be between 3 and 24 characters in length and use numbers and lower-case letters only.
569+
var keyVaultName = 'kv-${solutionSuffix}' // Key Vault name must be between 3 and 24 characters in length and use numbers and lower-case letters only.
570570
module keyvault 'br/public:avm/res/key-vault/vault:0.12.1' = {
571571
name: take('avm.res.key-vault.vault.${keyVaultName}', 64)
572572
params: {
573573
name: keyVaultName
574574
location: solutionLocation
575-
tags: tags
575+
tags: allTags
576576
sku: 'standard'
577577
publicNetworkAccess: enablePrivateNetworking ? 'Disabled' : 'Enabled'
578578
networkAcls: {
@@ -650,7 +650,7 @@ module cosmosDb 'br/public:avm/res/document-db/database-account:0.15.0' = {
650650
params: {
651651
name: cosmosDbResourceName
652652
location: cosmosLocation
653-
tags: tags
653+
tags: allTags
654654
enableTelemetry: enableTelemetry
655655
sqlDatabases: [
656656
{
@@ -765,7 +765,7 @@ module cosmosDb 'br/public:avm/res/document-db/database-account:0.15.0' = {
765765
}
766766
]
767767
}
768-
dependsOn: [keyvault, storageAccount]
768+
dependsOn: [storageAccount]
769769
}
770770

771771
var aiModelDeploymentName = aiModelName
@@ -831,11 +831,11 @@ module aiFoundry 'br/public:avm/ptn/ai-ml/ai-foundry:0.4.0' = if(!useExistingAiF
831831
name: take('avm.ptn.ai-ml.ai-foundry.${solutionSuffix}', 64)
832832
params: {
833833
#disable-next-line BCP334
834-
baseName: take('aif-${solutionSuffix}', 12)
834+
baseName: take(aiFoundryAiServicesResourceName, 12)
835835
baseUniqueName: null
836836
location: azureAiServiceLocation
837-
838837
aiFoundryConfiguration: {
838+
accountName:aiFoundryAiServicesResourceName
839839
allowProjectManagement: true
840840
roleAssignments: [
841841
{
@@ -996,7 +996,7 @@ module avmAppConfigUpdated 'br/public:avm/res/app-configuration/configuration-st
996996
managedIdentities: { systemAssigned: true }
997997
sku: 'Standard'
998998
enableTelemetry: enableTelemetry
999-
tags: tags
999+
tags: allTags
10001000
disableLocalAuth: true
10011001
// Keep public access enabled for Container Apps access (Container Apps not in private network due to capacity constraints)
10021002
publicNetworkAccess: 'Enabled'

0 commit comments

Comments
 (0)