Merge pull request #7888 from ministryofjustice/date_2024_09_23

GitHub Actions Code Formatter workflow
ministryofjustice · Sep 23, 2024 · 60c4843 · 60c4843
2 parents f5b4793 + c28252a
commit 60c4843
Show file tree

Hide file tree

Showing 45 changed files with 1,048 additions and 1,055 deletions.
diff --git a/terraform/environments/apex/ecs.tf b/terraform/environments/apex/ecs.tf
@@ -19,20 +19,20 @@ module "apex-ecs" {
   ec2_min_size            = local.application_data.accounts[local.environment].ec2_min_size
   # task_definition_volume     = local.application_data.accounts[local.environment].task_definition_volume
   # network_mode               = local.application_data.accounts[local.environment].network_mode
-  server_port                = local.application_data.accounts[local.environment].server_port
-  app_count                  = local.application_data.accounts[local.environment].app_count
-  ec2_ingress_rules          = local.ec2_ingress_rules
-  ec2_egress_rules           = local.ec2_egress_rules
-  lb_tg_arn                  = module.alb.target_group_arn
-  tags_common                = local.tags
-  appscaling_min_capacity    = local.application_data.accounts[local.environment].appscaling_min_capacity
-  appscaling_max_capacity    = local.application_data.accounts[local.environment].appscaling_max_capacity
-  ecs_scaling_cpu_threshold  = local.application_data.accounts[local.environment].ecs_scaling_cpu_threshold
-  ecs_scaling_mem_threshold  = local.application_data.accounts[local.environment].ecs_scaling_mem_threshold
-  ecs_target_capacity        = local.ecs_target_capacity
-  ec2_instance_warmup_period = local.application_data.accounts[local.environment].ec2_instance_warmup_period
-  log_group_kms_key          = aws_kms_key.cloudwatch_logs_key.arn
-  environment                = local.environment
-  database_admin_password_arn  = "arn:aws:ssm:${local.application_data.accounts[local.environment].region}:${local.env_account_id}:parameter/${local.app_db_password_name}"
+  server_port                 = local.application_data.accounts[local.environment].server_port
+  app_count                   = local.application_data.accounts[local.environment].app_count
+  ec2_ingress_rules           = local.ec2_ingress_rules
+  ec2_egress_rules            = local.ec2_egress_rules
+  lb_tg_arn                   = module.alb.target_group_arn
+  tags_common                 = local.tags
+  appscaling_min_capacity     = local.application_data.accounts[local.environment].appscaling_min_capacity
+  appscaling_max_capacity     = local.application_data.accounts[local.environment].appscaling_max_capacity
+  ecs_scaling_cpu_threshold   = local.application_data.accounts[local.environment].ecs_scaling_cpu_threshold
+  ecs_scaling_mem_threshold   = local.application_data.accounts[local.environment].ecs_scaling_mem_threshold
+  ecs_target_capacity         = local.ecs_target_capacity
+  ec2_instance_warmup_period  = local.application_data.accounts[local.environment].ec2_instance_warmup_period
+  log_group_kms_key           = aws_kms_key.cloudwatch_logs_key.arn
+  environment                 = local.environment
+  database_admin_password_arn = "arn:aws:ssm:${local.application_data.accounts[local.environment].region}:${local.env_account_id}:parameter/${local.app_db_password_name}"
 
 }
diff --git a/terraform/environments/apex/locals.tf b/terraform/environments/apex/locals.tf
@@ -71,7 +71,7 @@ locals {
     app_db_url        = "${aws_route53_record.apex-db.fqdn}:1521:APEX"
     app_debug_enabled = local.application_data.accounts[local.environment].app_debug_enabled
     # Note that the following secret is created manually on Parameter Store
-    db_secret_arn     = "arn:aws:ssm:${local.application_data.accounts[local.environment].region}:${local.env_account_id}:parameter/${local.app_db_password_name}"
+    db_secret_arn = "arn:aws:ssm:${local.application_data.accounts[local.environment].region}:${local.env_account_id}:parameter/${local.app_db_password_name}"
   })
 
   env_account_id       = local.environment_management.account_ids[terraform.workspace]

diff --git a/terraform/environments/ccms-ebs/ccms-lambda.tf b/terraform/environments/ccms-ebs/ccms-lambda.tf
@@ -20,9 +20,9 @@ resource "aws_lambda_layer_version" "lambda_layer" {
 
 # SG for Lambda
 resource "aws_security_group" "lambda_security_group" {
-  name   = "${local.application_name}-${local.environment}-lambda-sg"
+  name        = "${local.application_name}-${local.environment}-lambda-sg"
   description = "SG traffic control for Payment Load Lambda"
-  vpc_id = data.aws_vpc.shared.id
+  vpc_id      = data.aws_vpc.shared.id
 
   ingress {
     from_port   = 1521