From 574216f204b40e55dbc04f6b202e976c68006970 Mon Sep 17 00:00:00 2001
From: Kintaro-Oe <marcusclairmont@gmail.com>
Date: Thu, 5 Dec 2019 12:27:44 +0000
Subject: [PATCH] PLAT-2120 terraform 0.12 upgrade

---
 main.tf      | 52 +++++++++++++++++++++++++---------------------------
 outputs.tf   | 13 +++++++------
 variables.tf | 13 +++++++------
 versions.tf  |  4 ++++
 4 files changed, 43 insertions(+), 39 deletions(-)
 create mode 100644 versions.tf

diff --git a/main.tf b/main.tf
index 77d6946..59ecc80 100644
--- a/main.tf
+++ b/main.tf
@@ -1,39 +1,34 @@
 locals {
-  team       = "${lookup(var.release, "team", "")}"
-  component  = "${lookup(var.release, "component", "")}"
-  account_id = "${element(concat(data.aws_caller_identity.current.*.account_id, list("")), 0)}"
+  team      = lookup(var.release, "team", "")
+  component = lookup(var.release, "component", "")
+  account_id = element(
+    concat(data.aws_caller_identity.current.*.account_id, [""]),
+    0,
+  )
 
-  name_prefix = "${
-    length(var.family) <= 32 ?
-      var.family :
-      format("%.24stf%.4s", var.family, sha1(var.family))
-  }"
+  name_prefix = length(var.family) <= 32 ? var.family : format("%.24stf%.4s", var.family, sha1(var.family))
 }
 
 module "task_definition" {
   source                = "github.com/mergermarket/tf_ecs_task_definition"
-  family                = "${var.family}"
-  container_definitions = "${var.container_definitions}"
-  task_role_arn         = "${aws_iam_role.task_role.arn}"
-  execution_role_arn    = "${aws_iam_role.ecs_tasks_execution_role.arn}"
-  volume                = "${var.volume}"
+  family                = var.family
+  container_definitions = var.container_definitions
+  task_role_arn         = aws_iam_role.task_role.arn
+  execution_role_arn    = aws_iam_role.ecs_tasks_execution_role.arn
+  volume                = var.volume
 }
 
 resource "aws_iam_role_policy" "role_policy" {
-  name_prefix = "${local.name_prefix}"
-  role        = "${aws_iam_role.task_role.id}"
-  policy      = "${var.policy}"
+  name_prefix = local.name_prefix
+  role        = aws_iam_role.task_role.id
+  policy      = var.policy
 }
 
 resource "aws_iam_role" "task_role" {
-  name_prefix = "${local.name_prefix}"
+  name_prefix = local.name_prefix
   description = "Task role for ${var.family}"
 
-  assume_role_policy = "${
-    var.assume_role_policy == "" ?
-      data.aws_iam_policy_document.instance-assume-role-policy.json :
-      var.assume_role_policy
-  }"
+  assume_role_policy = var.assume_role_policy == "" ? data.aws_iam_policy_document.instance-assume-role-policy.json : var.assume_role_policy
 }
 
 data "aws_iam_policy_document" "instance-assume-role-policy" {
@@ -48,19 +43,20 @@ data "aws_iam_policy_document" "instance-assume-role-policy" {
 }
 
 resource "aws_iam_role" "ecs_tasks_execution_role" {
-  name_prefix        = "${local.name_prefix}"
+  name_prefix        = local.name_prefix
   description        = "Task execution role for ${var.family}"
-  assume_role_policy = "${data.aws_iam_policy_document.instance-assume-role-policy.json}"
+  assume_role_policy = data.aws_iam_policy_document.instance-assume-role-policy.json
 }
 
 data "aws_caller_identity" "current" {
-  count = "${var.is_test ? 0 : 1}"
+  count = var.is_test ? 0 : 1
 }
 
-data "aws_region" "current" {}
+data "aws_region" "current" {
+}
 
 resource "aws_iam_role_policy" "execution_role_policy" {
-  role = "${aws_iam_role.ecs_tasks_execution_role.id}"
+  role = aws_iam_role.ecs_tasks_execution_role.id
   name = "role_policy"
 
   policy = <<EOF
@@ -103,4 +99,6 @@ resource "aws_iam_role_policy" "execution_role_policy" {
     ]
 }
 EOF
+
 }
+
diff --git a/outputs.tf b/outputs.tf
index 10bb6f0..2cb7c0b 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,19 +1,20 @@
 output "arn" {
-  value = "${module.task_definition.arn}"
+  value = module.task_definition.arn
 }
 
 output "task_role_arn" {
-  value = "${aws_iam_role.task_role.arn}"
+  value = aws_iam_role.task_role.arn
 }
 
 output "task_role_name" {
-  value = "${aws_iam_role.task_role.name}"
+  value = aws_iam_role.task_role.name
 }
 
 output "task_execution_role_arn" {
-  value = "${aws_iam_role.ecs_tasks_execution_role.arn}"
+  value = aws_iam_role.ecs_tasks_execution_role.arn
 }
 
 output "task_execution_role_name" {
-  value = "${aws_iam_role.ecs_tasks_execution_role.name}"
-}
\ No newline at end of file
+  value = aws_iam_role.ecs_tasks_execution_role.name
+}
+
diff --git a/variables.tf b/variables.tf
index 6bbc442..faf63e2 100644
--- a/variables.tf
+++ b/variables.tf
@@ -4,35 +4,35 @@ variable "env" {
 }
 
 variable "release" {
-  type        = "map"
+  type        = map(string)
   description = "Metadata about the release"
   default     = {}
 }
 
 variable "family" {
   description = "A unique name for your task defintion."
-  type        = "string"
+  type        = string
 }
 
 variable "container_definitions" {
   description = "A list of valid container definitions provided as a single valid JSON document."
-  type        = "list"
+  type        = list(string)
 }
 
 variable "policy" {
   description = "A valid IAM policy for the task"
-  type        = "string"
+  type        = string
 }
 
 variable "volume" {
   description = "Volume block map with 'name' and 'host_path'."
-  type        = "map"
+  type        = map(string)
   default     = {}
 }
 
 variable "assume_role_policy" {
   description = "A valid IAM policy for assuming roles - optional"
-  type        = "string"
+  type        = string
   default     = ""
 }
 
@@ -40,3 +40,4 @@ variable "is_test" {
   description = "For testing only. Stops the call to AWS for sts"
   default     = false
 }
+
diff --git a/versions.tf b/versions.tf
new file mode 100644
index 0000000..ac97c6a
--- /dev/null
+++ b/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}