From 0411a632ef408e6462f02b6ac77264b17ae795ae Mon Sep 17 00:00:00 2001
From: VishalS-Microsoft <v-vishshinde@microsoft.com>
Date: Tue, 23 Sep 2025 16:49:54 +0530
Subject: [PATCH 1/2] added new 'type' tag

---
 .github/workflows/deploy-waf.yml | 5 +++++
 .github/workflows/deploy.yml     | 4 ++++
 infra/main.bicep                 | 1 +
 3 files changed, 10 insertions(+)

diff --git a/.github/workflows/deploy-waf.yml b/.github/workflows/deploy-waf.yml
index eb0e5a617..108cb6888 100644
--- a/.github/workflows/deploy-waf.yml
+++ b/.github/workflows/deploy-waf.yml
@@ -105,6 +105,10 @@ jobs:
         id: deploy
         run: |
           set -e
+
+          # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
+            current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")
+
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
@@ -118,6 +122,7 @@ jobs:
               enablePrivateNetworking=true \
               enableScalability=true \
               createdBy="Pipeline" \
+              tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
               
 
       - name: Send Notification on Failure
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 026b94242..ca921566f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -125,6 +125,9 @@ jobs:
             IMAGE_TAG="latest"
           fi
 
+          # Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
+            current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")
+
           az deployment group create \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
             --template-file infra/main.bicep \
@@ -139,6 +142,7 @@ jobs:
               azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
               gptModelCapacity=150 \
               createdBy="Pipeline" \
+              tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \
             --output json
 
       - name: Extract Web App and API App URLs
diff --git a/infra/main.bicep b/infra/main.bicep
index eae09eacb..0e8b3f9bb 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -232,6 +232,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
     tags: {
       ...allTags
       TemplateName: 'MACAE'
+      Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
       CreatedBy: createdBy
     }
   }

From c4ae1225d51e15d6cddd3c7d7f91cbf17129bf09 Mon Sep 17 00:00:00 2001
From: VishalS-Microsoft <v-vishshinde@microsoft.com>
Date: Tue, 23 Sep 2025 16:57:32 +0530
Subject: [PATCH 2/2] added new 'type' tag in main_custom.bicep file

---
 infra/main_custom.bicep | 1 +
 1 file changed, 1 insertion(+)

diff --git a/infra/main_custom.bicep b/infra/main_custom.bicep
index dfb8f7711..5d3870b94 100644
--- a/infra/main_custom.bicep
+++ b/infra/main_custom.bicep
@@ -232,6 +232,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
     tags: {
       ...allTags
       TemplateName: 'MACAE'
+      Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
       CreatedBy: createdBy
     }
   }