Merge pull request #8547 from ministryofjustice/date_2024_11_04

GitHub Actions Code Formatter workflow

.devcontainer/devcontainer-lock.json

@@ -21,4 +21,4 @@
       "integrity": "sha256:6343878231decb72427ea2d59d98d0c4bb6f15931d86800330f7c84df8320f6c"
     }
   }
-}
+}

terraform/environments/analytical-platform-compute/environment-configuration.tf

@@ -1,6 +1,6 @@
 locals {
   ap_data_prod_account_id = local.environment_management.account_ids["analytical-platform-data-production"]
-  
+
   environment_configurations = {
     development = {
       /* VPC */

terraform/environments/analytical-platform-ingestion/secrets.tf

@@ -27,8 +27,8 @@ module "datasync_dom1_secret" {
   source  = "terraform-aws-modules/secrets-manager/aws"
   version = "1.3.1"
 
-  name        = "datasync/dom1"
-  kms_key_id  = module.datasync_credentials_kms.key_arn
+  name       = "datasync/dom1"
+  kms_key_id = module.datasync_credentials_kms.key_arn
 
   ignore_secret_changes = true
   secret_string = jsonencode({

terraform/environments/cdpt-chaps/ecs.tf

@@ -145,7 +145,7 @@ resource "aws_ecs_service" "ecs_service" {
   force_new_deployment              = true
 
   deployment_minimum_healthy_percent = 50
-  deployment_maximum_percent         = 200  
+  deployment_maximum_percent         = 200
 
   capacity_provider_strategy {
     capacity_provider = aws_ecs_capacity_provider.chaps.name

terraform/environments/contract-work-administration/app_servers.tf

@@ -213,16 +213,16 @@ resource "aws_instance" "app1" {
 }
 
 resource "aws_instance" "app2" {
-  count                  = contains(["development2", "testing"], local.environment) ? 0 : 1
-  ami                    = local.application_data.accounts[local.environment].app_ami_id
-  availability_zone      = "eu-west-2a"
-  instance_type          = local.application_data.accounts[local.environment].app_instance_type
-  monitoring             = true
-  vpc_security_group_ids = [aws_security_group.app.id]
-  subnet_id              = data.aws_subnet.private_subnets_a.id
-  iam_instance_profile   = aws_iam_instance_profile.cwa.id
-  key_name               = aws_key_pair.cwa.key_name
-  user_data_base64       = base64encode(local.app_userdata)
+  count                       = contains(["development2", "testing"], local.environment) ? 0 : 1
+  ami                         = local.application_data.accounts[local.environment].app_ami_id
+  availability_zone           = "eu-west-2a"
+  instance_type               = local.application_data.accounts[local.environment].app_instance_type
+  monitoring                  = true
+  vpc_security_group_ids      = [aws_security_group.app.id]
+  subnet_id                   = data.aws_subnet.private_subnets_a.id
+  iam_instance_profile        = aws_iam_instance_profile.cwa.id
+  key_name                    = aws_key_pair.cwa.key_name
+  user_data_base64            = base64encode(local.app_userdata)
   user_data_replace_on_change = false
   metadata_options {
     http_tokens = "optional"

terraform/environments/digital-prison-reporting/modules/domains/ingestion-jobs/glue.tf

@@ -181,7 +181,7 @@ module "create_reload_diff_job" {
   region                       = var.account_region
   account                      = var.account_id
   log_group_retention_in_days  = var.glue_log_group_retention_in_days
-  enable_spark_ui               = var.enable_spark_ui
+  enable_spark_ui              = var.enable_spark_ui
 
   tags = merge(
     var.tags,

terraform/environments/digital-prison-reporting/modules/domains/ingestion-jobs/variables.tf

@@ -725,5 +725,5 @@ variable "jar_version" {
 variable "enable_spark_ui" {
   type        = string
   default     = "true"
-  description = "UI Enabled by default, override with False"  
+  description = "UI Enabled by default, override with False"
 }

terraform/environments/digital-prison-reporting/modules/domains/reconciliation-job/variables.tf

@@ -138,5 +138,5 @@ variable "job_schedule" {
 variable "enable_spark_ui" {
   type        = string
   default     = "true"
-  description = "UI Enabled by default, override with False"  
+  description = "UI Enabled by default, override with False"
 }

terraform/environments/digital-prison-reporting/modules/glue_job/variables.tf

@@ -46,7 +46,7 @@ variable "bookmark" {
 variable "enable_spark_ui" {
   type        = string
   default     = "true"
-  description = "UI Enabled by default, override with False"  
+  description = "UI Enabled by default, override with False"
 }
 
 variable "bookmark_options" {

terraform/environments/ppud/certificate_mgmt.tf

@@ -25,7 +25,7 @@ resource "aws_lambda_function" "terraform_lambda_func_certificate_expiry_dev" {
   timeout                        = 30
   reserved_concurrent_executions = 5
   code_signing_config_arn        = "arn:aws:lambda:eu-west-2:075585660276:code-signing-config:csc-0c7136ccff2de748f"
-  depends_on = [aws_iam_role_policy_attachment.attach_lambda_policy_certificate_expiry_to_lambda_role_certificate_expiry_dev]
+  depends_on                     = [aws_iam_role_policy_attachment.attach_lambda_policy_certificate_expiry_to_lambda_role_certificate_expiry_dev]
   environment {
     variables = {
       EXPIRY_DAYS   = "45",

terraform/environments/ppud/cloudwatch_alarms_linux.tf

@@ -170,8 +170,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_docker_rgsl200" {
   alarm_description   = "This metric monitors the docker service status. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-0f393d9ed4e53da68"
-    Service    = "docker"
+    Instance = "i-0f393d9ed4e53da68"
+    Service  = "docker"
   }
 }
 
@@ -190,8 +190,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_docker_401_cjsm" {
   alarm_description   = "This metric monitors the docker service status. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-0e8e2a182917bcf26"
-    Service    = "docker"
+    Instance = "i-0e8e2a182917bcf26"
+    Service  = "docker"
   }
 }
 
@@ -210,8 +210,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_docker_400_non_cjsm" {
   alarm_description   = "This metric monitors the docker service status. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-01b4cc138ac95a506"
-    Service    = "docker"
+    Instance = "i-01b4cc138ac95a506"
+    Service  = "docker"
   }
 }
 
@@ -232,7 +232,7 @@ resource "aws_cloudwatch_metric_alarm" "port_25_status_check_401_cjsm" {
   alarm_description   = "This metric monitors the port 25 status check to smtp.cjsm.net . If the metric falls to 0 [unable to connect] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-0e8e2a182917bcf26"
-    Port       = "port-25"
+    Instance = "i-0e8e2a182917bcf26"
+    Port     = "port-25"
   }
 }

terraform/environments/ppud/cloudwatch_alarms_windows.tf

@@ -571,8 +571,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_iisadmin_rgvw019" {
   alarm_description   = "This metric monitors the iis admin service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-0dba6054c0f5f7a11"
-    Service    = "IISAdminService"
+    Instance = "i-0dba6054c0f5f7a11"
+    Service  = "IISAdminService"
   }
 }
 
@@ -591,8 +591,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_iisadmin_rgvw020" {
   alarm_description   = "This metric monitors the iis admin service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-014bce95a85aaeede"
-    Service    = "IISAdminService"
+    Instance = "i-014bce95a85aaeede"
+    Service  = "IISAdminService"
   }
 }
 
@@ -613,8 +613,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_www_publishing_rgvw019" {
   alarm_description   = "This metric monitors the www publishing service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-0dba6054c0f5f7a11"
-    Service    = "WorldWideWebPublishingService"
+    Instance = "i-0dba6054c0f5f7a11"
+    Service  = "WorldWideWebPublishingService"
   }
 }
 
@@ -633,8 +633,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_www_publishing_rgvw020" {
   alarm_description   = "This metric monitors the www publishing service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-014bce95a85aaeede"
-    Service    = "WorldWideWebPublishingService"
+    Instance = "i-014bce95a85aaeede"
+    Service  = "WorldWideWebPublishingService"
   }
 }
 
@@ -653,8 +653,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_www_publishing_rgvw022" {
   alarm_description   = "This metric monitors the www publishing service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-029d2b17679dab982"
-    Service    = "WorldWideWebPublishingService"
+    Instance = "i-029d2b17679dab982"
+    Service  = "WorldWideWebPublishingService"
   }
 }
 
@@ -673,8 +673,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_www_publishing_rgsw025" {
   alarm_description   = "This metric monitors the www publishing service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-00413756d2dfcf6d2"
-    Service    = "WorldWideWebPublishingService"
+    Instance = "i-00413756d2dfcf6d2"
+    Service  = "WorldWideWebPublishingService"
   }
 }
 
