From cf9a232e15a2acdc43ca56328965478cbdbac260 Mon Sep 17 00:00:00 2001
From: Lyle Xu <luxu@microsoft.com>
Date: Thu, 9 May 2024 22:56:59 +0800
Subject: [PATCH] remove environment name for individual resource

---
 Environments/Todo-Mongo-AKS/main.bicep    |  3 ---
 Environments/Todo-Mongo-AKS/manifest.yaml | 10 ++--------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Environments/Todo-Mongo-AKS/main.bicep b/Environments/Todo-Mongo-AKS/main.bicep
index df2a90d..b8b500a 100644
--- a/Environments/Todo-Mongo-AKS/main.bicep
+++ b/Environments/Todo-Mongo-AKS/main.bicep
@@ -18,7 +18,6 @@ var sharedAKSResourceGroup = '${sharedAKSProjectName}-${sharedAKSEnvironmentName
 
 var abbrs = loadJsonContent('./abbreviations.json')
 var resourceToken = toLower(uniqueString(subscription().id, environmentName, location))
-var tags = { 'azd-env-name': environmentName }
 
 // Store secrets in a keyvault
 module keyVault './core/security/keyvault.bicep' = {
@@ -85,7 +84,6 @@ module cosmos './app/db.bicep' = {
     accountName: !empty(cosmosAccountName) ? cosmosAccountName : '${abbrs.documentDBDatabaseAccounts}${resourceToken}'
     databaseName: cosmosDatabaseName
     location: location
-    tags: tags
     keyVaultName: keyVault.outputs.name
   }
 }
@@ -109,7 +107,6 @@ resource configStoreKeyValue 'Microsoft.AppConfiguration/configurationStores/key
   properties: {
     value: cosmos.outputs.connectionStringKey
     contentType: contentType
-    tags: tags
   }
 }
 
diff --git a/Environments/Todo-Mongo-AKS/manifest.yaml b/Environments/Todo-Mongo-AKS/manifest.yaml
index dd2945e..b6aecb5 100644
--- a/Environments/Todo-Mongo-AKS/manifest.yaml
+++ b/Environments/Todo-Mongo-AKS/manifest.yaml
@@ -6,12 +6,6 @@ runner: ARM
 templatePath: azuredeploy.json
 
 parameters:
-- id: "environmentName"
-  name: "Environment Name (e.g. testenv)"
-  description: "Name of the Environment"
-  type: string
-  required: true
-
 - id: "location"
   name: "Region (e.g. eastus)"
   description: "Location of the resources"
@@ -19,13 +13,13 @@ parameters:
   required: true
 
 - id: "sharedAKSProjectName"
-  name: "sharedAKSProjectName"
+  name: "Shared AKS Project Name"
   description: "ADE Project name for the shared AKS cluster"
   type: string
   required: true
 
 - id: "sharedAKSEnvironmentName"
-  name: "sharedAKSEnvironmentName"
+  name: "Shared AKS Environment Name"
   description: "ADE environment name for the shared AKS cluster"
   type: string
   required: true