Skip to content

Commit 04cd9c4

Browse files
Roopan-MicrosoftRoopan-Microsoft
committed
resolved conflicts and main.json regenerated
1 parent f4dbbcb commit 04cd9c4

File tree

2 files changed

+0
-67
lines changed

2 files changed

+0
-67
lines changed

‎extensions/teams/infra/azure.bicep‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@maxLength(25)
2-
@maxLength(25)
32
@minLength(4)
43
@description('Used to generate names for all resources in this file')
54
param resourceBaseName string

‎infra/main.json‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.37.4.10188",
9-
<<<<<<< HEAD
109
"templateHash": "5895320887545019006"
11-
=======
12-
"templateHash": "7004073046163258445"
13-
>>>>>>> main
1410
}
1511
},
1612
"parameters": {
@@ -33,25 +29,17 @@
3329
},
3430
"location": {
3531
"type": "string",
36-
<<<<<<< HEAD
3732
"allowedValues": [
3833
"australiaeast",
3934
"eastus2",
4035
"japaneast",
4136
"uksouth"
4237
],
43-
=======
44-
"defaultValue": "[resourceGroup().location]",
45-
>>>>>>> main
4638
"metadata": {
4739
"azd": {
4840
"type": "location"
4941
},
50-
<<<<<<< HEAD
5142
"description": "Required. Azure region for all services. Regions are restricted to guarantee compatibility with paired regions and replica locations for data redundancy and failover scenarios based on articles [Azure regions list](https://learn.microsoft.com/azure/reliability/regions-list) and [Azure Database for MySQL Flexible Server - Azure Regions](https://learn.microsoft.com/azure/mysql/flexible-server/overview#azure-regions)."
52-
=======
53-
"description": "Optional. Location for all resources, if you are using existing resource group provide the location of the resorce group."
54-
>>>>>>> main
5543
}
5644
},
5745
"existingLogAnalyticsWorkspaceId": {
@@ -341,11 +329,7 @@
341329
},
342330
"azureOpenAIStopSequence": {
343331
"type": "string",
344-
<<<<<<< HEAD
345332
"defaultValue": "\\n",
346-
=======
347-
"defaultValue": "\n",
348-
>>>>>>> main
349333
"metadata": {
350334
"description": "Optional. Azure OpenAI Stop Sequence."
351335
}
@@ -465,7 +449,6 @@
465449
"newGuidString": {
466450
"type": "string",
467451
"defaultValue": "[newGuid()]",
468-
<<<<<<< HEAD
469452
"metadata": {
470453
"description": "Optional. A new GUID string generated for this deployment. This can be used for unique naming if needed."
471454
}
@@ -479,17 +462,6 @@
479462
},
480463
"metadata": {
481464
"description": "Optional. Principal object for user or service principal to assign application roles. Format: {\"id\":\"<object-id>\", \"name\":\"<name-or-upn>\", \"type\":\"User|Group|ServicePrincipal\"}"
482-
=======
483-
"metadata": {
484-
"description": "Optional. A new GUID string generated for this deployment. This can be used for unique naming if needed."
485-
}
486-
},
487-
"principalId": {
488-
"type": "string",
489-
"defaultValue": "",
490-
"metadata": {
491-
"description": "Optional. Id of the user or app to assign application roles."
492-
>>>>>>> main
493465
}
494466
},
495467
"appEnvironment": {
@@ -17704,13 +17676,9 @@
1770417676
"highAvailabilityZone": "[if(parameters('enableRedundancy'), createObject('value', 2), createObject('value', -1))]",
1770517677
"publicNetworkAccess": "[if(parameters('enablePrivateNetworking'), createObject('value', 'Disabled'), createObject('value', 'Enabled'))]",
1770617678
"privateEndpoints": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', format('pep-{0}', variables('postgresResourceName')), 'customNetworkInterfaceName', format('nic-{0}', variables('postgresResourceName')), 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').postgresDB)).outputs.resourceId.value))), 'service', 'postgresqlServer', 'subnetResourceId', reference('network').outputs.subnetPrivateEndpointsResourceId.value))), createObject('value', createArray()))]",
17707-
<<<<<<< HEAD
1770817679
"administrators": {
1770917680
"value": "[concat(if(not(equals(reference('managedIdentityModule').outputs.principalId.value, '')), createArray(createObject('objectId', reference('managedIdentityModule').outputs.principalId.value, 'principalName', reference('managedIdentityModule').outputs.name.value, 'principalType', 'ServicePrincipal')), createArray()), if(not(empty(parameters('principal').id)), createArray(createObject('objectId', parameters('principal').id, 'principalName', parameters('principal').name, 'principalType', parameters('principal').type)), createArray()))]"
1771017681
},
17711-
=======
17712-
"administrators": "[if(not(equals(reference('managedIdentityModule').outputs.principalId.value, '')), createObject('value', createArray(createObject('objectId', reference('managedIdentityModule').outputs.principalId.value, 'principalName', reference('managedIdentityModule').outputs.name.value, 'principalType', 'ServicePrincipal'))), createObject('value', null()))]",
17713-
>>>>>>> main
1771417682
"firewallRules": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray()), createObject('value', concat(if(variables('allowAllIPsFirewall'), createArray(createObject('name', 'allow-all-IPs', 'startIpAddress', '0.0.0.0', 'endIpAddress', '255.255.255.255')), createArray()), if(variables('allowAzureIPsFirewall'), createArray(createObject('name', 'allow-all-azure-internal-IPs', 'startIpAddress', '0.0.0.0', 'endIpAddress', '0.0.0.0')), createArray()))))]",
1771517683
"configurations": {
1771617684
"value": [
@@ -21110,11 +21078,7 @@
2111021078
"diagnosticSettings": "[if(parameters('enableMonitoring'), createObject('value', createArray(createObject('workspaceResourceId', reference('monitoring').outputs.logAnalyticsWorkspaceId.value))), createObject('value', null()))]",
2111121079
"privateEndpoints": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', format('pep-{0}', variables('keyVaultName')), 'customNetworkInterfaceName', format('nic-{0}', variables('keyVaultName')), 'privateDnsZoneGroup', createObject('privateDnsZoneGroupConfigs', createArray(createObject('privateDnsZoneResourceId', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').keyVault)).outputs.resourceId.value))), 'service', 'vault', 'subnetResourceId', reference('network').outputs.subnetPrivateEndpointsResourceId.value))), createObject('value', createArray()))]",
2111221080
"roleAssignments": {
21113-
<<<<<<< HEAD
2111421081
"value": "[concat(if(not(equals(reference('managedIdentityModule').outputs.principalId.value, '')), createArray(createObject('principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal', 'roleDefinitionIdOrName', 'Key Vault Secrets User')), createArray()), if(not(empty(parameters('principal').id)), createArray(createObject('principalId', parameters('principal').id, 'roleDefinitionIdOrName', 'Key Vault Secrets User')), createArray()))]"
21115-
=======
21116-
"value": "[concat(if(not(equals(reference('managedIdentityModule').outputs.principalId.value, '')), createArray(createObject('principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal', 'roleDefinitionIdOrName', 'Key Vault Secrets User')), createArray()), if(not(equals(parameters('principalId'), '')), createArray(createObject('principalId', parameters('principalId'), 'roleDefinitionIdOrName', 'Key Vault Secrets User')), createArray()))]"
21117-
>>>>>>> main
2111821082
},
2111921083
"secrets": {
2112021084
"value": [
@@ -23296,11 +23260,7 @@
2329623260
"logAnalyticsWorkspaceId": "[if(parameters('enableMonitoring'), createObject('value', reference('monitoring').outputs.logAnalyticsWorkspaceId.value), createObject('value', null()))]",
2329723261
"privateDnsZoneResourceId": "[if(parameters('enablePrivateNetworking'), createObject('value', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)).outputs.resourceId.value), createObject('value', ''))]",
2329823262
"roleAssignments": {
23299-
<<<<<<< HEAD
2330023263
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal'), createObject('roleDefinitionIdOrName', '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principal').id)), createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', parameters('principal').id), createObject('roleDefinitionIdOrName', '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd', 'principalId', parameters('principal').id)), createArray()))]"
23301-
=======
23302-
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal'), createObject('roleDefinitionIdOrName', '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principalId'))), createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', parameters('principalId')), createObject('roleDefinitionIdOrName', '5e0bd9bd-7b93-4f28-af87-19fc36ad61bd', 'principalId', parameters('principalId'))), createArray()))]"
23303-
>>>>>>> main
2330423264
}
2330523265
},
2330623266
"template": {
@@ -25906,11 +25866,7 @@
2590625866
},
2590725867
"privateDnsZoneResourceId": "[if(parameters('enablePrivateNetworking'), createObject('value', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)).outputs.resourceId.value), createObject('value', ''))]",
2590825868
"roleAssignments": {
25909-
<<<<<<< HEAD
2591025869
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principal').id)), createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', parameters('principal').id)), createArray()))]"
25911-
=======
25912-
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principalId'))), createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', parameters('principalId'))), createArray()))]"
25913-
>>>>>>> main
2591425870
}
2591525871
},
2591625872
"template": {
@@ -28517,11 +28473,7 @@
2851728473
},
2851828474
"privateDnsZoneResourceId": "[if(variables('enablePrivateNetworkingSpeech'), createObject('value', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)).outputs.resourceId.value), createObject('value', ''))]",
2851928475
"roleAssignments": {
28520-
<<<<<<< HEAD
2852128476
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principal').id)), createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', parameters('principal').id)), createArray()))]"
28522-
=======
28523-
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principalId'))), createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', parameters('principalId'))), createArray()))]"
28524-
>>>>>>> main
2852528477
}
2852628478
},
2852728479
"template": {
@@ -31151,11 +31103,7 @@
3115131103
}
3115231104
},
3115331105
"roleAssignments": {
31154-
<<<<<<< HEAD
3115531106
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', '8ebe5a00-799e-43f5-93ac-243d3dce84a7', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal'), createObject('roleDefinitionIdOrName', '7ca78c08-252a-4471-8644-bb5ff32d4ba0', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal'), createObject('roleDefinitionIdOrName', '1407120a-92aa-4202-b7e9-c0e197c71c8f', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principal').id)), createArray(createObject('roleDefinitionIdOrName', '8ebe5a00-799e-43f5-93ac-243d3dce84a7', 'principalId', parameters('principal').id), createObject('roleDefinitionIdOrName', '7ca78c08-252a-4471-8644-bb5ff32d4ba0', 'principalId', parameters('principal').id), createObject('roleDefinitionIdOrName', '1407120a-92aa-4202-b7e9-c0e197c71c8f', 'principalId', parameters('principal').id)), createArray()))]"
31156-
=======
31157-
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', '8ebe5a00-799e-43f5-93ac-243d3dce84a7', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal'), createObject('roleDefinitionIdOrName', '7ca78c08-252a-4471-8644-bb5ff32d4ba0', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal'), createObject('roleDefinitionIdOrName', '1407120a-92aa-4202-b7e9-c0e197c71c8f', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principalId'))), createArray(createObject('roleDefinitionIdOrName', '8ebe5a00-799e-43f5-93ac-243d3dce84a7', 'principalId', parameters('principalId')), createObject('roleDefinitionIdOrName', '7ca78c08-252a-4471-8644-bb5ff32d4ba0', 'principalId', parameters('principalId')), createObject('roleDefinitionIdOrName', '1407120a-92aa-4202-b7e9-c0e197c71c8f', 'principalId', parameters('principalId'))), createArray()))]"
31158-
>>>>>>> main
3115931107
}
3116031108
},
3116131109
"template": {
@@ -47041,11 +46989,7 @@
4704146989
"value": true
4704246990
},
4704346991
"roleAssignments": {
47044-
<<<<<<< HEAD
4704546992
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal'), createObject('roleDefinitionIdOrName', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principal').id)), createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', parameters('principal').id)), createArray()))]"
47046-
=======
47047-
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal'), createObject('roleDefinitionIdOrName', 'ba92f5b4-2d11-453d-a403-e96b0029c9fe', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principalId'))), createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', parameters('principalId'))), createArray()))]"
47048-
>>>>>>> main
4704946993
}
4705046994
},
4705146995
"template": {
@@ -49649,11 +49593,7 @@
4964949593
},
4965049594
"privateDnsZoneResourceId": "[if(parameters('enablePrivateNetworking'), createObject('value', reference(format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)).outputs.resourceId.value), createObject('value', ''))]",
4965149595
"roleAssignments": {
49652-
<<<<<<< HEAD
4965349596
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principal').id)), createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', parameters('principal').id)), createArray()))]"
49654-
=======
49655-
"value": "[concat(createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', reference('managedIdentityModule').outputs.principalId.value, 'principalType', 'ServicePrincipal')), if(not(empty(parameters('principalId'))), createArray(createObject('roleDefinitionIdOrName', 'a97b65f3-24c7-4388-baec-2e87135dc908', 'principalId', parameters('principalId'))), createArray()))]"
49656-
>>>>>>> main
4965749597
}
4965849598
},
4965949599
"template": {
@@ -55499,15 +55439,9 @@
5549955439
}
5550055440
},
5550155441
"dependsOn": [
55502-
<<<<<<< HEAD
5550355442
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
5550455443
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
5550555444
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
55506-
=======
55507-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
55508-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
55509-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
55510-
>>>>>>> main
5551155445
"managedIdentityModule",
5551255446
"network"
5551355447
]

0 commit comments

Comments
 (0)