From f104ff7b0933bad768a809548b7b129fd67d93c9 Mon Sep 17 00:00:00 2001
From: Falpangaea <cas.thomas.r@gmail.com>
Date: Thu, 12 Mar 2020 14:10:13 -0400
Subject: [PATCH] upgrade to tf 12

---
 .terraform-version |  1 +
 iam.tf             | 18 ++++++++++--------
 main.tf            | 35 ++++++++++++++++++-----------------
 variables.tf       |  1 +
 versions.tf        |  4 ++++
 5 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 .terraform-version
 create mode 100644 versions.tf

diff --git a/.terraform-version b/.terraform-version
new file mode 100644
index 0000000..c018e45
--- /dev/null
+++ b/.terraform-version
@@ -0,0 +1 @@
+0.12.20
diff --git a/iam.tf b/iam.tf
index 0a1aa6f..9f5a5d1 100644
--- a/iam.tf
+++ b/iam.tf
@@ -47,23 +47,23 @@ data "aws_iam_policy_document" "assume_role_pganalyze_task" {
 }
 
 resource "aws_iam_role" "pganalyze_task" {
-  count              = "${local.service_count}"
+  count              = local.service_count
   name               = "tf-pganalyze-${var.task_identifier}-ecsTaskRole"
   path               = "/"
-  assume_role_policy = "${data.aws_iam_policy_document.assume_role_pganalyze_task.json}"
+  assume_role_policy = data.aws_iam_policy_document.assume_role_pganalyze_task.json
 }
 
 resource "aws_iam_role_policy" "pganalyze_ecs_task" {
-  count  = "${local.service_count}"
+  count  = local.service_count
   name   = "tf-pganalyze-${var.task_identifier}-ecsTaskPolicy"
-  role   = "${aws_iam_role.pganalyze_task.id}"
-  policy = "${data.aws_iam_policy_document.pganalyze_task_policy.json}"
+  role   = aws_iam_role.pganalyze_task[0].id
+  policy = data.aws_iam_policy_document.pganalyze_task_policy.json
 }
 
 # ecsServiceRole for pganalyze
 
 resource "aws_iam_role" "ecsServiceRole" {
-  count = "${local.service_count}"
+  count = local.service_count
   name  = "tf-pganalyze-${var.task_identifier}-ecsSvcRole"
 
   assume_role_policy = <<EOF
@@ -82,10 +82,12 @@ resource "aws_iam_role" "ecsServiceRole" {
   ]
 }
 EOF
+
 }
 
 resource "aws_iam_role_policy_attachment" "attach-ecsServiceRole" {
-  count      = "${local.service_count}"
-  role       = "${aws_iam_role.ecsServiceRole.name}"
+  count      = local.service_count
+  role       = aws_iam_role.ecsServiceRole[0].name
   policy_arn = "arn:aws:iam::aws:policy/service-role/AmazonEC2ContainerServiceRole"
 }
+
diff --git a/main.tf b/main.tf
index a76f082..051b9c4 100644
--- a/main.tf
+++ b/main.tf
@@ -1,9 +1,9 @@
 locals {
-  "service_count" = "${length(var.pga_api_key) > 0 ? 1 : 0}"
+  service_count = length(var.pga_api_key) > 0 ? 1 : 0
 }
 
 data "aws_ecs_cluster" "ecs" {
-  cluster_name = "${var.ecs_cluster}"
+  cluster_name = var.ecs_cluster
 }
 
 data "aws_region" "current" {
@@ -11,34 +11,34 @@ data "aws_region" "current" {
 }
 
 data "template_file" "pganalyze" {
-  template = "${file("${path.module}/files/pganalyze.json")}"
+  template = file("${path.module}/files/pganalyze.json")
 
-  vars {
-    task_identifier       = "${var.task_identifier}"
+  vars = {
+    task_identifier       = var.task_identifier
     db_url                = "postgres://${var.db_username}:${var.db_password}@${var.rds_endpoint}/${var.db_name}"
-    image                 = "${var.docker_image}"
-    pga_api_key           = "${var.pga_api_key}"
-    aws_instance_id       = "${var.aws_instance_id}" # we can almost certainly derive this
-    aws_region            = "${data.aws_region.current.name}"
-    awslogs_group         = "${var.log_group}"
-    awslogs_region        = "${data.aws_region.current.name}"
+    image                 = var.docker_image
+    pga_api_key           = var.pga_api_key
+    aws_instance_id       = var.aws_instance_id # we can almost certainly derive this
+    aws_region            = data.aws_region.current.name
+    awslogs_group         = var.log_group
+    awslogs_region        = data.aws_region.current.name
     awslogs_stream_prefix = "tf"
   }
 }
 
 resource "aws_ecs_task_definition" "pganalyze" {
-  count                 = "${local.service_count}"
+  count                 = local.service_count
   family                = "pganalyze-${var.env}-${var.task_identifier}"
-  container_definitions = "${data.template_file.pganalyze.rendered}"
+  container_definitions = data.template_file.pganalyze.rendered
   network_mode          = "bridge"
-  task_role_arn         = "${aws_iam_role.pganalyze_task.arn}"
+  task_role_arn         = aws_iam_role.pganalyze_task[0].arn
 }
 
 resource "aws_ecs_service" "pganalyze" {
-  count           = "${local.service_count}"
+  count           = local.service_count
   name            = "pganalyze-${var.env}-${var.task_identifier}"
-  cluster         = "${data.aws_ecs_cluster.ecs.id}"
-  task_definition = "${aws_ecs_task_definition.pganalyze.arn}"
+  cluster         = data.aws_ecs_cluster.ecs.id
+  task_definition = aws_ecs_task_definition.pganalyze[0].arn
   desired_count   = 1
 
   placement_strategy {
@@ -46,3 +46,4 @@ resource "aws_ecs_service" "pganalyze" {
     field = "memory"
   }
 }
+
diff --git a/variables.tf b/variables.tf
index baafd17..11200e3 100644
--- a/variables.tf
+++ b/variables.tf
@@ -43,3 +43,4 @@ variable "rds_endpoint" {
 variable "log_group" {
   description = "CloudWatch Log Group that will receive collector logs (must exist already)"
 }
+
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"
+}