Merge pull request tmknom#11 from tmknom/upgrade-terraform-0.12

Upgraded module to support Terraform 0.12

Author: tmknom

examples/complete/main.tf

@@ -16,9 +16,9 @@ module "elasticache_redis" {
   family                     = "redis5.0"
   description                = "This is example"
 
-  subnet_ids          = ["${module.vpc.public_subnet_ids}"]
-  vpc_id              = "${module.vpc.vpc_id}"
-  ingress_cidr_blocks = ["${module.vpc.vpc_cidr_block}"]
+  subnet_ids          = [module.vpc.public_subnet_ids]
+  vpc_id              = module.vpc.vpc_id
+  ingress_cidr_blocks = [module.vpc.vpc_cidr_block]
 
   tags = {
     Environment = "prod"
@@ -27,10 +27,10 @@ module "elasticache_redis" {
 
 module "vpc" {
   source                    = "git::https://github.com/tmknom/terraform-aws-vpc.git?ref=tags/1.0.0"
-  cidr_block                = "${local.cidr_block}"
+  cidr_block                = local.cidr_block
   name                      = "vpc-elasticache-redis"
-  public_subnet_cidr_blocks = ["${cidrsubnet(local.cidr_block, 8, 0)}", "${cidrsubnet(local.cidr_block, 8, 1)}"]
-  public_availability_zones = ["${data.aws_availability_zones.available.names}"]
+  public_subnet_cidr_blocks = [cidrsubnet(local.cidr_block, 8, 0), cidrsubnet(local.cidr_block, 8, 1)]
+  public_availability_zones = [data.aws_availability_zones.available.names]
 }
 
 locals {

examples/complete/outputs.tf

@@ -1,47 +1,47 @@
 output "elasticache_replication_group_id" {
-  value = "${module.elasticache_redis.elasticache_replication_group_id}"
+  value = module.elasticache_redis.elasticache_replication_group_id
 }
 
 output "elasticache_replication_group_primary_endpoint_address" {
-  value = "${module.elasticache_redis.elasticache_replication_group_primary_endpoint_address}"
+  value = module.elasticache_redis.elasticache_replication_group_primary_endpoint_address
 }
 
 output "elasticache_replication_group_member_clusters" {
-  value = "${module.elasticache_redis.elasticache_replication_group_member_clusters}"
+  value = module.elasticache_redis.elasticache_replication_group_member_clusters
 }
 
 output "elasticache_parameter_group_id" {
-  value = "${module.elasticache_redis.elasticache_parameter_group_id}"
+  value = module.elasticache_redis.elasticache_parameter_group_id
 }
 
 output "security_group_id" {
-  value = "${module.elasticache_redis.security_group_id}"
+  value = module.elasticache_redis.security_group_id
 }
 
 output "security_group_arn" {
-  value = "${module.elasticache_redis.security_group_arn}"
+  value = module.elasticache_redis.security_group_arn
 }
 
 output "security_group_vpc_id" {
-  value = "${module.elasticache_redis.security_group_vpc_id}"
+  value = module.elasticache_redis.security_group_vpc_id
 }
 
 output "security_group_owner_id" {
-  value = "${module.elasticache_redis.security_group_owner_id}"
+  value = module.elasticache_redis.security_group_owner_id
 }
 
 output "security_group_name" {
-  value = "${module.elasticache_redis.security_group_name}"
+  value = module.elasticache_redis.security_group_name
 }
 
 output "security_group_description" {
-  value = "${module.elasticache_redis.security_group_description}"
+  value = module.elasticache_redis.security_group_description
 }
 
 output "security_group_ingress" {
-  value = "${module.elasticache_redis.security_group_ingress}"
+  value = module.elasticache_redis.security_group_ingress
 }
 
 output "security_group_egress" {
-  value = "${module.elasticache_redis.security_group_egress}"
+  value = module.elasticache_redis.security_group_egress
 }

examples/minimal/main.tf

@@ -4,17 +4,17 @@ module "elasticache_redis" {
   number_cache_clusters = 2
   node_type             = "cache.m3.medium"
 
-  subnet_ids          = ["${module.vpc.public_subnet_ids}"]
-  vpc_id              = "${module.vpc.vpc_id}"
-  ingress_cidr_blocks = ["${module.vpc.vpc_cidr_block}"]
+  subnet_ids          = [module.vpc.public_subnet_ids]
+  vpc_id              = module.vpc.vpc_id
+  ingress_cidr_blocks = [module.vpc.vpc_cidr_block]
 }
 
 module "vpc" {
   source                    = "git::https://github.com/tmknom/terraform-aws-vpc.git?ref=tags/1.0.0"
-  cidr_block                = "${local.cidr_block}"
+  cidr_block                = local.cidr_block
   name                      = "vpc-elasticache-redis"
-  public_subnet_cidr_blocks = ["${cidrsubnet(local.cidr_block, 8, 0)}", "${cidrsubnet(local.cidr_block, 8, 1)}"]
-  public_availability_zones = ["${data.aws_availability_zones.available.names}"]
+  public_subnet_cidr_blocks = [cidrsubnet(local.cidr_block, 8, 0), cidrsubnet(local.cidr_block, 8, 1)]
+  public_availability_zones = [data.aws_availability_zones.available.names]
 }
 
 locals {

examples/minimal/outputs.tf

@@ -1,47 +1,47 @@
 output "elasticache_replication_group_id" {
-  value = "${module.elasticache_redis.elasticache_replication_group_id}"
+  value = module.elasticache_redis.elasticache_replication_group_id
 }
 
 output "elasticache_replication_group_primary_endpoint_address" {
-  value = "${module.elasticache_redis.elasticache_replication_group_primary_endpoint_address}"
+  value = module.elasticache_redis.elasticache_replication_group_primary_endpoint_address
 }
 
 output "elasticache_replication_group_member_clusters" {
-  value = "${module.elasticache_redis.elasticache_replication_group_member_clusters}"
+  value = module.elasticache_redis.elasticache_replication_group_member_clusters
 }
 
 output "elasticache_parameter_group_id" {
-  value = "${module.elasticache_redis.elasticache_parameter_group_id}"
+  value = module.elasticache_redis.elasticache_parameter_group_id
 }
 
 output "security_group_id" {
-  value = "${module.elasticache_redis.security_group_id}"
+  value = module.elasticache_redis.security_group_id
 }
 
 output "security_group_arn" {
-  value = "${module.elasticache_redis.security_group_arn}"
+  value = module.elasticache_redis.security_group_arn
 }
 
 output "security_group_vpc_id" {
-  value = "${module.elasticache_redis.security_group_vpc_id}"
+  value = module.elasticache_redis.security_group_vpc_id
 }
 
 output "security_group_owner_id" {
-  value = "${module.elasticache_redis.security_group_owner_id}"
+  value = module.elasticache_redis.security_group_owner_id
 }
 
 output "security_group_name" {
-  value = "${module.elasticache_redis.security_group_name}"
+  value = module.elasticache_redis.security_group_name
 }
 
 output "security_group_description" {
-  value = "${module.elasticache_redis.security_group_description}"
+  value = module.elasticache_redis.security_group_description
 }
 
 output "security_group_ingress" {
-  value = "${module.elasticache_redis.security_group_ingress}"
+  value = module.elasticache_redis.security_group_ingress
 }
 
 output "security_group_egress" {
-  value = "${module.elasticache_redis.security_group_egress}"
+  value = module.elasticache_redis.security_group_egress
 }

main.tf

@@ -5,9 +5,9 @@
 # https://www.terraform.io/docs/providers/aws/r/elasticache_replication_group.html
 resource "aws_elasticache_replication_group" "default" {
   engine               = "redis"
-  parameter_group_name = "${aws_elasticache_parameter_group.default.name}"
-  subnet_group_name    = "${aws_elasticache_subnet_group.default.name}"
-  security_group_ids   = ["${aws_security_group.default.id}"]
+  parameter_group_name = aws_elasticache_parameter_group.default.name
+  subnet_group_name    = aws_elasticache_subnet_group.default.name
+  security_group_ids   = [aws_security_group.default.id]
 
   # The replication group identifier. This parameter is stored as a lowercase string.
   #
@@ -17,100 +17,100 @@ resource "aws_elasticache_replication_group" "default" {
   # - Cannot end with a hyphen.
   #
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Clusters.Create.CON.Redis.html
-  replication_group_id = "${var.name}"
+  replication_group_id = var.name
 
   # The number of clusters this replication group initially has.
   # If automatic_failover_enabled is true, the value of this parameter must be at least 2.
   # The maximum permitted value for number_cache_clusters is 6 (1 primary plus 5 replicas).
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Scaling.RedisReplGrps.html
-  number_cache_clusters = "${var.number_cache_clusters}"
+  number_cache_clusters = var.number_cache_clusters
 
   # The compute and memory capacity of the nodes in the node group (shard).
   # Generally speaking, the current generation types provide more memory and computational power at lower cost
   # when compared to their equivalent previous generation counterparts.
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/CacheNodes.SupportedTypes.html
-  node_type = "${var.node_type}"
+  node_type = var.node_type
 
   # The version number of the cache engine to be used for the clusters in this replication group.
   # You can upgrade to a newer engine version, but you cannot downgrade to an earlier engine version.
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/supported-engine-versions.html
-  engine_version = "${var.engine_version}"
+  engine_version = var.engine_version
 
   # The port number on which each member of the replication group accepts connections.
   # Redis default port is 6379.
-  port = "${var.port}"
+  port = var.port
 
   # Every cluster and replication group has a weekly maintenance window during which any system changes are applied.
   # Specifies the weekly time range during which maintenance on the cluster is performed.
   # It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi. (Example: "sun:23:00-mon:01:30")
   # The minimum maintenance window is a 60 minute period.
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/maintenance-window.html
-  maintenance_window = "${var.maintenance_window}"
+  maintenance_window = var.maintenance_window
 
   # A period during each day when ElastiCache will begin creating a backup.
   # The minimum length for the backup window is 60 minutes.
   # If you do not specify a backup window, ElastiCache will assign one automatically.
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/backups-automatic.html
-  snapshot_window = "${var.snapshot_window}"
+  snapshot_window = var.snapshot_window
 
   # The number of days the backup will be retained in Amazon S3.
   # The maximum backup retention limit is 35 days.
   # If the backup retention limit is set to 0, automatic backups are disabled for the cluster.
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/backups-automatic.html
-  snapshot_retention_limit = "${var.snapshot_retention_limit}"
+  snapshot_retention_limit = var.snapshot_retention_limit
 
   # You can enable Multi-AZ with Automatic Failover only on Redis (cluster mode disabled) clusters that have at least
   # one available read replica. Clusters without read replicas do not provide high availability or fault tolerance.
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/AutoFailover.html
-  automatic_failover_enabled = "${var.automatic_failover_enabled}"
+  automatic_failover_enabled = var.automatic_failover_enabled
 
   # Redis at-rest encryption is an optional feature to increase data security by encrypting on-disk data during sync
   # and backup or snapshot operations. Because there is some processing needed to encrypt and decrypt the data,
   # enabling at-rest encryption can have some performance impact during these operations.
   # You should benchmark your data with and without at-rest encryption to determine the performance impact for your use cases.
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/at-rest-encryption.html
-  at_rest_encryption_enabled = "${var.at_rest_encryption_enabled}"
+  at_rest_encryption_enabled = var.at_rest_encryption_enabled
 
   # ElastiCache in-transit encryption is an optional feature that allows you to increase the security of your data at
   # its most vulnerable points—when it is in transit from one location to another. Because there is some processing
   # needed to encrypt and decrypt the data at the endpoints, enabling in-transit encryption can have some performance impact.
   # You should benchmark your data with and without in-transit encryption to determine the performance impact for your use cases.
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/in-transit-encryption.html
-  transit_encryption_enabled = "${var.transit_encryption_enabled}"
+  transit_encryption_enabled = var.transit_encryption_enabled
 
   # If true, this parameter causes the modifications in this request and any pending modifications to be applied,
   # asynchronously and as soon as possible, regardless of the maintenance_window setting for the replication group.
   # apply_immediately applies only to modifications in node type, engine version, and changing the number of nodes in a cluster.
   # Other modifications, such as changing the maintenance window, are applied immediately.
   # https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/Clusters.Modify.html
-  apply_immediately = "${var.apply_immediately}"
+  apply_immediately = var.apply_immediately
 
   # A user-created description for the replication group.
-  replication_group_description = "${var.description}"
+  replication_group_description = var.description
 
   # A mapping of tags to assign to the resource.
-  tags = "${merge(map("Name", var.name), var.tags)}"
+  tags = merge({ "Name" = var.name }, var.tags)
 }
 
 # https://www.terraform.io/docs/providers/aws/r/elasticache_parameter_group.html
 resource "aws_elasticache_parameter_group" "default" {
-  name        = "${var.name}"
-  family      = "${var.family}"
-  description = "${var.description}"
+  name        = var.name
+  family      = var.family
+  description = var.description
 }
 
 # https://www.terraform.io/docs/providers/aws/r/elasticache_subnet_group.html
 resource "aws_elasticache_subnet_group" "default" {
-  name        = "${var.name}"
-  subnet_ids  = ["${var.subnet_ids}"]
-  description = "${var.description}"
+  name        = var.name
+  subnet_ids  = var.subnet_ids
+  description = var.description
 }
 
 # https://www.terraform.io/docs/providers/aws/r/security_group.html
 resource "aws_security_group" "default" {
-  name   = "${local.security_group_name}"
-  vpc_id = "${var.vpc_id}"
-  tags   = "${merge(map("Name", local.security_group_name), var.tags)}"
+  name   = local.security_group_name
+  vpc_id = var.vpc_id
+  tags   = merge({ "Name" = local.security_group_name }, var.tags)
 }
 
 locals {
@@ -120,11 +120,11 @@ locals {
 # https://www.terraform.io/docs/providers/aws/r/security_group_rule.html
 resource "aws_security_group_rule" "ingress" {
   type              = "ingress"
-  from_port         = "${var.port}"
-  to_port           = "${var.port}"
+  from_port         = var.port
+  to_port           = var.port
   protocol          = "tcp"
-  cidr_blocks       = ["${var.ingress_cidr_blocks}"]
-  security_group_id = "${aws_security_group.default.id}"
+  cidr_blocks       = var.ingress_cidr_blocks
+  security_group_id = aws_security_group.default.id
 }
 
 resource "aws_security_group_rule" "egress" {
@@ -133,5 +133,5 @@ resource "aws_security_group_rule" "egress" {
   to_port           = 0
   protocol          = "-1"
   cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = "${aws_security_group.default.id}"
+  security_group_id = aws_security_group.default.id
 }