From 47d06b3413e5ed8ddf57bbbf2d8784f0f9cc2a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Teixid=C3=B3?= <joan.teixido@bismart.com>
Date: Fri, 28 Nov 2025 18:01:50 +0100
Subject: [PATCH] Add tags variable to allow set custom tags from parameters

---
 infra/main.bicep           | 13 +++++++++----
 infra/main.parameters.json |  5 +++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/infra/main.bicep b/infra/main.bicep
index 7e1d630..21ecee3 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -31,18 +31,23 @@ param entraTenantId string = tenant().tenantId
 @description('Container image for web service (set by postprovision hook)')
 param webImageName string = 'mcr.microsoft.com/k8se/quickstart:latest'  // Placeholder during initial provision
 
+@description('Tags to apply to all resources')
+param tags object = {}
+
 var abbrs = loadJsonContent('./abbreviations.json')
 var resourceToken = toLower(uniqueString(subscription().id, environmentName, location))
-var tags = {
+var defaultTags = {
   'azd-env-name': environmentName
   'app-name': 'ai-foundry-agent'
 }
 
+var combinedTags = union(tags, defaultTags)
+
 // Create resource group
 resource rg 'Microsoft.Resources/resourceGroups@2021-04-01' = {
   name: '${abbrs.resourcesResourceGroups}${environmentName}'
   location: location
-  tags: tags
+  tags: combinedTags
 }
 
 // Deploy infrastructure (ACR + Container Apps Environment)
@@ -51,7 +56,7 @@ module infrastructure 'main-infrastructure.bicep' = {
   scope: rg
   params: {
     location: location
-    tags: tags
+    tags: combinedTags
     resourceToken: resourceToken
   }
 }
@@ -62,7 +67,7 @@ module app 'main-app.bicep' = {
   scope: rg
   params: {
     location: location
-    tags: tags
+    tags: combinedTags
     resourceToken: resourceToken
     containerAppsEnvironmentId: infrastructure.outputs.containerAppsEnvironmentId
     containerRegistryName: infrastructure.outputs.containerRegistryName
diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index d6266de..dab0c08 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -25,6 +25,11 @@
     },
     "aiFoundryResourceName": {
       "value": "${AI_FOUNDRY_RESOURCE_NAME}"
+    },
+    "tags": {
+      "value": {
+       
+      }
     }
   }
 }