Use more consistent naming for variables

Author: tomduckering

spec/unit/infra/root/main.tf

@@ -67,7 +67,7 @@ module "ecs_service" {
   ecs_cluster_id = data.terraform_remote_state.prerequisites.outputs.cluster_id
   ecs_cluster_service_role_arn = data.terraform_remote_state.prerequisites.outputs.service_role_arn
 
-  fargate = var.fargate
-  cpu = var.cpu
-  memory = var.memory
+  use_fargate = var.use_fargate
+  service_task_cpu = var.service_task_cpu
+  service_task_memory = var.service_task_memory
 }

spec/unit/infra/root/variables.tf

@@ -143,17 +143,17 @@ variable "wait_for_steady_state" {
   default = null
 }
 
-variable "fargate" {
+variable "use_fargate" {
   type    = bool
   default = null
 }
 
-variable "cpu" {
+variable "service_task_cpu" {
   type    = string
   default = null
 }
 
-variable "memory" {
+variable "service_task_memory" {
   type    = string
   default = null
 }

spec/unit/task_definition_spec.rb

@@ -158,13 +158,13 @@
     end
   end
 
-  describe 'when task_type is fargate' do
+  fdescribe 'when task_type is fargate' do
     before(:context) do
       @plan = plan(role: :root) do |vars|
         vars.attach_to_load_balancer = false
-        vars.fargate = true
-        vars.cpu = '256'
-        vars.memory = '512'
+        vars.use_fargate = true
+        vars.service_task_cpu = '256'
+        vars.service_task_memory = '512'
       end
     end
 
@@ -191,8 +191,8 @@
     before(:context) do
       @plan = plan(role: :root) do |vars|
         vars.attach_to_load_balancer = false
-        vars.cpu = '1234'
-        vars.memory = '4567'
+        vars.service_task_cpu = '1234'
+        vars.service_task_memory = '4567'
         vars.service_task_container_definitions =
           '[{"cpu": ${cpu}, "memory": ${memory}}]'
       end

task_definition.tf

@@ -17,8 +17,8 @@ locals {
             "$${port}", var.service_port),
           "$${region}", var.region),
         "$${log_group}", var.include_log_group ? aws_cloudwatch_log_group.service[0].name : ""),
-      "$${cpu}", var.cpu),
-    "$${memory}", var.memory)
+      "$${cpu}", var.service_task_cpu),
+    "$${memory}", var.service_task_memory)
 }
 
 resource "aws_ecs_task_definition" "service" {
@@ -30,9 +30,9 @@ resource "aws_ecs_task_definition" "service" {
 
   task_role_arn = var.service_role
 
-  requires_compatibilities = var.fargate ? ["FARGATE"] : null
-  cpu = var.fargate ? var.cpu : null
-  memory = var.fargate ? var.memory : null
+  requires_compatibilities = var.use_fargate ? ["FARGATE"] : null
+  cpu = var.use_fargate ? var.service_task_cpu : null
+  memory = var.use_fargate ? var.service_task_memory : null
 
   dynamic "volume" {
     for_each = var.service_volumes

variables.tf

@@ -256,20 +256,20 @@ variable "always_use_latest_task_definition" {
   nullable    = false
 }
 
-variable "fargate" {
+variable "use_fargate" {
   description = "Whether or not to use Fargate for the service."
   type        = bool
   default     = false
   nullable    = false
 }
 
-variable "cpu" {
+variable "service_task_cpu" {
   description = "The number of CPU units to use for the service task when deployed using Fargate."
   type        = string
   default     = "256"
   nullable    = false
 }
-variable "memory" {
+variable "service_task_memory" {
   description = "The amount of memory (in MiB) to use for the service task when deployed using Fargate."
   type        = string
   default     = "512"