Merge pull request #9 from asicsdigital/terraform12

Upgrade to Terraform 0.12.9

Author: Falpangaea

.terraform-version

@@ -1 +1 @@
-0.11.8
+0.12.9

alb.tf

@@ -1,40 +1,40 @@
 # Create a new load balancer
 
 locals {
-  enable_custom_domain = "${var.dns_zone == "" ? false : true}"
+  enable_custom_domain = var.dns_zone == "" ? false : true
   custom_endpoint      = "${coalesce(var.hostname, "vault")}.${var.dns_zone}"
-  vault_url_protocol   = "${local.enable_custom_domain ? "https" : "http"}"
-  vault_url_hostname   = "${local.enable_custom_domain ? local.custom_endpoint : aws_alb.vault.dns_name}"
+  vault_url_protocol   = local.enable_custom_domain ? "https" : "http"
+  vault_url_hostname   = local.enable_custom_domain ? local.custom_endpoint : aws_alb.vault.dns_name
   vault_url            = "${local.vault_url_protocol}://${local.vault_url_hostname}"
 }
 
 resource "aws_alb" "vault" {
   name_prefix     = "vault-"
-  security_groups = ["${aws_security_group.lb-vault-sg.id}"]
+  security_groups = [aws_security_group.lb-vault-sg.id]
   internal        = false
-  subnets         = ["${var.subnets}"]
+  subnets         = var.subnets
 
-  tags {
-    Environment = "${var.env}"
-    VPC         = "${local.vpc_name}"
+  tags = {
+    Environment = var.env
+    VPC         = local.vpc_name
   }
 
   access_logs {
-    bucket = "${var.alb_log_bucket}"
+    bucket = var.alb_log_bucket
     prefix = "logs/elb/${local.vpc_name}/vault"
   }
 }
 
 # DNS Alias for the LB
 resource "aws_route53_record" "vault" {
-  count   = "${local.enable_custom_domain ? 1 : 0}"
-  zone_id = "${data.aws_route53_zone.zone.zone_id}"
-  name    = "${coalesce(var.hostname, "vault")}.${data.aws_route53_zone.zone.name}"
+  count   = local.enable_custom_domain ? 1 : 0
+  zone_id = data.aws_route53_zone.zone[0].zone_id
+  name    = "${coalesce(var.hostname, "vault")}.${data.aws_route53_zone.zone[0].name}"
   type    = "A"
 
   alias {
-    name                   = "${aws_alb.vault.dns_name}"
-    zone_id                = "${aws_alb.vault.zone_id}"
+    name                   = aws_alb.vault.dns_name
+    zone_id                = aws_alb.vault.zone_id
     evaluate_target_health = false
   }
 }
@@ -43,8 +43,8 @@ resource "aws_route53_record" "vault" {
 resource "aws_alb_target_group" "vault_ui" {
   port                 = 8200
   protocol             = "HTTP"
-  deregistration_delay = "${var.lb_deregistration_delay}"
-  vpc_id               = "${data.aws_vpc.vpc.id}"
+  deregistration_delay = var.lb_deregistration_delay
+  vpc_id               = data.aws_vpc.vpc.id
 
   health_check {
     path    = "/v1/sys/health?standbyok=true"
@@ -56,35 +56,36 @@ resource "aws_alb_target_group" "vault_ui" {
     enabled = true
   }
 
-  tags {
-    Environment = "${var.env}"
-    VPC         = "${local.vpc_name}"
+  tags = {
+    Environment = var.env
+    VPC         = local.vpc_name
   }
 }
 
 # Create a new alb listener
 resource "aws_alb_listener" "vault_https" {
-  count             = "${local.enable_custom_domain ? 1 : 0}"
-  load_balancer_arn = "${aws_alb.vault.arn}"
+  count             = local.enable_custom_domain ? 1 : 0
+  load_balancer_arn = aws_alb.vault.arn
   port              = "443"
   protocol          = "HTTPS"
   ssl_policy        = "ELBSecurityPolicy-2015-05"
-  certificate_arn   = "${data.aws_acm_certificate.cert.arn}"  # edit needed
+  certificate_arn   = data.aws_acm_certificate.cert[0].arn # edit needed
 
   default_action {
-    target_group_arn = "${aws_alb_target_group.vault_ui.arn}"
+    target_group_arn = aws_alb_target_group.vault_ui.arn
     type             = "forward"
   }
 }
 
 resource "aws_alb_listener" "vault_http" {
-  count             = "${local.enable_custom_domain ? 0 : 1}"
-  load_balancer_arn = "${aws_alb.vault.arn}"
+  count             = local.enable_custom_domain ? 0 : 1
+  load_balancer_arn = aws_alb.vault.arn
   port              = "80"
   protocol          = "HTTP"
 
   default_action {
-    target_group_arn = "${aws_alb_target_group.vault_ui.arn}"
+    target_group_arn = aws_alb_target_group.vault_ui.arn
     type             = "forward"
   }
 }
+

iam.tf

@@ -10,14 +10,14 @@ data "aws_iam_policy_document" "assume_role_vault_task" {
 }
 
 resource "aws_iam_role" "vault_task" {
-  path               = "${var.iam_path}"
-  assume_role_policy = "${data.aws_iam_policy_document.assume_role_vault_task.json}"
+  path               = var.iam_path
+  assume_role_policy = data.aws_iam_policy_document.assume_role_vault_task.json
 }
 
 # ecsServiceRole for vault
 
 resource "aws_iam_role" "ecsServiceRole" {
-  path = "${var.iam_path}"
+  path = var.iam_path
 
   assume_role_policy = <<EOF
 {
@@ -35,9 +35,11 @@ resource "aws_iam_role" "ecsServiceRole" {
   ]
 }
 EOF
+
 }
 
 resource "aws_iam_role_policy_attachment" "attach-ecsServiceRole" {
-  role       = "${aws_iam_role.ecsServiceRole.name}"
+  role       = aws_iam_role.ecsServiceRole.name
   policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonEC2ContainerServiceRole"
 }
+