Skip to content

Commit b274954

Browse files
Abdul-MicrosoftAbdul-Microsoft
committed
updated main.json file
1 parent 83a8bdb commit b274954

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎infra/main.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.37.4.10188",
9-
"templateHash": "5055336374994058436"
9+
"templateHash": "14259315155038248870"
1010
},
1111
"name": "Content Processing Solution Accelerator",
1212
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -303,7 +303,7 @@
303303
},
304304
"addressPrefixes": {
305305
"value": [
306-
"10.0.0.0/20"
306+
"10.0.0.0/8"
307307
]
308308
},
309309
"location": {
@@ -328,7 +328,7 @@
328328
"_generator": {
329329
"name": "bicep",
330330
"version": "0.37.4.10188",
331-
"templateHash": "4658548157594615847"
331+
"templateHash": "14464809693505395958"
332332
}
333333
},
334334
"definitions": {
@@ -639,7 +639,7 @@
639639
{
640640
"name": "AzureBastionSubnet",
641641
"addressPrefixes": [
642-
"10.0.10.0/26"
642+
"10.0.1.32/27"
643643
],
644644
"networkSecurityGroup": {
645645
"name": "nsg-bastion",
@@ -703,28 +703,27 @@
703703
}
704704
},
705705
{
706-
"name": "jumpbox",
706+
"name": "admin",
707707
"addressPrefixes": [
708-
"10.0.12.0/23"
708+
"10.0.1.0/27"
709709
],
710710
"networkSecurityGroup": {
711-
"name": "nsg-jumpbox",
711+
"name": "nsg-admin",
712712
"securityRules": [
713713
{
714-
"name": "AllowRdpFromBastion",
714+
"name": "Deny-hop-outbound",
715715
"properties": {
716-
"access": "Allow",
717-
"direction": "Inbound",
718-
"priority": 100,
719-
"protocol": "Tcp",
716+
"access": "Deny",
717+
"direction": "Outbound",
718+
"priority": 200,
719+
"protocol": "*",
720720
"sourcePortRange": "*",
721-
"destinationPortRange": "3389",
722-
"sourceAddressPrefixes": [
723-
"10.0.10.0/26"
721+
"destinationPortRanges": [
722+
"3389",
723+
"22"
724724
],
725-
"destinationAddressPrefixes": [
726-
"10.0.12.0/23"
727-
]
725+
"sourceAddressPrefix": "VirtualNetwork",
726+
"destinationAddressPrefix": "*"
728727
}
729728
}
730729
]
@@ -3137,9 +3136,9 @@
31373136
"type": "string",
31383137
"value": "[if(contains(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'AzureBastionSubnet'), reference('virtualNetwork').outputs.subnetResourceIds.value[indexOf(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'AzureBastionSubnet')], '')]"
31393138
},
3140-
"jumpboxSubnetResourceId": {
3139+
"adminSubnetResourceId": {
31413140
"type": "string",
3142-
"value": "[if(contains(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'jumpbox'), reference('virtualNetwork').outputs.subnetResourceIds.value[indexOf(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'jumpbox')], '')]"
3141+
"value": "[if(contains(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'admin'), reference('virtualNetwork').outputs.subnetResourceIds.value[indexOf(map(parameters('subnets'), lambda('subnet', lambdaVariables('subnet').name)), 'admin')], '')]"
31433142
}
31443143
}
31453144
}
@@ -4515,7 +4514,7 @@
45154514
"ipConfigurations": [
45164515
{
45174516
"name": "ipconfig1",
4518-
"subnetResourceId": "[reference('virtualNetwork').outputs.jumpboxSubnetResourceId.value]"
4517+
"subnetResourceId": "[reference('virtualNetwork').outputs.adminSubnetResourceId.value]"
45194518
}
45204519
],
45214520
"diagnosticSettings": "[if(parameters('enableMonitoring'), createArray(createObject('name', 'jumpboxDiagnostics', 'workspaceResourceId', reference('logAnalyticsWorkspace').outputs.resourceId.value, 'logCategoriesAndGroups', createArray(createObject('categoryGroup', 'allLogs', 'enabled', true())), 'metricCategories', createArray(createObject('category', 'AllMetrics', 'enabled', true())))), null())]"
@@ -27271,7 +27270,7 @@
2727127270
},
2727227271
"allowBlobPublicAccess": "[if(parameters('enablePrivateNetworking'), createObject('value', true()), createObject('value', false()))]",
2727327272
"publicNetworkAccess": "[if(parameters('enablePrivateNetworking'), createObject('value', 'Disabled'), createObject('value', 'Enabled'))]",
27274-
"privateEndpoints": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', format('storage-private-endpoint-blob-{0}', variables('solutionSuffix')), 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('name', 'storage-dns-zone-group-blob', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)).outputs.resourceId.value))), 'subnetResourceId', reference('virtualNetwork').outputs.backendSubnetResourceId.value, 'service', 'blob'), createObject('name', format('storage-private-endpoint-queue-{0}', variables('solutionSuffix')), 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('name', 'storage-dns-zone-group-queue', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)).outputs.resourceId.value))), 'subnetResourceId', reference('virtualNetwork').outputs.backendSubnetResourceId.value, 'service', 'queue'))), createObject('value', createArray()))]"
27273+
"privateEndpoints": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', format('pep-blob-{0}', variables('solutionSuffix')), 'customNetworkInterfaceName', format('nic-blob-{0}', variables('solutionSuffix')), 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('name', 'storage-dns-zone-group-blob', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)).outputs.resourceId.value))), 'subnetResourceId', reference('virtualNetwork').outputs.backendSubnetResourceId.value, 'service', 'blob'), createObject('name', format('pep-queue-{0}', variables('solutionSuffix')), 'customNetworkInterfaceName', format('nic-queue-{0}', variables('solutionSuffix')), 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('name', 'storage-dns-zone-group-queue', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)).outputs.resourceId.value))), 'subnetResourceId', reference('virtualNetwork').outputs.backendSubnetResourceId.value, 'service', 'queue'))), createObject('value', createArray()))]"
2727527274
},
2727627275
"template": {
2727727276
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -32968,8 +32967,8 @@
3296832967
"avmContainerApp",
3296932968
"avmContainerApp_API",
3297032969
"avmManagedIdentity",
32971-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3297232970
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
32971+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
3297332972
"virtualNetwork"
3297432973
]
3297532974
},
@@ -33066,7 +33065,7 @@
3306633065
]
3306733066
},
3306833067
"publicNetworkAccess": "[if(parameters('enablePrivateNetworking'), createObject('value', 'Disabled'), createObject('value', 'Enabled'))]",
33069-
"privateEndpoints": "[if(and(parameters('enablePrivateNetworking'), empty(variables('existingProjectResourceId'))), createObject('value', createArray(createObject('name', format('ai-services-private-endpoint-{0}', variables('solutionSuffix')), 'privateEndpointResourceId', reference('virtualNetwork').outputs.resourceId.value, 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('name', 'ai-services-dns-zone-cognitiveservices', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)).outputs.resourceId.value), createObject('name', 'ai-services-dns-zone-openai', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)).outputs.resourceId.value), createObject('name', 'ai-services-dns-zone-aiservices', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)).outputs.resourceId.value), createObject('name', 'ai-services-dns-zone-contentunderstanding', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)).outputs.resourceId.value))), 'subnetResourceId', reference('virtualNetwork').outputs.backendSubnetResourceId.value))), createObject('value', createArray()))]"
33068+
"privateEndpoints": "[if(and(parameters('enablePrivateNetworking'), empty(variables('existingProjectResourceId'))), createObject('value', createArray(createObject('name', format('pep-aiservices-{0}', variables('solutionSuffix')), 'customNetworkInterfaceName', format('nic-aiservices-{0}', variables('solutionSuffix')), 'privateEndpointResourceId', reference('virtualNetwork').outputs.resourceId.value, 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('name', 'ai-services-dns-zone-cognitiveservices', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)).outputs.resourceId.value), createObject('name', 'ai-services-dns-zone-openai', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)).outputs.resourceId.value), createObject('name', 'ai-services-dns-zone-aiservices', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)).outputs.resourceId.value), createObject('name', 'ai-services-dns-zone-contentunderstanding', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)).outputs.resourceId.value))), 'subnetResourceId', reference('virtualNetwork').outputs.backendSubnetResourceId.value))), createObject('value', createArray()))]"
3307033069
},
3307133070
"template": {
3307233071
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -38710,10 +38709,10 @@
3871038709
"dependsOn": [
3871138710
"avmContainerApp",
3871238711
"avmManagedIdentity",
38713-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
3871438712
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
3871538713
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
3871638714
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
38715+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
3871738716
"logAnalyticsWorkspace",
3871838717
"virtualNetwork"
3871938718
]
@@ -38779,7 +38778,7 @@
3877938778
]
3878038779
},
3878138780
"publicNetworkAccess": "[if(parameters('enablePrivateNetworking'), createObject('value', 'Disabled'), createObject('value', 'Enabled'))]",
38782-
"privateEndpoints": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', format('aicu-private-endpoint-{0}', variables('solutionSuffix')), 'privateEndpointResourceId', reference('virtualNetwork').outputs.resourceId.value, 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('name', 'aicu-dns-zone-cognitiveservices', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)).outputs.resourceId.value), createObject('name', 'aicu-dns-zone-contentunderstanding', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)).outputs.resourceId.value))), 'subnetResourceId', reference('virtualNetwork').outputs.backendSubnetResourceId.value))), createObject('value', createArray()))]"
38781+
"privateEndpoints": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', format('pep-aicu-{0}', variables('solutionSuffix')), 'customNetworkInterfaceName', format('nic-aicu-{0}', variables('solutionSuffix')), 'privateEndpointResourceId', reference('virtualNetwork').outputs.resourceId.value, 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('name', 'aicu-dns-zone-cognitiveservices', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)).outputs.resourceId.value), createObject('name', 'aicu-dns-zone-contentunderstanding', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)).outputs.resourceId.value))), 'subnetResourceId', reference('virtualNetwork').outputs.backendSubnetResourceId.value))), createObject('value', createArray()))]"
3878338782
},
3878438783
"template": {
3878538784
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -41051,8 +41050,8 @@
4105141050
"dependsOn": [
4105241051
"avmContainerApp",
4105341052
"avmManagedIdentity",
41054-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
4105541053
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
41054+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
4105641055
"virtualNetwork"
4105741056
]
4105841057
},
@@ -41993,7 +41992,7 @@
4199341992
"mode": "Incremental",
4199441993
"parameters": {
4199541994
"name": {
41996-
"value": "[format('acr-reader-mid{0}', variables('solutionSuffix'))]"
41995+
"value": "[format('id-acr-{0}', variables('solutionSuffix'))]"
4199741996
},
4199841997
"location": {
4199941998
"value": "[parameters('resourceGroupLocation')]"
@@ -47160,7 +47159,7 @@
4716047159
"virtualNetworkRules": []
4716147160
}
4716247161
},
47163-
"privateEndpoints": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', format('cosmosdb-private-endpoint-{0}', variables('solutionSuffix')), 'privateEndpointResourceId', reference('virtualNetwork').outputs.resourceId.value, 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('name', 'cosmosdb-dns-zone-group', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cosmosDB)).outputs.resourceId.value))), 'service', 'MongoDB', 'subnetResourceId', reference('virtualNetwork').outputs.backendSubnetResourceId.value))), createObject('value', createArray()))]"
47162+
"privateEndpoints": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', format('pep-cosmosdb-{0}', variables('solutionSuffix')), 'customNetworkInterfaceName', format('nic-cosmosdb-{0}', variables('solutionSuffix')), 'privateEndpointResourceId', reference('virtualNetwork').outputs.resourceId.value, 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('name', 'cosmosdb-dns-zone-group', 'privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cosmosDB)).outputs.resourceId.value))), 'service', 'MongoDB', 'subnetResourceId', reference('virtualNetwork').outputs.backendSubnetResourceId.value))), createObject('value', createArray()))]"
4716447163
},
4716547164
"template": {
4716647165
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -53092,7 +53091,8 @@
5309253091
"privateEndpoints": {
5309353092
"value": [
5309453093
{
53095-
"name": "[format('appconfig-private-endpoint-{0}', variables('solutionSuffix'))]",
53094+
"name": "[format('pep-appconfig-{0}', variables('solutionSuffix'))]",
53095+
"customNetworkInterfaceName": "[format('nic-appconfig-{0}', variables('solutionSuffix'))]",
5309653096
"privateDnsZoneGroup": {
5309753097
"privateDnsZoneGroupConfigs": [
5309853098
{

0 commit comments

Comments
 (0)