UML-3115 Terraform linting

ministryofjustice · Oct 11, 2023 · 384101a · 384101a
1 parent fcf6939
commit 384101a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/terraform/environment/refactor.tf b/terraform/environment/refactor.tf
@@ -1,6 +1,6 @@
 moved {
   from = aws_ecs_cluster.use-an-lpa
-  to   = module.eu_west_1.aws_ecs_cluster.use-an-lpa
+  to   = module.eu_west_1.aws_ecs_cluster.use_an_lpa
 }
 
 moved {

diff --git a/terraform/environment/region/actor_ecs.tf b/terraform/environment/region/actor_ecs.tf
@@ -3,7 +3,7 @@
 
 resource "aws_ecs_service" "actor" {
   name             = "actor-service"
-  cluster          = aws_ecs_cluster.use-an-lpa.id
+  cluster          = aws_ecs_cluster.use_an_lpa.id
   task_definition  = aws_ecs_task_definition.actor.arn
   desired_count    = var.autoscaling.use.minimum
   platform_version = "1.4.0"

diff --git a/terraform/environment/region/admin_ecs.tf b/terraform/environment/region/admin_ecs.tf
@@ -3,7 +3,7 @@
 
 resource "aws_ecs_service" "admin" {
   name             = "admin-service"
-  cluster          = aws_ecs_cluster.use-an-lpa.id
+  cluster          = aws_ecs_cluster.use_an_lpa.id
   task_definition  = aws_ecs_task_definition.admin.arn
   desired_count    = 1
   platform_version = "1.4.0"

diff --git a/terraform/environment/region/api_ecs.tf b/terraform/environment/region/api_ecs.tf
@@ -3,7 +3,7 @@
 
 resource "aws_ecs_service" "api" {
   name                              = "api-service"
-  cluster                           = aws_ecs_cluster.use-an-lpa.id
+  cluster                           = aws_ecs_cluster.use_an_lpa.id
   task_definition                   = aws_ecs_task_definition.api.arn
   desired_count                     = var.autoscaling.api.minimum
   platform_version                  = "1.4.0"

diff --git a/terraform/environment/region/ecs_cluster.tf b/terraform/environment/region/ecs_cluster.tf
@@ -1,4 +1,4 @@
-resource "aws_ecs_cluster" "use-an-lpa" {
+resource "aws_ecs_cluster" "use_an_lpa" {
   name = "${var.environment_name}-use-an-lpa"
   setting {
     name  = "containerInsights"

diff --git a/terraform/environment/region/outputs.tf b/terraform/environment/region/outputs.tf
@@ -1,9 +1,10 @@
 output "ecs_cluster" {
-  value = aws_ecs_cluster.use-an-lpa
+  description = "The ECS cluster object"
+  value       = aws_ecs_cluster.use_an_lpa
 }
 
 output "ecs_services" {
-  # Produce a map of service names to service objects
+  description = "Objects containing the ECS services"
   value = {
     actor  = aws_ecs_service.actor
     admin  = aws_ecs_service.admin
@@ -14,5 +15,6 @@ output "ecs_services" {
 }
 
 output "admin_domain" {
-  value = "https://${var.route_53_fqdns.admin}"
+  description = "The URL for the admin interface"
+  value       = "https://${var.route_53_fqdns.admin}"
 }
diff --git a/terraform/environment/region/pdf_ecs.tf b/terraform/environment/region/pdf_ecs.tf
@@ -3,7 +3,7 @@
 
 resource "aws_ecs_service" "pdf" {
   name             = "pdf-service"
-  cluster          = aws_ecs_cluster.use-an-lpa.id
+  cluster          = aws_ecs_cluster.use_an_lpa.id
   task_definition  = aws_ecs_task_definition.pdf.arn
   desired_count    = var.autoscaling.pdf.minimum
   platform_version = "1.4.0"

diff --git a/terraform/environment/region/viewer_ecs.tf b/terraform/environment/region/viewer_ecs.tf
@@ -3,7 +3,7 @@
 
 resource "aws_ecs_service" "viewer" {
   name             = "viewer-service"
-  cluster          = aws_ecs_cluster.use-an-lpa.id
+  cluster          = aws_ecs_cluster.use_an_lpa.id
   task_definition  = aws_ecs_task_definition.viewer.arn
   desired_count    = var.autoscaling.view.minimum
   platform_version = "1.4.0"