From 0aee32d56cb8a08e49fc65c5b2c6eaa77bfb2478 Mon Sep 17 00:00:00 2001
From: VishalS-Microsoft <v-vishshinde@microsoft.com>
Date: Mon, 22 Sep 2025 19:24:46 +0530
Subject: [PATCH 1/2] Fixed CI Pipeline Validate Deployment - Codmod

---
 .github/workflows/deploy.yml | 6 +++++-
 infra/main.bicep             | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index be98168f..77805fe7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -126,6 +126,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 \
             --name ${{ env.SOLUTION_PREFIX }}-deployment \
             --resource-group ${{ env.RESOURCE_GROUP_NAME }} \
@@ -136,7 +139,8 @@ jobs:
                 useWafAlignedArchitecture=false \
                 capacity=${{ env.GPT_MIN_CAPACITY }} \
                 imageVersion="${IMAGE_TAG}" \
-                createdBy="Pipeline" 
+                createdBy="Pipeline" \
+                tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"
       - name: Assign Contributor role to Service Principal
         if: always()
         run: |
diff --git a/infra/main.bicep b/infra/main.bicep
index f3c9f956..07cf12c3 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -143,7 +143,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
   properties: {
     tags: {
       ...allTags
-      TemplateName: 'Code Modernization'
+      TemplateName: enablePrivateNetworking ? 'Code Modernization - WAF' : 'Code Modernization'
       CreatedBy: createdBy
     }
   }

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

---
 infra/main.bicep | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/infra/main.bicep b/infra/main.bicep
index 07cf12c3..cc7d8a69 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -143,7 +143,8 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
   properties: {
     tags: {
       ...allTags
-      TemplateName: enablePrivateNetworking ? 'Code Modernization - WAF' : 'Code Modernization'
+      TemplateName: 'Code Modernization'
+      Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
       CreatedBy: createdBy
     }
   }