From 15de4445e16e59512404d1e91014231092eb6de6 Mon Sep 17 00:00:00 2001
From: DK Benjamin <dakota.benjamin@hotosm.org>
Date: Tue, 28 May 2024 14:33:56 -0400
Subject: [PATCH] Add standardized tags to all resources

---
 infra/prod-aws/main.tf      | 45 ++++++++++++++++++++++++++-----------
 infra/prod-aws/variables.tf |  3 ++-
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/infra/prod-aws/main.tf b/infra/prod-aws/main.tf
index 01100006..f9668517 100644
--- a/infra/prod-aws/main.tf
+++ b/infra/prod-aws/main.tf
@@ -48,9 +48,15 @@ resource "aws_ecs_cluster" "main" {
     value = "enabled"
   }
 
-  tags = {
-    Name = lookup(var.project_meta, "name")
-  }
+  tags = merge(
+    {
+      Name = lookup(var.project_meta, "name")
+    },
+    var.default_tags,
+    {
+      environment = var.deployment_environment
+    }
+  )
 }
 
 locals {
@@ -164,7 +170,7 @@ module "ecs-api" {
     }
   }
 
-  default_tags = var.default_tags
+  default_tags = merge(var.default_tags, {environment = var.deployment_environment})
   efs_settings = var.efs_settings
 }
 
@@ -236,7 +242,7 @@ module "ecs-worker-daemon" {
     }
   }
 
-  default_tags = var.default_tags
+  default_tags = merge(var.default_tags, {environment = var.deployment_environment})
   efs_settings = var.efs_settings
 }
 
@@ -298,7 +304,7 @@ module "ecs-worker-ondemand" {
     }
   }
 
-  default_tags = var.default_tags
+  default_tags = merge(var.default_tags, {environment = var.deployment_environment})
   efs_settings = var.efs_settings
 }
 
@@ -363,7 +369,7 @@ module "ecs-flower" {
     }
   }
 
-  default_tags = var.default_tags
+  default_tags = merge(var.default_tags, {environment = var.deployment_environment})
   efs_settings = var.efs_settings
 }
 
@@ -388,9 +394,14 @@ resource "aws_security_group" "redis" {
     ipv6_cidr_blocks = ["::/0"]
   }
 
-  tags = {
+  tags = merge(
+  {
     Name = "Access to elasticache Redis"
-  }
+  },
+  var.default_tags,
+  {
+    environment = var.deployment_environment
+  })
 }
 
 resource "aws_elasticache_subnet_group" "private" {
@@ -427,9 +438,13 @@ resource "aws_instance" "jump" {
     volume_size = 50
   }
 
-  tags = {
+  tags = merge({
     Name = "raw-data-jump"
-  }
+  },
+  var.default_tags,
+  {
+    environment = var.deployment_environment
+  })
 
   lifecycle {
     ignore_changes = [
@@ -466,9 +481,13 @@ resource "aws_instance" "backend" {
     http_tokens = "required"
   }
 
-  tags = {
+  tags = merge({
     Name = "raw-data-backend"
-  }
+  },
+  var.default_tags,
+  {
+    environment = var.deployment_environment
+  })
 
   lifecycle {
     ignore_changes = [
diff --git a/infra/prod-aws/variables.tf b/infra/prod-aws/variables.tf
index b27e79d2..49b48942 100644
--- a/infra/prod-aws/variables.tf
+++ b/infra/prod-aws/variables.tf
@@ -32,7 +32,8 @@ variable "default_tags" {
   type        = map(string)
 
   default = {
-    project        = "raw-data-services"
+    project        = "map-data-access"
+    tool           = "raw-data-services"
     maintainer     = "kshitij.sharma@hotosm.org"
     documentation  = "https://docs.hotosm.org"
     cost_center    = "raw-data-services"