From 7ec659e4d52298c191abc1eabd1b16e3bdb1e09a Mon Sep 17 00:00:00 2001
From: JeongJu Kim <haje01@gmail.com>
Date: Tue, 8 Feb 2022 15:15:04 +0900
Subject: [PATCH 1/4] additional tags

---
 main.tf      | 21 ++++++++++++---------
 variables.tf |  5 +++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/main.tf b/main.tf
index fc0da2c..8b40c33 100644
--- a/main.tf
+++ b/main.tf
@@ -104,9 +104,10 @@ resource "aws_security_group" "rabbitmq_elb" {
     cidr_blocks = ["0.0.0.0/0"]
   }
 
-  tags = {
-    Name = "rabbitmq ${var.name} ELB"
-  }
+  tags = merge(
+    {Name = "rabbitmq ${var.name} ELB"},
+    var.tags
+  )
 }
 
 resource "aws_security_group" "rabbitmq_nodes" {
@@ -145,9 +146,10 @@ resource "aws_security_group" "rabbitmq_nodes" {
     ]
   }
 
-  tags = {
-    Name = "rabbitmq ${var.name} nodes"
-  }
+  tags = merge(
+    {Name = "rabbitmq ${var.name} nodes"},
+    var.tags
+  )
 }
 
 resource "aws_launch_configuration" "rabbitmq" {
@@ -220,7 +222,8 @@ resource "aws_elb" "elb" {
   internal        = true
   security_groups = concat([aws_security_group.rabbitmq_elb.id], var.elb_additional_security_group_ids)
 
-  tags = {
-    Name = local.cluster_name
-  }
+  tags = merge(
+    {Name = local.cluster_name},
+    var.tags
+  )
 }
diff --git a/variables.tf b/variables.tf
index 48d0784..05fb6b8 100644
--- a/variables.tf
+++ b/variables.tf
@@ -54,3 +54,8 @@ variable "instance_volume_iops" {
   default = "0"
 }
 
+variable "tags" {
+  description = "A map of tags to add to all resources"
+  type        = map(string)
+  default     = {}
+}

From f274fd3aeaa70a270417ffe167ff42272fe2993c Mon Sep 17 00:00:00 2001
From: JeongJu Kim <haje01@gmail.com>
Date: Tue, 8 Feb 2022 16:40:54 +0900
Subject: [PATCH 2/4] rename

---
 main.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main.tf b/main.tf
index 8b40c33..41f0160 100644
--- a/main.tf
+++ b/main.tf
@@ -15,7 +15,7 @@ data "aws_ami_ids" "ami" {
 }
 
 locals {
-  cluster_name = "rabbitmq-${var.name}"
+  cluster_name = "${var.name}-rabbitmq"
 }
 
 resource "random_string" "admin_password" {
@@ -93,7 +93,7 @@ resource "aws_iam_instance_profile" "profile" {
 }
 
 resource "aws_security_group" "rabbitmq_elb" {
-  name        = "rabbitmq_elb-${var.name}"
+  name        = "${var.name}-rabbitmq_elb"
   vpc_id      = var.vpc_id
   description = "Security Group for the rabbitmq elb"
 
@@ -105,7 +105,7 @@ resource "aws_security_group" "rabbitmq_elb" {
   }
 
   tags = merge(
-    {Name = "rabbitmq ${var.name} ELB"},
+    {Name = "${var.name} rabbitmq ELB"},
     var.tags
   )
 }
@@ -147,7 +147,7 @@ resource "aws_security_group" "rabbitmq_nodes" {
   }
 
   tags = merge(
-    {Name = "rabbitmq ${var.name} nodes"},
+    {Name = "${var.name} rabbitmq nodes"},
     var.tags
   )
 }

From 9e4f204bf92e80e7a617a2bb0fd7e17e18f75254 Mon Sep 17 00:00:00 2001
From: JeongJu Kim <haje01@gmail.com>
Date: Tue, 8 Feb 2022 18:01:43 +0900
Subject: [PATCH 3/4] asg tags

---
 main.tf | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/main.tf b/main.tf
index 41f0160..6420933 100644
--- a/main.tf
+++ b/main.tf
@@ -185,10 +185,14 @@ resource "aws_autoscaling_group" "rabbitmq" {
   load_balancers            = [aws_elb.elb.name]
   vpc_zone_identifier       = var.subnet_ids
 
-  tag {
-    key                 = "Name"
-    value               = local.cluster_name
-    propagate_at_launch = true
+  dynamic "tag" {
+    for_each = var.tags
+
+    content {
+      key    =  tag.key
+      value   =  tag.value
+      propagate_at_launch =  true
+    }
   }
 }
 

From b1bf7138d6a854e42f45328df55dcda6099ebf2c Mon Sep 17 00:00:00 2001
From: JeongJu Kim <haje01@gmail.com>
Date: Tue, 8 Feb 2022 18:41:40 +0900
Subject: [PATCH 4/4] ec2 name

---
 main.tf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/main.tf b/main.tf
index 6420933..dbf0097 100644
--- a/main.tf
+++ b/main.tf
@@ -185,6 +185,12 @@ resource "aws_autoscaling_group" "rabbitmq" {
   load_balancers            = [aws_elb.elb.name]
   vpc_zone_identifier       = var.subnet_ids
 
+  tag {
+    key                 = "Name"
+    value               = local.cluster_name
+    propagate_at_launch = true
+  }
+
   dynamic "tag" {
     for_each = var.tags