Skip to content

Commit 3e90e85

Browse files
Prajwal-MicrosoftPrajwal-Microsoft
committed
fix: Resolved conflicts
1 parent 86a1962 commit 3e90e85

1 file changed

Lines changed: 41 additions & 25 deletions

File tree

‎infra/main.json‎

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.36.177.2456",
9-
"templateHash": "5192359171136519746"
9+
"templateHash": "17580921797975596025"
1010
},
1111
"name": "Content Processing Solution Accelerator",
1212
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -166,7 +166,7 @@
166166
}
167167
},
168168
"variables": {
169-
"solutionPrefix": "[format('cps-{0}', padLeft(take(toLower(uniqueString(subscription().id, parameters('environmentName'), resourceGroup().location)), 12), 12, '0'))]",
169+
"solutionPrefix": "[format('cps-{0}', padLeft(take(toLower(uniqueString(subscription().id, parameters('environmentName'), resourceGroup().location, resourceGroup().name)), 12), 12, '0'))]",
170170
"privateDnsZones": [
171171
"privatelink.cognitiveservices.azure.com",
172172
"privatelink.openai.azure.com",
@@ -255,7 +255,7 @@
255255
"diagnosticSettings": {
256256
"value": [
257257
{
258-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
258+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
259259
}
260260
]
261261
},
@@ -935,7 +935,7 @@
935935
"diagnosticSettings": {
936936
"value": [
937937
{
938-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
938+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
939939
}
940940
]
941941
},
@@ -1680,7 +1680,7 @@
16801680
"diagnosticSettings": {
16811681
"value": [
16821682
{
1683-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
1683+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
16841684
}
16851685
]
16861686
},
@@ -2360,7 +2360,7 @@
23602360
"diagnosticSettings": {
23612361
"value": [
23622362
{
2363-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
2363+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
23642364
}
23652365
]
23662366
},
@@ -3045,7 +3045,7 @@
30453045
"diagnosticSettings": {
30463046
"value": [
30473047
{
3048-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
3048+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
30493049
}
30503050
]
30513051
},
@@ -11024,15 +11024,15 @@
1102411024
"outputs": {
1102511025
"resourceId": {
1102611026
"type": "string",
11027-
"value": "[if(variables('useExistingWorkspace'), extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').resourceId)]"
11027+
"value": "[if(variables('useExistingWorkspace'), extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), reference('logAnalyticsWorkspace').outputs.resourceId.value)]"
1102811028
},
1102911029
"logAnalyticsWorkspaceId": {
1103011030
"type": "string",
11031-
"value": "[if(variables('useExistingWorkspace'), reference('existingLogAnalyticsWorkspace').customerId, listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').logAnalyticsWorkspaceId)]"
11031+
"value": "[if(variables('useExistingWorkspace'), reference('existingLogAnalyticsWorkspace').customerId, reference('logAnalyticsWorkspace').outputs.logAnalyticsWorkspaceId.value)]"
1103211032
},
1103311033
"primarySharedKey": {
1103411034
"type": "securestring",
11035-
"value": "[if(variables('useExistingWorkspace'), if(variables('useExistingWorkspace'), listKeys(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), '2020-08-01'), listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').primarySharedKey).primarySharedKey, listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_new_log_analytics_workspace'), '2022-09-01').primarySharedKey)]"
11035+
"value": "[if(variables('useExistingWorkspace'), if(variables('useExistingWorkspace'), listKeys(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('existingLawSubscription'), variables('existingLawResourceGroup')), 'Microsoft.OperationalInsights/workspaces', variables('existingLawName')), '2020-08-01'), listOutputsWithSecureValues('logAnalyticsWorkspace', '2022-09-01').primarySharedKey).primarySharedKey, listOutputsWithSecureValues('logAnalyticsWorkspace', '2022-09-01').primarySharedKey)]"
1103611036
}
1103711037
}
1103811038
}
@@ -11055,12 +11055,12 @@
1105511055
"value": "[parameters('location')]"
1105611056
},
1105711057
"workspaceResourceId": {
11058-
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
11058+
"value": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
1105911059
},
1106011060
"diagnosticSettings": {
1106111061
"value": [
1106211062
{
11063-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
11063+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
1106411064
}
1106511065
]
1106611066
},
@@ -12369,7 +12369,7 @@
1236912369
},
1237012370
"publicNetworkAccess": "[if(parameters('enablePrivateNetworking'), createObject('value', 'Disabled'), createObject('value', 'Enabled'))]",
1237112371
"logAnalyticsWorkspaceResourceId": {
12372-
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
12372+
"value": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
1237312373
},
1237412374
"networkAcls": {
1237512375
"value": {
@@ -24954,7 +24954,7 @@
2495424954
"diagnosticSettings": {
2495524955
"value": [
2495624956
{
24957-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]"
24957+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]"
2495824958
}
2495924959
]
2496024960
},
@@ -26262,7 +26262,7 @@
2626226262
"_generator": {
2626326263
"name": "bicep",
2626426264
"version": "0.36.177.2456",
26265-
"templateHash": "4128376395637895528"
26265+
"templateHash": "11270933172961789567"
2626626266
}
2626726267
},
2626826268
"definitions": {
@@ -28071,7 +28071,7 @@
2807128071
"_generator": {
2807228072
"name": "bicep",
2807328073
"version": "0.36.177.2456",
28074-
"templateHash": "1200612323329026557"
28074+
"templateHash": "9150529619101779014"
2807528075
}
2807628076
},
2807728077
"definitions": {
@@ -30646,10 +30646,10 @@
3064630646
"dependsOn": [
3064730647
"avmContainerApp",
3064830648
"avmManagedIdentity",
30649-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
30650-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
3065130649
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
3065230650
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
30651+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
30652+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
3065330653
"avmVirtualNetwork",
3065430654
"logAnalyticsWorkspace"
3065530655
]
@@ -32987,8 +32987,8 @@
3298732987
"dependsOn": [
3298832988
"avmContainerApp",
3298932989
"avmManagedIdentity",
32990-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
3299132990
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
32991+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
3299232992
"avmVirtualNetwork"
3299332993
]
3299432994
},
@@ -33023,8 +33023,8 @@
3302333023
"value": {
3302433024
"destination": "log-analytics",
3302533025
"logAnalyticsConfiguration": {
33026-
"customerId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').logAnalyticsWorkspaceId]",
33027-
"sharedKey": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').primarySharedKey]"
33026+
"customerId": "[reference('logAnalyticsWorkspace').outputs.logAnalyticsWorkspaceId.value]",
33027+
"sharedKey": "[listOutputsWithSecureValues('logAnalyticsWorkspace', '2022-09-01').primarySharedKey]"
3302833028
}
3302933029
}
3303033030
},
@@ -34458,6 +34458,10 @@
3445834458
{
3445934459
"name": "APP_CONFIG_ENDPOINT",
3446034460
"value": ""
34461+
},
34462+
{
34463+
"name": "APP_ENV",
34464+
"value": "prod"
3446134465
}
3446234466
]
3446334467
}
@@ -35970,6 +35974,10 @@
3597035974
{
3597135975
"name": "APP_CONFIG_ENDPOINT",
3597235976
"value": ""
35977+
},
35978+
{
35979+
"name": "APP_ENV",
35980+
"value": "prod"
3597335981
}
3597435982
],
3597535983
"probes": [
@@ -42904,7 +42912,7 @@
4290442912
"diagnosticSettings": {
4290542913
"value": [
4290642914
{
42907-
"workspaceResourceId": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', 'deploy_log_analytics_workspace'), '2022-09-01').resourceId]",
42915+
"workspaceResourceId": "[reference('logAnalyticsWorkspace').outputs.resourceId.value]",
4290842916
"logCategoriesAndGroups": [
4290942917
{
4291042918
"categoryGroup": "allLogs",
@@ -43005,19 +43013,19 @@
4300543013
},
4300643014
{
4300743015
"name": "APP_STORAGE_BLOB_URL",
43008-
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', format(parameters('resourceNameFormatString'), 'st')), '2022-09-01').serviceEndpoints.blob]"
43016+
"value": "[reference('avmStorageAccount').outputs.serviceEndpoints.value.blob]"
4300943017
},
4301043018
{
4301143019
"name": "APP_STORAGE_QUEUE_URL",
43012-
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', format(parameters('resourceNameFormatString'), 'st')), '2022-09-01').serviceEndpoints.queue]"
43020+
"value": "[reference('avmStorageAccount').outputs.serviceEndpoints.value.queue]"
4301343021
},
4301443022
{
4301543023
"name": "APP_AI_PROJECT_ENDPOINT",
4301643024
"value": "[reference('avmAiServices').outputs.aiProjectInfo.value.apiEndpoint]"
4301743025
},
4301843026
{
4301943027
"name": "APP_COSMOS_CONNSTR",
43020-
"value": "[listOutputsWithSecureValues(resourceId('Microsoft.Resources/deployments', format(parameters('resourceNameFormatString'), 'cosmos-')), '2022-09-01').primaryReadWriteConnectionString]"
43028+
"value": "[listOutputsWithSecureValues('avmCosmosDB', '2022-09-01').primaryReadWriteConnectionString]"
4302143029
}
4302243030
]
4302343031
},
@@ -47083,6 +47091,10 @@
4708347091
{
4708447092
"name": "APP_CONFIG_ENDPOINT",
4708547093
"value": "[reference('avmAppConfig').outputs.endpoint.value]"
47094+
},
47095+
{
47096+
"name": "APP_ENV",
47097+
"value": "prod"
4708647098
}
4708747099
]
4708847100
}
@@ -48594,6 +48606,10 @@
4859448606
{
4859548607
"name": "APP_CONFIG_ENDPOINT",
4859648608
"value": "[reference('avmAppConfig').outputs.endpoint.value]"
48609+
},
48610+
{
48611+
"name": "APP_ENV",
48612+
"value": "prod"
4859748613
}
4859848614
],
4859948615
"probes": [

0 commit comments

Comments
 (0)