@@ -693,8 +693,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_www_publishing_rgvw027" {
   alarm_description   = "This metric monitors the www publishing service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-00cbccc46d25e77c6"
-    Service    = "WorldWideWebPublishingService"
+    Instance = "i-00cbccc46d25e77c6"
+    Service  = "WorldWideWebPublishingService"
   }
 }
 
@@ -713,8 +713,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_www_publishing_rgvw204" {
   alarm_description   = "This metric monitors the www publishing service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-0b5ef7cb90938fb82"
-    Service    = "WorldWideWebPublishingService"
+    Instance = "i-0b5ef7cb90938fb82"
+    Service  = "WorldWideWebPublishingService"
   }
 }
 
@@ -733,8 +733,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_www_publishing_rgvw205" {
   alarm_description   = "This metric monitors the www publishing service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-04bbb6312b86648be"
-    Service    = "WorldWideWebPublishingService"
+    Instance = "i-04bbb6312b86648be"
+    Service  = "WorldWideWebPublishingService"
   }
 }
 
@@ -755,8 +755,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_printer_spooler_rgvw022"
   alarm_description   = "This metric monitors the printer spooler service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-029d2b17679dab982"
-    Service    = "PrintSpooler"
+    Instance = "i-029d2b17679dab982"
+    Service  = "PrintSpooler"
   }
 }
 
