Skip to content

chore: dev changes to main #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Avijit-Microsoft merged 5 commits into from
Feb 23, 2026
Merged

chore: dev changes to main #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ab9f85
Fixed the tag issue
Prekshith-Microsoft Feb 18, 2026
6d9ee25
Call the variable outside the resource
Prekshith-Microsoft Feb 19, 2026
5e40e44
Merge pull request #426 from microsoft/psl-tag-issue
Prajwal-Microsoft Feb 19, 2026
3ca0224
Regenerated the main.json file
Prekshith-Microsoft Feb 19, 2026
c85508c
Merge pull request #428 from microsoft/psl-tag-issue
Prajwal-Microsoft Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,18 +570,22 @@ param createdBy string = contains(deployer(), 'userPrincipalName')
? split(deployer().userPrincipalName, '@')[0]
: deployer().objectId

var existingTags = resourceGroup().tags ?? {}

// ========== Resource Group Tag ========== //
resource resourceGroupTags 'Microsoft.Resources/tags@2025-04-01' = {
name: 'default'
properties: {
tags: {
...resourceGroup().tags
...tags
tags: union(
existingTags,
tags,
{
TemplateName: 'Content Processing'
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
CreatedBy: createdBy
DeploymentName: deployment().name
}
)
}
}

Expand Down
67 changes: 34 additions & 33 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "17889628032590430216"
"version": "0.40.2.10011",
"templateHash": "4821257159531769907"
},
"name": "Content Processing Solution Accelerator",
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
Expand Down Expand Up @@ -278,7 +278,8 @@
"cosmosDB": 6,
"appConfig": 7,
"containerRegistry": 8
}
},
"existingTags": "[coalesce(resourceGroup().tags, createObject())]"
},
"resources": {
"avmTelemetry": {
Expand Down Expand Up @@ -306,7 +307,7 @@
"apiVersion": "2025-04-01",
"name": "default",
"properties": {
"tags": "[shallowMerge(createArray(resourceGroup().tags, parameters('tags'), createObject('TemplateName', 'Content Processing', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'), 'DeploymentName', deployment().name)))]"
"tags": "[union(variables('existingTags'), parameters('tags'), createObject('TemplateName', 'Content Processing', 'Type', if(parameters('enablePrivateNetworking'), 'WAF', 'Non-WAF'), 'CreatedBy', parameters('createdBy'), 'DeploymentName', deployment().name))]"
}
},
"virtualNetwork": {
Expand Down Expand Up @@ -349,8 +350,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "2779842231546071291"
"version": "0.40.2.10011",
"templateHash": "637986880127430337"
}
},
"definitions": {
Expand Down Expand Up @@ -19226,8 +19227,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "9967760373683235080"
"version": "0.40.2.10011",
"templateHash": "3741201002953968110"
}
},
"parameters": {
Expand Down Expand Up @@ -23232,8 +23233,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "11438993289824448790"
"version": "0.40.2.10011",
"templateHash": "10844547551448610415"
}
},
"parameters": {
Expand Down Expand Up @@ -23824,8 +23825,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "18073394536155497558"
"version": "0.40.2.10011",
"templateHash": "7885429842089695683"
},
"name": "Container Registry Module"
},
Expand Down Expand Up @@ -35177,8 +35178,8 @@
"avmContainerApp",
"avmContainerApp_API",
"avmManagedIdentity",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
"virtualNetwork"
]
},
Expand Down Expand Up @@ -35289,8 +35290,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "11365341673325597162"
"version": "0.40.2.10011",
"templateHash": "7557665774149769517"
},
"name": "Cognitive Services",
"description": "This module deploys a Cognitive Service."
Expand Down Expand Up @@ -36539,8 +36540,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "15006072223125242147"
"version": "0.40.2.10011",
"templateHash": "6588447351857766372"
}
},
"definitions": {
Expand Down Expand Up @@ -37503,7 +37504,7 @@
"condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]",
"type": "Microsoft.Authorization/locks",
"apiVersion": "2020-05-01",
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
"name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]",
"properties": {
"level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]",
Expand All @@ -37517,7 +37518,7 @@
},
"type": "Microsoft.Insights/diagnosticSettings",
"apiVersion": "2021-05-01-preview",
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
"name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]",
"properties": {
"copy": [
Expand Down Expand Up @@ -37555,7 +37556,7 @@
},
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2022-04-01",
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
"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))]",
"properties": {
"roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]",
Expand Down Expand Up @@ -38348,8 +38349,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "12797226417049698978"
"version": "0.40.2.10011",
"templateHash": "14939823368517410024"
}
},
"definitions": {
Expand Down Expand Up @@ -38502,8 +38503,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "422299638943108486"
"version": "0.40.2.10011",
"templateHash": "13151306134286549002"
}
},
"definitions": {
Expand Down Expand Up @@ -38720,8 +38721,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "15006072223125242147"
"version": "0.40.2.10011",
"templateHash": "6588447351857766372"
}
},
"definitions": {
Expand Down Expand Up @@ -39684,7 +39685,7 @@
"condition": "[and(not(empty(coalesce(parameters('lock'), createObject()))), not(equals(tryGet(parameters('lock'), 'kind'), 'None')))]",
"type": "Microsoft.Authorization/locks",
"apiVersion": "2020-05-01",
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
"name": "[coalesce(tryGet(parameters('lock'), 'name'), format('lock-{0}', parameters('name')))]",
"properties": {
"level": "[coalesce(tryGet(parameters('lock'), 'kind'), '')]",
Expand All @@ -39698,7 +39699,7 @@
},
"type": "Microsoft.Insights/diagnosticSettings",
"apiVersion": "2021-05-01-preview",
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
"name": "[coalesce(tryGet(coalesce(parameters('diagnosticSettings'), createArray())[copyIndex()], 'name'), format('{0}-diagnosticSettings', parameters('name')))]",
"properties": {
"copy": [
Expand Down Expand Up @@ -39736,7 +39737,7 @@
},
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2022-04-01",
"scope": "[format('Microsoft.CognitiveServices/accounts/{0}', parameters('name'))]",
"scope": "[resourceId('Microsoft.CognitiveServices/accounts', parameters('name'))]",
"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))]",
"properties": {
"roleDefinitionId": "[coalesce(variables('formattedRoleAssignments'), createArray())[copyIndex()].roleDefinitionId]",
Expand Down Expand Up @@ -40529,8 +40530,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "12797226417049698978"
"version": "0.40.2.10011",
"templateHash": "14939823368517410024"
}
},
"definitions": {
Expand Down Expand Up @@ -40683,8 +40684,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.39.26.7824",
"templateHash": "422299638943108486"
"version": "0.40.2.10011",
"templateHash": "13151306134286549002"
}
},
"definitions": {
Expand Down