Merge pull request #4641 from ministryofjustice/date_2024_01_22

GitHub Actions Code Formatter workflow
ministryofjustice · Jan 22, 2024 · ba3222b · ba3222b
2 parents 973b69d + 285241c
commit ba3222b
Show file tree

Hide file tree

Showing 12 changed files with 263 additions and 263 deletions.
diff --git a/terraform/environments/cdpt-chaps/database.tf b/terraform/environments/cdpt-chaps/database.tf
@@ -3,20 +3,20 @@
 #------------------------------------------------------------------------------
 
 resource "aws_db_instance" "database" {
-  allocated_storage      = local.application_data.accounts[local.environment].db_allocated_storage
-  storage_type           = "gp2"
-  engine                 = "sqlserver-web"
-  engine_version         = "14.00.3381.3.v1"
-  instance_class         = local.application_data.accounts[local.environment].db_instance_class
-  identifier             = local.application_data.accounts[local.environment].db_instance_identifier
+  allocated_storage = local.application_data.accounts[local.environment].db_allocated_storage
+  storage_type      = "gp2"
+  engine            = "sqlserver-web"
+  engine_version    = "14.00.3381.3.v1"
+  instance_class    = local.application_data.accounts[local.environment].db_instance_class
+  identifier        = local.application_data.accounts[local.environment].db_instance_identifier
   # username               = local.application_data.accounts[local.environment].db_user
   password               = aws_secretsmanager_secret_version.db_password.secret_string
   vpc_security_group_ids = [aws_security_group.db.id]
   depends_on             = [aws_security_group.db]
   # snapshot_identifier    = "arn:aws:rds:eu-west-2:613903586696:snapshot:chaps-prod-snapshot-2024-01-19"
-  db_subnet_group_name   = aws_db_subnet_group.db.id
+  db_subnet_group_name      = aws_db_subnet_group.db.id
   final_snapshot_identifier = "final-snapshot"
-  publicly_accessible    = true
+  publicly_accessible       = true
 }
 
 resource "aws_db_instance_role_association" "database" {

diff --git a/terraform/environments/cdpt-chaps/ecs.tf b/terraform/environments/cdpt-chaps/ecs.tf
@@ -116,8 +116,8 @@ resource "aws_ecs_task_definition" "chaps_task_definition" {
       ],
       secrets = [
         {
-          name: "RDS_PASSWORD",
-          valueFrom: aws_secretsmanager_secret_version.db_password.arn
+          name : "RDS_PASSWORD",
+          valueFrom : aws_secretsmanager_secret_version.db_password.arn
         }
       ]
     }

diff --git a/terraform/environments/cdpt-chaps/secrets.tf b/terraform/environments/cdpt-chaps/secrets.tf
@@ -1,7 +1,7 @@
 #### This file can be used to store secrets specific to the member account ####
 
 resource "aws_secretsmanager_secret" "db_password" {
-  name        = "database_password"
+  name = "database_password"
 }
 
 resource "random_password" "password_long" {

diff --git a/terraform/environments/data-platform-compute/vpc.tf b/terraform/environments/data-platform-compute/vpc.tf
@@ -27,40 +27,40 @@ module "vpc_endpoints" {
 
   endpoints = {
     logs = {
-      service            = "logs"
-      service_type       = "Interface"
+      service      = "logs"
+      service_type = "Interface"
       tags = merge(
         local.tags,
         { Name = format("%s-logs-api-vpc-endpoint", local.application_name) }
       )
     },
     sagemaker-api = {
-      service            = "sagemaker.api"
-      service_type       = "Interface"
+      service      = "sagemaker.api"
+      service_type = "Interface"
       tags = merge(
         local.tags,
         { Name = format("%s-sagemaker-api-vpc-endpoint", local.application_name) }
       )
     },
     sagemaker-runtime = {
-      service            = "sagemaker.runtime"
-      service_type       = "Interface"
+      service      = "sagemaker.runtime"
+      service_type = "Interface"
       tags = merge(
         local.tags,
         { Name = format("%s-sagemaker-runtime-vpc-endpoint", local.application_name) }
       )
     },
     sagemaker-catalog = {
-      service            = "servicecatalog"
-      service_type       = "Interface"
+      service      = "servicecatalog"
+      service_type = "Interface"
       tags = merge(
         local.tags,
         { Name = format("%s-servicecatalog-vpc-endpoint", local.application_name) }
       )
     },
     sts = {
-      service            = "sts"
-      service_type       = "Interface"
+      service      = "sts"
+      service_type = "Interface"
       tags = merge(
         local.tags,
         { Name = format("%s-sts-vpc-endpoint", local.application_name) }

diff --git a/terraform/environments/electronic-monitoring-data/transfer_server_capita.tf b/terraform/environments/electronic-monitoring-data/transfer_server_capita.tf
@@ -5,7 +5,7 @@
 #------------------------------------------------------------------------------
 
 resource "aws_eip" "capita_eip" {
-  domain   = "vpc"
+  domain = "vpc"
 }
 
 #------------------------------------------------------------------------------
@@ -73,7 +73,7 @@ resource "aws_vpc_security_group_ingress_rule" "capita_ip_5" {
 
 
 resource "aws_transfer_server" "capita_transfer_server" {
-  protocols = ["SFTP"]
+  protocols              = ["SFTP"]
   identity_provider_type = "SERVICE_MANAGED"
 
   endpoint_type = "VPC"
@@ -89,7 +89,7 @@ resource "aws_transfer_server" "capita_transfer_server" {
   security_policy_name = "TransferSecurityPolicy-2023-05"
 
   pre_authentication_login_banner = "Hello there"
-  logging_role  = aws_iam_role.test_transfer_user_iam_role.arn
+  logging_role                    = aws_iam_role.test_transfer_user_iam_role.arn
   structured_log_destinations = [
     "${aws_cloudwatch_log_group.transfer.arn}:*"
   ]