@@ -775,8 +775,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_printer_spooler_rgvw027"
   alarm_description   = "This metric monitors the printer spooler service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-00cbccc46d25e77c6"
-    Service    = "PrintSpooler"
+    Instance = "i-00cbccc46d25e77c6"
+    Service  = "PrintSpooler"
   }
 }
 
@@ -797,8 +797,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_sql_server_rgvw021" {
   alarm_description   = "This metric monitors the SQL server service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-080498c4c9d25e6bd"
-    Service    = "SQLServer(MSSQLSERVER)"
+    Instance = "i-080498c4c9d25e6bd"
+    Service  = "SQLServer(MSSQLSERVER)"
   }
 }
 
@@ -817,8 +817,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_sql_server_writer_rgvw021
   alarm_description   = "This metric monitors the SQL server writer service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-080498c4c9d25e6bd"
-    Service    = "SQLServerVSSWriter"
+    Instance = "i-080498c4c9d25e6bd"
+    Service  = "SQLServerVSSWriter"
   }
 }
 
@@ -837,8 +837,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_sql_server_agent_rgvw021"
   alarm_description   = "This metric monitors the SQL server agent service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-080498c4c9d25e6bd"
-    Service    = "SQLServerAgent(MSSQLSERVER)"
+    Instance = "i-080498c4c9d25e6bd"
+    Service  = "SQLServerAgent(MSSQLSERVER)"
   }
 }
 
@@ -857,7 +857,7 @@ resource "aws_cloudwatch_metric_alarm" "service_status_sql_server_backup_status_
   alarm_description   = "This metric monitors the SQL server backup status. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-080498c4c9d25e6bd"
+    Instance = "i-080498c4c9d25e6bd"
   }
 }
 
@@ -878,8 +878,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_ppud_live_rgvw019" {
   alarm_description   = "This metric monitors the PPUD live service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-0dba6054c0f5f7a11"
-    Service    = "PPUDAutomatedProcessesLIVE"
+    Instance = "i-0dba6054c0f5f7a11"
+    Service  = "PPUDAutomatedProcessesLIVE"
   }
 }
 
@@ -898,8 +898,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_ppud_live_rgvw020" {
   alarm_description   = "This metric monitors the PPUD live service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-014bce95a85aaeede"
-    Service    = "PPUDAutomatedProcessesLIVE"
+    Instance = "i-014bce95a85aaeede"
+    Service  = "PPUDAutomatedProcessesLIVE"
   }
 }
 
@@ -918,8 +918,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_ppud_live_rgvw022" {
   alarm_description   = "This metric monitors the PPUD live service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-029d2b17679dab982"
-    Service    = "PPUDAutomatedProcessesLIVE"
+    Instance = "i-029d2b17679dab982"
+    Service  = "PPUDAutomatedProcessesLIVE"
   }
 }
 
@@ -938,8 +938,8 @@ resource "aws_cloudwatch_metric_alarm" "service_status_ppud_crawler_rgvw022" {
   alarm_description   = "This metric monitors the PPUD crawler service. If the metric falls to 0 [not running] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-029d2b17679dab982"
-    Service    = "PPUDPDFCrawlerP4Live"
+    Instance = "i-029d2b17679dab982"
+    Service  = "PPUDPDFCrawlerP4Live"
   }
 }
 
@@ -960,8 +960,8 @@ resource "aws_cloudwatch_metric_alarm" "port_25_status_check_rgvw019" {
   alarm_description   = "This metric monitors the port 25 status check to the internal mail relay (rgsl200). If the metric falls to 0 [unable to connect] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-0dba6054c0f5f7a11"
-    Port       = "Port-25"
+    Instance = "i-0dba6054c0f5f7a11"
+    Port     = "Port-25"
   }
 }
 
@@ -980,8 +980,8 @@ resource "aws_cloudwatch_metric_alarm" "port_25_status_check_rgvw020" {
   alarm_description   = "This metric monitors the port 25 status check to the internal mail relay (rgsl200). If the metric falls to 0 [unable to connect] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-0f393d9ed4e53da68"
-    Port       = "Port-25"
+    Instance = "i-0f393d9ed4e53da68"
+    Port     = "Port-25"
   }
 }
 
@@ -1000,8 +1000,8 @@ resource "aws_cloudwatch_metric_alarm" "port_25_status_check_rgvw022" {
   alarm_description   = "This metric monitors the port 25 status check to the internal mail relay (rgsl200). If the metric falls to 0 [unable to connect] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-029d2b17679dab982"
-    Port       = "Port-25"
+    Instance = "i-029d2b17679dab982"
+    Port     = "Port-25"
   }
 }
 
@@ -1020,7 +1020,7 @@ resource "aws_cloudwatch_metric_alarm" "port_25_status_check_rgvw027" {
   alarm_description   = "This metric monitors the port 25 status check to the internal mail relay (rgsl200). If the metric falls to 0 [unable to connect] then the alarm will trigger."
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance   = "i-00cbccc46d25e77c6"
-    Port       = "Port-25"
+    Instance = "i-00cbccc46d25e77c6"
+    Port     = "Port-25"
   }
 }