Tidy

Author: nhsdevws

grafana/non-prod/terraform/all.tf

@@ -106,7 +106,7 @@ data "template_file" "grafana_app" {
     template = file("${path.module}/templates/ecs/grafana_app.json.tpl")
 
     vars = {
-        app_image      = var.app_image
+        app_image      = local.app_image
         app_port       = var.app_port
         fargate_cpu    = var.fargate_cpu
         fargate_memory = var.fargate_memory
@@ -303,7 +303,7 @@ data "aws_iam_policy_document" "ecs_auto_scale_role" {
 }
 # ECS auto scale role
 resource "aws_iam_role" "ecs_auto_scale_role" {
-  name               = var.ecs_auto_scale_role_name
+  name               = "${var.prefix}-${var.ecs_auto_scale_role_name}"
   assume_role_policy = data.aws_iam_policy_document.ecs_auto_scale_role.json
 }
 # ECS auto scale role policy attachment

grafana/non-prod/terraform/terraform.tfvars

@@ -1,8 +1,6 @@
 aws_region = "eu-west-2"
 
-ec2_task_execution_role_name = "myEcsTaskExecutionRole"
-
-ecs_auto_scale_role_name = "myEcsAutoScaleRole"
+ecs_auto_scale_role_name = "EcsAutoScaleRole"
 
 az_count = 2
 

grafana/non-prod/terraform/variables.tf

@@ -2,10 +2,6 @@ variable "aws_region" {
     description = "Destination AWS region"
 }
 
-variable "ec2_task_execution_role_name" {
-    description = "ECS task execution role name"
-}
-
 variable "ecs_auto_scale_role_name" {
     description = "ECS auto scale role name"
 }
@@ -15,10 +11,6 @@ variable "az_count" {
     default     = 2
 }
 
-variable "app_image" {
-    description = "Docker image to run in the ECS cluster, derived from the account ID and region"
-}
-
 variable "app_version" {
     description = "Version of the Docker image to run in the ECS cluster"
     default     = "11.0.0-22.04_stable"