Merge pull request #20 from unifio/dbi-ease-refactor

Added ability to override suffix/prefix for stack_item_label in asg/lc

group/asg/main.tf

@@ -14,7 +14,7 @@ resource "aws_autoscaling_group" "asg" {
   max_size                  = "${var.max_size}"
   metrics_granularity       = "${var.metrics_granularity}"
   min_size                  = "${var.min_size}"
-  name                      = "${var.stack_item_label}"
+  name                      = "${length(var.asg_name_override) > 0 ? var.asg_name_override : var.stack_item_label}"
   placement_group           = "${var.placement_group}"
   protect_from_scale_in     = "${var.protect_from_scale_in}"
   suspended_processes       = ["${compact(var.suspended_processes)}"]
@@ -31,7 +31,7 @@ resource "aws_autoscaling_group" "asg" {
 
   tag {
     key                 = "Name"
-    value               = "${var.stack_item_label}"
+    value               = "${length(var.asg_name_override) > 0 ? var.asg_name_override : var.stack_item_label}"
     propagate_at_launch = true
   }
 
@@ -57,7 +57,7 @@ resource "aws_autoscaling_group" "asg_elb" {
   metrics_granularity       = "${var.metrics_granularity}"
   min_elb_capacity          = "${length(var.min_elb_capacity) > 0 ? var.min_elb_capacity : "0"}"
   min_size                  = "${var.min_size}"
-  name                      = "${var.stack_item_label}"
+  name                      = "${length(var.asg_name_override) > 0 ? var.asg_name_override : var.stack_item_label}"
   placement_group           = "${var.placement_group}"
   protect_from_scale_in     = "${var.protect_from_scale_in}"
   suspended_processes       = ["${compact(var.suspended_processes)}"]
@@ -75,7 +75,7 @@ resource "aws_autoscaling_group" "asg_elb" {
 
   tag {
     key                 = "Name"
-    value               = "${var.stack_item_label}"
+    value               = "${length(var.asg_name_override) > 0 ? var.asg_name_override : var.stack_item_label}"
     propagate_at_launch = true
   }
 

group/asg/variables.tf

@@ -9,6 +9,11 @@ variable "stack_item_label" {
   type = "string"
 }
 
+## Allow override of resource naming
+variable "asg_name_override" {
+  type = "string"
+}
+
 ## VPC parameters
 variable "subnets" {
   type = "list"
@@ -20,6 +25,7 @@ variable "lc_id" {
 }
 
 ## ASG parameters
+
 variable "default_cooldown" {
   type = "string"
 }

group/lc/main.tf

@@ -3,13 +3,13 @@
 ## Creates security group
 resource "aws_security_group" "sg_asg" {
   description = "${var.stack_item_fullname} security group"
-  name_prefix = "${var.stack_item_label}-asg-"
+  name_prefix = "${length(var.lc_sg_name_prefix_override) > 0 ? format("%s-", var.lc_sg_name_prefix_override) : format("%s-asg-", var.stack_item_label)}"
   vpc_id      = "${var.vpc_id}"
 
   tags {
     application = "${var.stack_item_fullname}"
     managed_by  = "terraform"
-    Name        = "${var.stack_item_label}-asg"
+    Name        = "${length(var.lc_sg_name_prefix_override) > 0 ? var.lc_sg_name_prefix_override : format("%s-asg", var.stack_item_label)}"
   }
 
   lifecycle {

group/lc/variables.tf

@@ -9,6 +9,11 @@ variable "stack_item_label" {
   type = "string"
 }
 
+## Allow override of resource naming
+variable "lc_sg_name_prefix_override" {
+  type = "string"
+}
+
 ## VPC parameters
 variable "vpc_id" {
   type = "string"

group/main.tf

@@ -58,8 +58,9 @@ module "lc" {
   source = "lc"
 
   ### Resource labels
-  stack_item_fullname = "${var.stack_item_fullname}"
-  stack_item_label    = "${var.stack_item_label}"
+  stack_item_fullname        = "${var.stack_item_fullname}"
+  stack_item_label           = "${var.stack_item_label}"
+  lc_sg_name_prefix_override = "${var.lc_sg_name_prefix_override}"
 
   ### VPC parameters
   vpc_id = "${var.vpc_id}"
@@ -96,6 +97,7 @@ module "asg" {
   ### Resource tags
   stack_item_label    = "${var.stack_item_label}"
   stack_item_fullname = "${var.stack_item_fullname}"
+  asg_name_override   = "${var.asg_name_override}"
 
   ### VPC parameters
   subnets = ["${var.subnets}"]

group/variables.tf

@@ -11,6 +11,18 @@ variable "stack_item_label" {
   description = "Short form identifier for this stack. This value is used to create the 'Name' resource tag for resources created by this stack item, and also serves as a unique key for re-use."
 }
 
+variable "asg_name_override" {
+  type        = "string"
+  description = "A string to override the ASG name"
+  default     = ""
+}
+
+variable "lc_sg_name_prefix_override" {
+  type        = "string"
+  description = "A string to override the ASG name"
+  default     = ""
+}
+
 ## VPC parameters
 variable "subnets" {
   type        = "list"