(Chore) Terraform v0.12 updates

dxw · Sep 25, 2020 · 6d18cc6 · 6d18cc6
1 parent 3594cc8
commit 6d18cc6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 30 deletions.
diff --git a/main.tf b/main.tf
@@ -2,77 +2,77 @@
 
 resource "aws_iam_role" "scheduled_task_ecs_execution" {
   name               = "${var.name}-${var.environment}-st-ecs-execution-role"
-  assume_role_policy = "${file("${path.module}/policies/scheduled-task-ecs-execution-assume-role-policy.json")}"
+  assume_role_policy = file("${path.module}/policies/scheduled-task-ecs-execution-assume-role-policy.json")
 }
 
 data "template_file" "scheduled_task_ecs_execution_policy" {
-  template = "${file("${path.module}/policies/scheduled-task-ecs-execution-policy.json")}"
+  template = file("${path.module}/policies/scheduled-task-ecs-execution-policy.json")
 }
 
 resource "aws_iam_role_policy" "scheduled_task_ecs_execution" {
   name   = "${var.name}-${var.environment}-st-ecs-execution-policy"
-  role   = "${aws_iam_role.scheduled_task_ecs_execution.id}"
-  policy = "${data.template_file.scheduled_task_ecs_execution_policy.rendered}"
+  role   = aws_iam_role.scheduled_task_ecs_execution.id
+  policy = data.template_file.scheduled_task_ecs_execution_policy.rendered
 }
 
 ## ECS task role
 
 resource "aws_iam_role" "scheduled_task_ecs" {
   name               = "${var.name}-${var.environment}-st-ecs-role"
-  assume_role_policy = "${file("${path.module}/policies/scheduled-task-ecs-assume-role-policy.json")}"
+  assume_role_policy = file("${path.module}/policies/scheduled-task-ecs-assume-role-policy.json")
 }
 
 ## Cloudwatch event role
 
 resource "aws_iam_role" "scheduled_task_cloudwatch" {
   name               = "${var.name}-${var.environment}-st-cloudwatch-role"
-  assume_role_policy = "${file("${path.module}/policies/scheduled-task-cloudwatch-assume-role-policy.json")}"
+  assume_role_policy = file("${path.module}/policies/scheduled-task-cloudwatch-assume-role-policy.json")
 }
 
 data "template_file" "scheduled_task_cloudwatch_policy" {
   template = "${file("${path.module}/policies/scheduled-task-cloudwatch-policy.json")}"
 
   vars = {
-    task_execution_role_arn = "${aws_iam_role.scheduled_task_ecs_execution.arn}"
+    task_execution_role_arn = aws_iam_role.scheduled_task_ecs_execution.arn
   }
 }
 
 resource "aws_iam_role_policy" "scheduled_task_cloudwatch_policy" {
   name   = "${var.name}-${var.environment}-st-cloudwatch-policy"
-  role   = "${aws_iam_role.scheduled_task_cloudwatch.id}"
-  policy = "${data.template_file.scheduled_task_cloudwatch_policy.rendered}"
+  role   = aws_iam_role.scheduled_task_cloudwatch.id
+  policy = data.template_file.scheduled_task_cloudwatch_policy.rendered
 }
 
 ## ECS task definition
 
 resource "aws_ecs_task_definition" "scheduled_task" {
   family                   = "${var.name}-${var.environment}-scheduled-task"
-  container_definitions    = "${var.container_definitions}"
+  container_definitions    = var.container_definitions
   requires_compatibilities = ["EC2"]
-  network_mode             = "${var.network_mode}"
-  execution_role_arn       = "${aws_iam_role.scheduled_task_ecs_execution.arn}"
-  task_role_arn            = "${aws_iam_role.scheduled_task_ecs.arn}"
-  cpu                      = "${var.cpu}"
-  memory                   = "${var.memory}"
+  network_mode             = var.network_mode
+  execution_role_arn       = aws_iam_role.scheduled_task_ecs_execution.arn
+  task_role_arn            = aws_iam_role.scheduled_task_ecs.arn
+  cpu                      = var.cpu
+  memory                   = var.memory
 }
 
 ## Cloudwatch event
 
 resource "aws_cloudwatch_event_rule" "scheduled_task" {
   name                = "${var.name}_${var.environment}_scheduled_task"
   description         = "Run ${var.name}_${var.environment} task at a scheduled time (${var.schedule_expression})"
-  schedule_expression = "${var.schedule_expression}"
+  schedule_expression = var.schedule_expression
 }
 
 resource "aws_cloudwatch_event_target" "scheduled_task" {
   target_id = "${var.name}_${var.environment}_scheduled_task_target"
-  rule      = "${aws_cloudwatch_event_rule.scheduled_task.name}"
-  arn       = "${var.cluster_arn}"
-  role_arn  = "${aws_iam_role.scheduled_task_cloudwatch.arn}"
+  rule      = aws_cloudwatch_event_rule.scheduled_task.name
+  arn       = var.cluster_arn
+  role_arn  = aws_iam_role.scheduled_task_cloudwatch.arn
   input     = jsonencode({})
 
   ecs_target {
-    task_count          = "${var.task_count}"
-    task_definition_arn = "${aws_ecs_task_definition.scheduled_task.arn}"
+    task_count          = var.task_count
+    task_definition_arn = aws_ecs_task_definition.scheduled_task.arn
   }
 }
diff --git a/variables.tf b/variables.tf
@@ -1,46 +1,37 @@
 variable "name" {
-  type        = "string"
   description = "Unique name for resources"
 }
 
 variable "environment" {
-  type        = "string"
   description = "Environment - appended to var.name for resources"
 }
 
 variable "network_mode" {
-  type        = "string"
   description = "Task network mode"
   default     = "bridge"
 }
 
 variable "container_definitions" {
-  type        = "string"
   description = "Task container defintions"
 }
 
 variable "schedule_expression" {
-  type        = "string"
   description = "Schedule expression (cron) for when to run task"
 }
 
 variable "cluster_arn" {
-  type        = "string"
   description = "ARN of cluster on which to run task"
 }
 
 variable "task_count" {
-  type        = "string"
   description = "Number of tasks to run"
   default     = 1
 }
 
 variable "cpu" {
-  type        = "string"
   description = "The number of cpu units used by the task"
 }
 
 variable "memory" {
-  type        = "string"
   description = "The amount (in MiB) of memory used by the task"
 }