Skip to content

Commit a8592ce

Browse files
Prajwal-MicrosoftPrajwal-Microsoft
authored
Merge pull request #562 from microsoft/psl-resolve-sfi-w18
fix: Fix to resolve SFI-W18 policy issue
2 parents a6e0b38 + 12392c3 commit a8592ce

3 files changed

Lines changed: 46 additions & 42 deletions

File tree

‎infra/main.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,8 @@ module avmContainerAppEnv 'br/public:avm/res/app/managed-environment:0.11.3' = {
914914
name: 'cae-${solutionSuffix}'
915915
location: location
916916
tags: {
917-
app: solutionSuffix
918-
location: location
917+
...resourceGroup().tags
918+
...tags
919919
}
920920
managedIdentities: { systemAssigned: true }
921921
appLogsConfiguration: enableMonitoring

‎infra/main.json‎

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.41.2.15936",
9-
"templateHash": "5358772599129171911"
8+
"version": "0.39.26.7824",
9+
"templateHash": "18378296288333564754"
1010
},
1111
"name": "Content Processing Solution Accelerator",
1212
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -348,8 +348,8 @@
348348
"metadata": {
349349
"_generator": {
350350
"name": "bicep",
351-
"version": "0.41.2.15936",
352-
"templateHash": "4055670269816744382"
351+
"version": "0.39.26.7824",
352+
"templateHash": "2779842231546071291"
353353
}
354354
},
355355
"definitions": {
@@ -19225,8 +19225,8 @@
1922519225
"metadata": {
1922619226
"_generator": {
1922719227
"name": "bicep",
19228-
"version": "0.41.2.15936",
19229-
"templateHash": "6350282028214740152"
19228+
"version": "0.39.26.7824",
19229+
"templateHash": "9967760373683235080"
1923019230
}
1923119231
},
1923219232
"parameters": {
@@ -23231,8 +23231,8 @@
2323123231
"metadata": {
2323223232
"_generator": {
2323323233
"name": "bicep",
23234-
"version": "0.41.2.15936",
23235-
"templateHash": "13929816981891754138"
23234+
"version": "0.39.26.7824",
23235+
"templateHash": "11438993289824448790"
2323623236
}
2323723237
},
2323823238
"parameters": {
@@ -23823,8 +23823,8 @@
2382323823
"metadata": {
2382423824
"_generator": {
2382523825
"name": "bicep",
23826-
"version": "0.41.2.15936",
23827-
"templateHash": "17694195801715707119"
23826+
"version": "0.39.26.7824",
23827+
"templateHash": "18073394536155497558"
2382823828
},
2382923829
"name": "Container Registry Module"
2383023830
},
@@ -35187,8 +35187,8 @@
3518735187
"avmContainerApp_API",
3518835188
"avmContainerApp_Workflow",
3518935189
"avmManagedIdentity",
35190-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3519135190
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
35191+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3519235192
"virtualNetwork"
3519335193
]
3519435194
},
@@ -35308,8 +35308,8 @@
3530835308
"metadata": {
3530935309
"_generator": {
3531035310
"name": "bicep",
35311-
"version": "0.41.2.15936",
35312-
"templateHash": "11676375352983709807"
35311+
"version": "0.39.26.7824",
35312+
"templateHash": "11365341673325597162"
3531335313
},
3531435314
"name": "Cognitive Services",
3531535315
"description": "This module deploys a Cognitive Service."
@@ -36558,8 +36558,8 @@
3655836558
"metadata": {
3655936559
"_generator": {
3656036560
"name": "bicep",
36561-
"version": "0.41.2.15936",
36562-
"templateHash": "8716336912243881623"
36561+
"version": "0.39.26.7824",
36562+
"templateHash": "15006072223125242147"
3656336563
}
3656436564
},
3656536565
"definitions": {
@@ -37522,7 +37522,7 @@
3752237522
"condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]",
3752337523
"type": "Microsoft.Authorization/locks",
3752437524
"apiVersion": "2020-05-01",
37525-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
37525+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
3752637526
"name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]",
3752737527
"properties": {
3752837528
"level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]",
@@ -37536,7 +37536,7 @@
3753637536
},
3753737537
"type": "Microsoft.Insights/diagnosticSettings",
3753837538
"apiVersion": "2021-05-01-preview",
37539-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
37539+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
3754037540
"name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]",
3754137541
"properties": {
3754237542
"copy": [
@@ -37574,7 +37574,7 @@
3757437574
},
3757537575
"type": "Microsoft.Authorization/roleAssignments",
3757637576
"apiVersion": "2022-04-01",
37577-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
37577+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
3757837578
"name": "[coalesce(tryGet(coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()], 'name'), guid(resourceId('Microsoft.CognitiveServices/accounts', parameters('name')), coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].principalId, coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId))]",
3757937579
"properties": {
3758037580
"roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]",
@@ -38367,8 +38367,8 @@
3836738367
"metadata": {
3836838368
"_generator": {
3836938369
"name": "bicep",
38370-
"version": "0.41.2.15936",
38371-
"templateHash": "10989408486030617267"
38370+
"version": "0.39.26.7824",
38371+
"templateHash": "12797226417049698978"
3837238372
}
3837338373
},
3837438374
"definitions": {
@@ -38521,8 +38521,8 @@
3852138521
"metadata": {
3852238522
"_generator": {
3852338523
"name": "bicep",
38524-
"version": "0.41.2.15936",
38525-
"templateHash": "7933643033523871028"
38524+
"version": "0.39.26.7824",
38525+
"templateHash": "422299638943108486"
3852638526
}
3852738527
},
3852838528
"definitions": {
@@ -38739,8 +38739,8 @@
3873938739
"metadata": {
3874038740
"_generator": {
3874138741
"name": "bicep",
38742-
"version": "0.41.2.15936",
38743-
"templateHash": "8716336912243881623"
38742+
"version": "0.39.26.7824",
38743+
"templateHash": "15006072223125242147"
3874438744
}
3874538745
},
3874638746
"definitions": {
@@ -39703,7 +39703,7 @@
3970339703
"condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]",
3970439704
"type": "Microsoft.Authorization/locks",
3970539705
"apiVersion": "2020-05-01",
39706-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
39706+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
3970739707
"name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]",
3970839708
"properties": {
3970939709
"level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]",
@@ -39717,7 +39717,7 @@
3971739717
},
3971839718
"type": "Microsoft.Insights/diagnosticSettings",
3971939719
"apiVersion": "2021-05-01-preview",
39720-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
39720+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
3972139721
"name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]",
3972239722
"properties": {
3972339723
"copy": [
@@ -39755,7 +39755,7 @@
3975539755
},
3975639756
"type": "Microsoft.Authorization/roleAssignments",
3975739757
"apiVersion": "2022-04-01",
39758-
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
39758+
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
3975939759
"name": "[coalesce(tryGet(coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()], 'name'), guid(resourceId('Microsoft.CognitiveServices/accounts', parameters('name')), coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].principalId, coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId))]",
3976039760
"properties": {
3976139761
"roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]",
@@ -40548,8 +40548,8 @@
4054840548
"metadata": {
4054940549
"_generator": {
4055040550
"name": "bicep",
40551-
"version": "0.41.2.15936",
40552-
"templateHash": "10989408486030617267"
40551+
"version": "0.39.26.7824",
40552+
"templateHash": "12797226417049698978"
4055340553
}
4055440554
},
4055540555
"definitions": {
@@ -40702,8 +40702,8 @@
4070240702
"metadata": {
4070340703
"_generator": {
4070440704
"name": "bicep",
40705-
"version": "0.41.2.15936",
40706-
"templateHash": "7933643033523871028"
40705+
"version": "0.39.26.7824",
40706+
"templateHash": "422299638943108486"
4070740707
}
4070840708
},
4070940709
"definitions": {
@@ -41721,10 +41721,10 @@
4172141721
},
4172241722
"dependsOn": [
4172341723
"avmAiServices",
41724-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
4172541724
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
41726-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
4172741725
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
41726+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
41727+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
4172841728
"virtualNetwork"
4172941729
]
4173041730
},
@@ -45022,9 +45022,9 @@
4502245022
},
4502345023
"dependsOn": [
4502445024
"avmAiServices_cu",
45025-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
4502645025
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
4502745026
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
45027+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
4502845028
"virtualNetwork"
4502945029
]
4503045030
},
@@ -45045,10 +45045,7 @@
4504545045
"value": "[parameters('location')]"
4504645046
},
4504745047
"tags": {
45048-
"value": {
45049-
"app": "[variables('solutionSuffix')]",
45050-
"location": "[parameters('location')]"
45051-
}
45048+
"value": "[shallowMerge(createArray(resourceGroup().tags, parameters('tags')))]"
4505245049
},
4505345050
"managedIdentities": {
4505445051
"value": {
@@ -68558,6 +68555,13 @@
6855868555
},
6855968556
"value": "[reference('avmContainerRegistry').outputs.loginServer.value]"
6856068557
},
68558+
"CONTENT_UNDERSTANDING_ACCOUNT_NAME": {
68559+
"type": "string",
68560+
"metadata": {
68561+
"description": "The name of the Content Understanding AI Services account."
68562+
},
68563+
"value": "[reference('avmAiServices_cu').outputs.name.value]"
68564+
},
6856168565
"AZURE_RESOURCE_GROUP": {
6856268566
"type": "string",
6856368567
"metadata": {

‎infra/main_custom.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,8 +917,8 @@ module avmContainerAppEnv 'br/public:avm/res/app/managed-environment:0.11.3' = {
917917
name: 'cae-${solutionSuffix}'
918918
location: location
919919
tags: {
920-
app: solutionSuffix
921-
location: location
920+
...resourceGroup().tags
921+
...tags
922922
}
923923
managedIdentities: { systemAssigned: true }
924924
appLogsConfiguration: enableMonitoring

0 commit comments

Comments
 (0)