From 89fb29880ec24a6d171f4151fa99124fe39e82b2 Mon Sep 17 00:00:00 2001
From: Matthew Alan Gray <matthew.gray@hatboysoftware.com>
Date: Tue, 6 Aug 2024 11:58:22 -0500
Subject: [PATCH] Updating tags to explicitly include 'azd-env-name' for AZD
 lookups

---
 deploy/standard/infra/app-rg.bicep        | 6 +++---
 deploy/standard/infra/auth-rg.bicep       | 6 +++---
 deploy/standard/infra/main.bicep          | 2 +-
 deploy/standard/infra/networking-rg.bicep | 6 +++---
 deploy/standard/infra/openai-rg.bicep     | 6 +++---
 deploy/standard/infra/ops-rg.bicep        | 6 +++---
 deploy/standard/infra/storage-rg.bicep    | 6 +++---
 deploy/standard/infra/vec-rg.bicep        | 6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/deploy/standard/infra/app-rg.bicep b/deploy/standard/infra/app-rg.bicep
index 11220b1700..706a737260 100644
--- a/deploy/standard/infra/app-rg.bicep
+++ b/deploy/standard/infra/app-rg.bicep
@@ -58,9 +58,9 @@ var resourceSuffix = '${project}-${environmentName}-${location}-${workload}'
 
 @description('Tags for all resources')
 var tags = {
-  Environment: environmentName
-  IaC: 'Bicep'
-  Project: project
+  'azd-env-name': environmentName
+  'iac-type': 'bicep'
+  'project-name': project
   Purpose: 'Services'
 }
 
diff --git a/deploy/standard/infra/auth-rg.bicep b/deploy/standard/infra/auth-rg.bicep
index 16eb24477c..dd62c63421 100644
--- a/deploy/standard/infra/auth-rg.bicep
+++ b/deploy/standard/infra/auth-rg.bicep
@@ -71,9 +71,9 @@ var authSecrets = [
 
 @description('Tags for all resources')
 var tags = {
-  Environment: environmentName
-  IaC: 'Bicep'
-  Project: project
+  'azd-env-name': environmentName
+  'iac-type': 'bicep'
+  'project-name': project
   Purpose: 'Services'
 }
 
diff --git a/deploy/standard/infra/main.bicep b/deploy/standard/infra/main.bicep
index 7b7c24757a..4040e669f2 100644
--- a/deploy/standard/infra/main.bicep
+++ b/deploy/standard/infra/main.bicep
@@ -41,7 +41,7 @@ var existingOpenAiInstance = {
 var tags = {
   'compute-type': 'aks'
   'create-date': createDate
-  'env-name': environmentName
+  'azd-env-name': environmentName
   'iac-type': 'bicep'
   'project-name': project
 }
diff --git a/deploy/standard/infra/networking-rg.bicep b/deploy/standard/infra/networking-rg.bicep
index 36b6bae068..e3630f1c55 100644
--- a/deploy/standard/infra/networking-rg.bicep
+++ b/deploy/standard/infra/networking-rg.bicep
@@ -530,9 +530,9 @@ var subnets = [
 ]
 
 var tags = {
-  Environment: environmentName
-  IaC: 'Bicep'
-  Project: project
+  'azd-env-name': environmentName
+  'iac-type': 'bicep'
+  'project-name': project
   Purpose: 'Networking'
 }
 
diff --git a/deploy/standard/infra/openai-rg.bicep b/deploy/standard/infra/openai-rg.bicep
index 9563743a52..4b659ef31e 100644
--- a/deploy/standard/infra/openai-rg.bicep
+++ b/deploy/standard/infra/openai-rg.bicep
@@ -35,9 +35,9 @@ var openAiInstance = {
 var deploymentConfigurations = loadJsonContent('../../common/config/openAiDeploymentConfig.json')
 
 var tags = {
-  Environment: environmentName
-  IaC: 'Bicep'
-  Project: project
+  'azd-env-name': environmentName
+  'iac-type': 'bicep'
+  'project-name': project
   Purpose: 'OpenAI'
 }
 
diff --git a/deploy/standard/infra/ops-rg.bicep b/deploy/standard/infra/ops-rg.bicep
index dec0c68bca..579703601e 100644
--- a/deploy/standard/infra/ops-rg.bicep
+++ b/deploy/standard/infra/ops-rg.bicep
@@ -42,9 +42,9 @@ var resourceSuffix = '${project}-${environmentName}-${location}-${workload}'
 
 @description('Tags for all resources')
 var tags = {
-  Environment: environmentName
-  IaC: 'Bicep'
-  Project: project
+  'azd-env-name': environmentName
+  'iac-type': 'bicep'
+  'project-name': project
   Purpose: 'DevOps'
 }
 
diff --git a/deploy/standard/infra/storage-rg.bicep b/deploy/standard/infra/storage-rg.bicep
index e7b66f8bb8..5b059b36ad 100644
--- a/deploy/standard/infra/storage-rg.bicep
+++ b/deploy/standard/infra/storage-rg.bicep
@@ -29,9 +29,9 @@ var resourceSuffix = '${project}-${environmentName}-${location}-${workload}'
 
 @description('Tags for all resources')
 var tags = {
-  Environment: environmentName
-  IaC: 'Bicep'
-  Project: project
+  'azd-env-name': environmentName
+  'iac-type': 'bicep'
+  'project-name': project
   Purpose: 'Storage'
 }
 
diff --git a/deploy/standard/infra/vec-rg.bicep b/deploy/standard/infra/vec-rg.bicep
index eb70f13607..56c5fea0d2 100644
--- a/deploy/standard/infra/vec-rg.bicep
+++ b/deploy/standard/infra/vec-rg.bicep
@@ -29,9 +29,9 @@ var resourceSuffix = '${project}-${environmentName}-${location}-${workload}'
 
 @description('Tags for all resources')
 var tags = {
-  Environment: environmentName
-  IaC: 'Bicep'
-  Project: project
+  'azd-env-name': environmentName
+  'iac-type': 'bicep'
+  'project-name': project
   Purpose: 'Vectorization'
 }