Merge pull request #8 from myoung34/develop

Add changes to lists and names

Author: hectcastro

README.md

@@ -4,39 +4,45 @@ A Terraform module to create an Amazon Web Services (AWS) Redis ElastiCache clus
 
 ## Usage
 
-```javascript
+```hcl
+resource "aws_security_group" "redis" {
+  vpc_id = "${vpc.foo.id}"
+
+  tags {
+    Name = "sgCacheCluster"
+  }
+}
+
 module "redis_elasticache" {
   source = "github.com/azavea/terraform-aws-redis-elasticache"
 
   vpc_id = "vpc-20f74844"
-  vpc_cidr_block = "10.0.0.0/16"
 
   cache_name = "cache"
   engine_version = "2.8.22"
   instance_type = "cache.t2.micro"
   maintenance_window = "sun:05:00-sun:06:00"
 
-  private_subnet_ids = "subnet-4a887f3c,subnet-76dae35d"
+  private_subnet_ids = ["subnet-4a887f3c","subnet-76dae35d"]
+  security_group_ids = ["${aws_security_group.redis.id}"]
 
-  alarm_actions = "arn:aws:sns..."
+  alarm_action = "arn:aws:sns..."
 }
 ```
 
 ## Variables
 
 - `vpc_id` - ID of VPC meant to house the cache
-- `vpc_cidr_block` - CIDR block of VPC
 - `cache_name` - Name used as ElastiCache cluster ID
 - `engine_version` - Cache engine version (default: `2.8.22`)
 - `instance_type` - Instance type for cache instance (default: `cache.t2.micro`)
 - `maintenance_window` - 60 minute time window to reserve for maintenance
   (default: `sun:05:00-sun:06:00`)
 - `private_subnet_ids` - Comma delimited list of private subnet IDs
-- `alarm_actions` - Comma delimited list of ARNs to be notified via CloudWatch
+- `alarm_action` - ARN to be notified via CloudWatch
 
 ## Outputs
 
-- `cache_security_group_id` - Security group ID of the cache cluster
 - `hostname` - Public DNS name of cache node
 - `port` - Port of cache instance
 - `endpoint` - Public DNS name and port separated by a `:`

main.tf

@@ -1,15 +1,3 @@
-#
-# Security group resources
-#
-
-resource "aws_security_group" "redis" {
-  vpc_id = "${var.vpc_id}"
-
-  tags {
-    Name = "sgCacheCluster"
-  }
-}
-
 #
 # ElastiCache resources
 #
@@ -24,23 +12,22 @@ resource "aws_elasticache_cluster" "redis" {
   parameter_group_name = "default.redis2.8"
   port                 = "6379"
   subnet_group_name    = "${aws_elasticache_subnet_group.default.name}"
-  security_group_ids   = ["${aws_security_group.redis.id}"]
+  security_group_ids   = "${var.security_group_ids}"
 
   tags {
-    Name = "CacheCluster"
+    Name = "${var.cache_name}"
   }
 }
 
 resource "aws_elasticache_subnet_group" "default" {
   name        = "${var.cache_name}-subnet-group"
   description = "Private subnets for the ElastiCache instances"
-  subnet_ids  = ["${split(",", var.private_subnet_ids)}"]
+  subnet_ids  = "${var.private_subnet_ids}"
 }
 
 #
 # CloudWatch resources
 #
-
 resource "aws_cloudwatch_metric_alarm" "cpu" {
   alarm_name          = "alarmCacheClusterCPUUtilization-${var.cache_name}"
   alarm_description   = "Cache cluster CPU utilization"
@@ -53,10 +40,12 @@ resource "aws_cloudwatch_metric_alarm" "cpu" {
   threshold           = "75"
 
   dimensions {
-    CacheClusterId = "${aws_elasticache_cluster.redis.id}"
+    CacheClusterName = "${var.cache_name}"
   }
 
-  alarm_actions = ["${split(",", var.alarm_actions)}"]
+  # for some reason trying to pass a list here causes the error `  * aws_cloudwatch_metric_alarm.cpu: alarm_actions: should be a list` in terraform 0.7.5
+  # passing lists elsewhere works fine
+  alarm_actions = ["${var.alarm_action}"]
 }
 
 resource "aws_cloudwatch_metric_alarm" "memory_free" {
@@ -73,8 +62,10 @@ resource "aws_cloudwatch_metric_alarm" "memory_free" {
   threshold = "10000000"
 
   dimensions {
-    CacheClusterId = "${aws_elasticache_cluster.redis.id}"
+    CacheClusterName = "${var.cache_name}"
   }
 
-  alarm_actions = ["${split(",", var.alarm_actions)}"]
+  # for some reason trying to pass a list here causes the error `  * aws_cloudwatch_metric_alarm.cpu: alarm_actions: should be a list` in terraform 0.7.5
+  # passing lists elsewhere works fine
+  alarm_actions = ["${var.alarm_action}"]
 }

outputs.tf

@@ -1,7 +1,3 @@
-output "cache_security_group_id" {
-  value = "${aws_security_group.redis.id}"
-}
-
 output "hostname" {
   value = "${aws_elasticache_cluster.redis.cache_nodes.0.address}"
 }

variables.tf

@@ -1,9 +1,6 @@
 variable "vpc_id" {
 }
 
-variable "vpc_cidr_block" {
-}
-
 variable "cache_name" {
 }
 
@@ -21,7 +18,12 @@ variable "maintenance_window" {
 }
 
 variable "private_subnet_ids" {
+  type = "list"
+}
+
+variable "alarm_action" {
 }
 
-variable "alarm_actions" {
+variable "security_group_ids" {
+  type = "list"
 }