v2.1 -> latest tags

Signed-off-by: John Ritsema <john.ritsema@turner.com>

Author: jritsema

.gitignore

@@ -0,0 +1,4 @@
+.terraform
+terraform.tfstate
+terraform.tfstate.backup
+examples/open/main.tf

main.tf

@@ -1,48 +1,40 @@
-#
-# Security group resources
-#
-
 resource "aws_security_group" "redis" {
   vpc_id = "${var.vpc_id}"
 
   tags {
-    Name = "${var.tag_name}"
-    environment = "${var.tag_environment}"
-    team = "${var.tag_team}"
-    application = "${var.tag_application}"
+    Name          = "${var.tag_name}"
+    environment   = "${var.tag_environment}"
+    team          = "${var.tag_team}"
+    application   = "${var.tag_application}"
+    contact-email = "${var.tag_contact-email}"
+    tag_customer  = "${var.tag_customer}"
   }
 }
 
-#
-# ElastiCache resources
-#
-
 resource "aws_elasticache_subnet_group" "default" {
-  name = "subnet-group-${var.tag_team}-${var.tag_application}-${var.tag_environment}"
+  name        = "subnet-group-${var.tag_team}-${var.tag_application}-${var.tag_environment}"
   description = "Private subnets for the ElastiCache instances: ${var.tag_team} ${var.tag_application} ${var.tag_environment}"
-  subnet_ids = ["${split(",", var.private_subnet_ids)}"]
+  subnet_ids  = ["${split(",", var.private_subnet_ids)}"]
 }
 
 resource "aws_elasticache_cluster" "redis" {
-  cluster_id = "${var.cluster_id}"
-  engine = "redis"
-  engine_version = "${var.engine_version}"
-  maintenance_window = "${var.maintenance_window}"
-  node_type = "${var.instance_type}"
-  num_cache_nodes = "1"
+  cluster_id           = "${var.cluster_id}"
+  engine               = "redis"
+  engine_version       = "${var.engine_version}"
+  maintenance_window   = "${var.maintenance_window}"
+  node_type            = "${var.instance_type}"
+  num_cache_nodes      = "1"
   parameter_group_name = "${var.parameter_group_name}"
-  port = "6379"
-  subnet_group_name = "${aws_elasticache_subnet_group.default.name}"
-  security_group_ids = ["${aws_security_group.redis.id}"]
+  port                 = "6379"
+  subnet_group_name    = "${aws_elasticache_subnet_group.default.name}"
+  security_group_ids   = ["${aws_security_group.redis.id}"]
 
   tags {
-    Name = "${var.tag_name}"
-    environment = "${var.tag_environment}"
-    team = "${var.tag_team}"
-    application = "${var.tag_application}"
+    Name          = "${var.tag_name}"
+    environment   = "${var.tag_environment}"
+    team          = "${var.tag_team}"
+    application   = "${var.tag_application}"
+    contact-email = "${var.tag_contact-email}"
+    tag_customer  = "${var.tag_customer}"
   }
 }
-
-#
-# todo: add CloudWatch resources
-#

readme.md

@@ -5,22 +5,26 @@ A Terraform module that represents an AWS ElastiCache Redis cluster.  Note that
 ### Usage
 
 ```terraform
-module "elasticache_redis" {
-  source = "github.com/turnerlabs/terraform-aws-elasticache-redis?ref=v2.0"
-
-  cluster_id = "myteam-myapp-dev"
+provider "aws" {
+  region = "us-east-1"
+}
 
-  vpc_id = "vpc-20f74844"
-  private_subnet_ids = "subnet-4a887f3c,subnet-76dae35d"
+module "elasticache_redis" {
+  source = "github.com/turnerlabs/terraform-aws-elasticache-redis?ref=v2.1"
 
-  engine_version = "2.8.24"
-  instance_type = "cache.m3.medium"
+  cluster_id         = "myteam-myapp-dev"
+  engine_version     = "2.8.24"
+  instance_type      = "cache.m3.medium"
   maintenance_window = "sun:05:00-sun:06:00"
-
-  tag_name = "redis"
-  tag_environment = "dev"
-  tag_team = "myteam"
-  tag_application = "myapp"
+  vpc_id             = "vpc-d070efb3"
+  private_subnet_ids = "subnet-020d8b59,subnet-13f50b64"
+
+  tag_name          = "myteam-myapp-dev"
+  tag_team          = "my-team"
+  tag_contact-email = "my-team@turner.com"
+  tag_application   = "my-app"
+  tag_environment   = "dev"
+  tag_customer      = "my-customer"
 }
 ```
 
@@ -38,6 +42,8 @@ module "elasticache_redis" {
 - `tag_environment`
 - `tag_team`
 - `tag_application`
+- `tag_customer`
+- `tag_contact-email`
 
 
 ### Outputs

variables.tf

@@ -23,6 +23,9 @@ variable "maintenance_window" {
 
 # tags
 variable "tag_name" {}
+
 variable "tag_environment" {}
 variable "tag_team" {}
 variable "tag_application" {}
+variable "tag_contact-email" {}
+variable "tag_customer" {}