Skip to content

Commit d86f656

Browse files
Prajwal-MicrosoftPrajwal-Microsoft
committed
feat: Updated main.json with latest change
1 parent 7c461ed commit d86f656

File tree

1 file changed

+157
-16
lines changed

1 file changed

+157
-16
lines changed

‎infra/main.json‎

Lines changed: 157 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.36.1.42791",
9-
"templateHash": "12587990285876720392"
9+
"templateHash": "961802883849358046"
1010
},
1111
"name": "Content Processing Solution Accelerator",
1212
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -119,7 +119,6 @@
119119
},
120120
"enablePrivateNetworking": {
121121
"type": "bool",
122-
"defaultValue": true,
123122
"metadata": {
124123
"description": "Optional. Enable WAF for the deployment."
125124
}
@@ -15893,21 +15892,108 @@
1589315892
"zoneRedundancy": {
1589415893
"value": "Disabled"
1589515894
},
15895+
"roleAssignments": {
15896+
"value": [
15897+
{
15898+
"principalId": "[reference('avmContainerRegistryReader').outputs.principalId.value]",
15899+
"roleDefinitionIdOrName": "AcrPull",
15900+
"principalType": "ServicePrincipal"
15901+
}
15902+
]
15903+
},
1589615904
"tags": {
1589715905
"value": "[parameters('tags')]"
1589815906
}
1589915907
},
1590015908
"template": {
1590115909
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
15910+
"languageVersion": "2.0",
1590215911
"contentVersion": "1.0.0.0",
1590315912
"metadata": {
1590415913
"_generator": {
1590515914
"name": "bicep",
1590615915
"version": "0.36.1.42791",
15907-
"templateHash": "8441318505264724450"
15916+
"templateHash": "11910096117865508081"
1590815917
},
1590915918
"name": "Container Registry Module"
1591015919
},
15920+
"definitions": {
15921+
"roleAssignmentType": {
15922+
"type": "object",
15923+
"properties": {
15924+
"name": {
15925+
"type": "string",
15926+
"nullable": true,
15927+
"metadata": {
15928+
"description": "Optional. The name (as GUID) of the role assignment. If not provided, a GUID will be generated."
15929+
}
15930+
},
15931+
"roleDefinitionIdOrName": {
15932+
"type": "string",
15933+
"metadata": {
15934+
"description": "Required. The role to assign. You can provide either the display name of the role definition, the role definition GUID, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'."
15935+
}
15936+
},
15937+
"principalId": {
15938+
"type": "string",
15939+
"metadata": {
15940+
"description": "Required. The principal ID of the principal (user/group/identity) to assign the role to."
15941+
}
15942+
},
15943+
"principalType": {
15944+
"type": "string",
15945+
"allowedValues": [
15946+
"Device",
15947+
"ForeignGroup",
15948+
"Group",
15949+
"ServicePrincipal",
15950+
"User"
15951+
],
15952+
"nullable": true,
15953+
"metadata": {
15954+
"description": "Optional. The principal type of the assigned principal ID."
15955+
}
15956+
},
15957+
"description": {
15958+
"type": "string",
15959+
"nullable": true,
15960+
"metadata": {
15961+
"description": "Optional. The description of the role assignment."
15962+
}
15963+
},
15964+
"condition": {
15965+
"type": "string",
15966+
"nullable": true,
15967+
"metadata": {
15968+
"description": "Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase \"foo_storage_container\"."
15969+
}
15970+
},
15971+
"conditionVersion": {
15972+
"type": "string",
15973+
"allowedValues": [
15974+
"2.0"
15975+
],
15976+
"nullable": true,
15977+
"metadata": {
15978+
"description": "Optional. Version of the condition."
15979+
}
15980+
},
15981+
"delegatedManagedIdentityResourceId": {
15982+
"type": "string",
15983+
"nullable": true,
15984+
"metadata": {
15985+
"description": "Optional. The Resource Id of the delegated managed identity resource."
15986+
}
15987+
}
15988+
},
15989+
"metadata": {
15990+
"description": "An AVM-aligned type for a role assignment.",
15991+
"__bicep_imported_from!": {
15992+
"sourceTemplate": "br:mcr.microsoft.com/bicep/avm/utl/types/avm-common-types:0.5.1"
15993+
}
15994+
}
15995+
}
15996+
},
1591115997
"parameters": {
1591215998
"acrName": {
1591315999
"type": "string",
@@ -15942,6 +16028,16 @@
1594216028
"description": "Zone redundancy setting for the Azure Container Registry"
1594316029
}
1594416030
},
16031+
"roleAssignments": {
16032+
"type": "array",
16033+
"items": {
16034+
"$ref": "#/definitions/roleAssignmentType"
16035+
},
16036+
"nullable": true,
16037+
"metadata": {
16038+
"description": "Optional. Array of role assignments to create."
16039+
}
16040+
},
1594516041
"tags": {
1594616042
"type": "object",
1594716043
"defaultValue": {},
@@ -15950,8 +16046,8 @@
1595016046
}
1595116047
}
1595216048
},
15953-
"resources": [
15954-
{
16049+
"resources": {
16050+
"avmContainerRegistry": {
1595516051
"type": "Microsoft.Resources/deployments",
1595616052
"apiVersion": "2022-09-01",
1595716053
"name": "[parameters('acrName')]",
@@ -15976,6 +16072,9 @@
1597616072
"zoneRedundancy": {
1597716073
"value": "[parameters('zoneRedundancy')]"
1597816074
},
16075+
"roleAssignments": {
16076+
"value": "[parameters('roleAssignments')]"
16077+
},
1597916078
"tags": {
1598016079
"value": "[parameters('tags')]"
1598116080
}
@@ -18996,19 +19095,26 @@
1899619095
}
1899719096
}
1899819097
}
18999-
],
19098+
},
1900019099
"outputs": {
19100+
"name": {
19101+
"type": "string",
19102+
"value": "[reference('avmContainerRegistry').outputs.name.value]"
19103+
},
1900119104
"resourceId": {
1900219105
"type": "string",
19003-
"value": "[reference(resourceId('Microsoft.Resources/deployments', parameters('acrName')), '2022-09-01').outputs.resourceId.value]"
19106+
"value": "[reference('avmContainerRegistry').outputs.resourceId.value]"
1900419107
},
1900519108
"loginServer": {
1900619109
"type": "string",
19007-
"value": "[reference(resourceId('Microsoft.Resources/deployments', parameters('acrName')), '2022-09-01').outputs.loginServer.value]"
19110+
"value": "[reference('avmContainerRegistry').outputs.loginServer.value]"
1900819111
}
1900919112
}
1901019113
}
19011-
}
19114+
},
19115+
"dependsOn": [
19116+
"avmContainerRegistryReader"
19117+
]
1901219118
},
1901319119
"avmStorageAccount": {
1901419120
"type": "Microsoft.Resources/deployments",
@@ -30527,10 +30633,10 @@
3052730633
"dependsOn": [
3052830634
"avmContainerApp",
3052930635
"avmManagedIdentity",
30530-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
30531-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
3053230636
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
30637+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
3053330638
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
30639+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
3053430640
"avmVirtualNetwork",
3053530641
"logAnalyticsWorkspace"
3053630642
]
@@ -32868,8 +32974,8 @@
3286832974
"dependsOn": [
3286932975
"avmContainerApp",
3287032976
"avmManagedIdentity",
32871-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
3287232977
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
32978+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
3287332979
"avmVirtualNetwork"
3287432980
]
3287532981
},
@@ -49999,31 +50105,66 @@
4999950105
"CONTAINER_WEB_APP_NAME": {
5000050106
"type": "string",
5000150107
"metadata": {
50002-
"description": "The resource ID of the Container App Environment."
50108+
"description": "The name of the Container App used for Web App."
5000350109
},
5000450110
"value": "[reference('avmContainerApp_Web').outputs.name.value]"
5000550111
},
5000650112
"CONTAINER_API_APP_NAME": {
5000750113
"type": "string",
5000850114
"metadata": {
50009-
"description": "The resource ID of the Container App API."
50115+
"description": "The name of the Container App used for API."
5001050116
},
5001150117
"value": "[reference('avmContainerApp_API').outputs.name.value]"
5001250118
},
5001350119
"CONTAINER_WEB_APP_FQDN": {
5001450120
"type": "string",
5001550121
"metadata": {
50016-
"description": "The resource ID of the Container App Environment."
50122+
"description": "The FQDN of the Container App."
5001750123
},
5001850124
"value": "[reference('avmContainerApp_Web').outputs.fqdn.value]"
5001950125
},
5002050126
"CONTAINER_API_APP_FQDN": {
5002150127
"type": "string",
5002250128
"metadata": {
50023-
"description": "The resource ID of the Container App API."
50129+
"description": "The FQDN of the Container App API."
5002450130
},
5002550131
"value": "[reference('avmContainerApp_API').outputs.fqdn.value]"
5002650132
},
50133+
"CONTAINER_APP_NAME": {
50134+
"type": "string",
50135+
"metadata": {
50136+
"description": "The name of the Container App used for APP."
50137+
},
50138+
"value": "[reference('avmContainerApp').outputs.name.value]"
50139+
},
50140+
"CONTAINER_APP_USER_IDENTITY_ID": {
50141+
"type": "string",
50142+
"metadata": {
50143+
"description": "The user identity resource ID used fot the Container APP."
50144+
},
50145+
"value": "[reference('avmContainerRegistryReader').outputs.resourceId.value]"
50146+
},
50147+
"CONTAINER_APP_USER_PRINCIPAL_ID": {
50148+
"type": "string",
50149+
"metadata": {
50150+
"description": "The user identity Principal ID used fot the Container APP."
50151+
},
50152+
"value": "[reference('avmContainerRegistryReader').outputs.principalId.value]"
50153+
},
50154+
"CONTAINER_REGISTRY_NAME": {
50155+
"type": "string",
50156+
"metadata": {
50157+
"description": "The name of the Azure Container Registry."
50158+
},
50159+
"value": "[reference('avmContainerRegistry').outputs.name.value]"
50160+
},
50161+
"CONTAINER_REGISTRY_LOGIN_SERVER": {
50162+
"type": "string",
50163+
"metadata": {
50164+
"description": "The login server of the Azure Container Registry."
50165+
},
50166+
"value": "[reference('avmContainerRegistry').outputs.loginServer.value]"
50167+
},
5002750168
"resourceGroupName": {
5002850169
"type": "string",
5002950170
"metadata": {

0 commit comments

Comments
 (0)