From 2846fd43408c889bf58b3e9ab46cc93179a28668 Mon Sep 17 00:00:00 2001
From: modernisation-platform-ci
 <modernisation-platform+github@digital.justice.gov.uk>
Date: Mon, 18 Mar 2024 04:48:40 +0000
Subject: [PATCH] Updates from GitHub Actions Format Code workflow

---
 .../corporate-staff-rostering/README.md       | 10 +++----
 .../environments/dacp/ec2_bastion_linux.tf    |  2 +-
 terraform/environments/dacp/providers.tf      |  2 +-
 .../delius-core/locals_development.tf         | 22 +++++++--------
 .../environments/delius-core/locals_test.tf   | 22 +++++++--------
 .../components/oracle_db_shared/locals.tf     |  8 +++---
 .../oracle_statistics_backup_data.json        | 12 ++++----
 .../modules/components/oracle_db_shared/s3.tf | 26 ++++++++---------
 .../delius_environment/merge_api_service.tf   | 18 ++++++------
 .../digital-prison-reporting/locals.tf        | 12 ++++----
 .../modules/dms_s3_v2/main.tf                 |  2 +-
 .../modules/dms_s3_v2/outputs.tf              |  2 +-
 .../hmpps-domain-services/locals.tf           | 28 +++++++++----------
 .../locals_preproduction.tf                   |  2 +-
 .../locals_production.tf                      | 10 +++----
 .../environments/ncas/ec2_bastion_linux.tf    |  2 +-
 .../environments/nomis/locals_development.tf  |  4 +--
 .../environments/oasys/locals_production.tf   |  2 +-
 .../performance-hub/bastion_linux.tf          |  2 +-
 .../pra-register/ec2_bastion_linux.tf         |  2 +-
 .../wardship/ec2_bastion_linux.tf             |  2 +-
 .../modules/ip_addresses/azure_fixngo.tf      |  4 +--
 terraform/modules/patch_manager/README.md     |  2 +-
 .../modules/patch_manager/patch-manager.tf    |  4 +--
 terraform/modules/patch_manager/variables.tf  |  2 +-
 25 files changed, 103 insertions(+), 101 deletions(-)

diff --git a/terraform/environments/corporate-staff-rostering/README.md b/terraform/environments/corporate-staff-rostering/README.md
index 3eaae7d6274..0a5581cfd33 100644
--- a/terraform/environments/corporate-staff-rostering/README.md
+++ b/terraform/environments/corporate-staff-rostering/README.md
@@ -12,7 +12,7 @@ _If you have any questions surrounding this page please post in the `#dso-intern
 
 ### **Description:**
 
-CSR provides scheduling, annual leave & overtime for around 30,000 Prison Officers and Operational Support Grades. All CSR components are running in Production, with Preproduction hosting training app and web servers. The service is in Modernisation Platform live as of 09/03/2024. 
+CSR provides scheduling, annual leave & overtime for around 30,000 Prison Officers and Operational Support Grades. All CSR components are running in Production, with Preproduction hosting training app and web servers. The service is in Modernisation Platform live as of 09/03/2024.
 
 ### **Service URLs:**
 
@@ -37,14 +37,14 @@ trainb.pp.csr.service.justice.gov.uk
 
 ### **Incident contact details:**  
 
-Email hmpps-nomis-mis-load@moj-digital-tools.pagerduty.com for database issues.   
-Email csr_application_alerts@digital.justice.gov.uk for application issues.  
-Email csr_infrastructure_alerts@digital.justice.gov.uk for infrastructure issues.  
+Email <hmpps-nomis-mis-load@moj-digital-tools.pagerduty.com> for database issues.
+Email <csr_application_alerts@digital.justice.gov.uk> for application issues.  
+Email <csr_infrastructure_alerts@digital.justice.gov.uk> for infrastructure issues.  
 
 ### **Service team contact:**  
 
 ask-digital-studio-ops  
-digital-studio-operations-team@digital.justice.gov.uk  
+<digital-studio-operations-team@digital.justice.gov.uk>  
 
 ### **Hosting environment:**
 
diff --git a/terraform/environments/dacp/ec2_bastion_linux.tf b/terraform/environments/dacp/ec2_bastion_linux.tf
index 0e018555d5a..c95fb3caf53 100644
--- a/terraform/environments/dacp/ec2_bastion_linux.tf
+++ b/terraform/environments/dacp/ec2_bastion_linux.tf
@@ -7,7 +7,7 @@ module "bastion_linux" {
     aws.share-tenant = aws          # The default provider (unaliased, `aws`) is the tenant
   }
   # s3 - used for logs and user ssh public keys
-  bucket_name          = "bastion-example"
+  bucket_name = "bastion-example"
   # bucket_versioning    = true
   # bucket_force_destroy = true
   # public keys
diff --git a/terraform/environments/dacp/providers.tf b/terraform/environments/dacp/providers.tf
index 1b5b4a4f93b..99aaed0331d 100644
--- a/terraform/environments/dacp/providers.tf
+++ b/terraform/environments/dacp/providers.tf
@@ -1,4 +1,4 @@
 provider "aws" {
   region = "eu-west-2"
-  alias = "tacticalproducts"
+  alias  = "tacticalproducts"
 }
\ No newline at end of file
diff --git a/terraform/environments/delius-core/locals_development.tf b/terraform/environments/delius-core/locals_development.tf
index 3e0d98b682f..9fc8f4f5c0f 100644
--- a/terraform/environments/delius-core/locals_development.tf
+++ b/terraform/environments/delius-core/locals_development.tf
@@ -83,19 +83,19 @@ locals {
     }
 
     merge_api = {
-      container_port        = 8080
-      image_tag             = "REPLACE"
-      create_rds            = true
-      rds_engine            = "postgres"
-      rds_engine_version    = "15"
-      rds_instance_class    = "db.t3.small"
-      rds_allocated_storage = 30
-      rds_username          = "dbadmin"
-      rds_port              = 5432
-      rds_license_model     = "postgresql-license"
+      container_port          = 8080
+      image_tag               = "REPLACE"
+      create_rds              = true
+      rds_engine              = "postgres"
+      rds_engine_version      = "15"
+      rds_instance_class      = "db.t3.small"
+      rds_allocated_storage   = 30
+      rds_username            = "dbadmin"
+      rds_port                = 5432
+      rds_license_model       = "postgresql-license"
       rds_deletion_protection = false
       rds_skip_final_snapshot = true
-      snapshot_identifier = "rds-migration-1145"
+      snapshot_identifier     = "rds-migration-1145"
     }
 
     merge_ui = {
diff --git a/terraform/environments/delius-core/locals_test.tf b/terraform/environments/delius-core/locals_test.tf
index 2c3f5227708..c2057cb5b3f 100644
--- a/terraform/environments/delius-core/locals_test.tf
+++ b/terraform/environments/delius-core/locals_test.tf
@@ -89,19 +89,19 @@ locals {
     }
 
     merge_api = {
-      image_tag             = "REPLACE"
-      container_port        = 8080
-      create_rds            = true
-      rds_engine            = "postgres"
-      rds_engine_version    = "15"
-      rds_instance_class    = "db.t3.small"
-      rds_allocated_storage = 20
-      rds_username          = "dbadmin"
-      rds_port              = 5432
-      rds_license_model     = "postgresql-license"
+      image_tag               = "REPLACE"
+      container_port          = 8080
+      create_rds              = true
+      rds_engine              = "postgres"
+      rds_engine_version      = "15"
+      rds_instance_class      = "db.t3.small"
+      rds_allocated_storage   = 20
+      rds_username            = "dbadmin"
+      rds_port                = 5432
+      rds_license_model       = "postgresql-license"
       rds_deletion_protection = false
       rds_skip_final_snapshot = true
-      snapshot_identifier = null
+      snapshot_identifier     = null
     }
 
     weblogic = {
diff --git a/terraform/environments/delius-core/modules/components/oracle_db_shared/locals.tf b/terraform/environments/delius-core/modules/components/oracle_db_shared/locals.tf
index 8e30e651ee4..3b0d9cc31ea 100644
--- a/terraform/environments/delius-core/modules/components/oracle_db_shared/locals.tf
+++ b/terraform/environments/delius-core/modules/components/oracle_db_shared/locals.tf
@@ -1,8 +1,8 @@
 locals {
-  secret_prefix           = join("-", [lookup(var.tags, "environment-name", null), lookup(var.tags, "delius-environment", null), lookup(var.tags, "application", null)])
-  dba_secret_name         = "${local.secret_prefix}-dba-passwords"
-  application_secret_name = "${local.secret_prefix}-application-passwords"
-  oem_account_id          = var.platform_vars.environment_management.account_ids[join("-", ["hmpps-oem", var.account_info.mp_environment])]
+  secret_prefix                               = join("-", [lookup(var.tags, "environment-name", null), lookup(var.tags, "delius-environment", null), lookup(var.tags, "application", null)])
+  dba_secret_name                             = "${local.secret_prefix}-dba-passwords"
+  application_secret_name                     = "${local.secret_prefix}-application-passwords"
+  oem_account_id                              = var.platform_vars.environment_management.account_ids[join("-", ["hmpps-oem", var.account_info.mp_environment])]
   oracle_statistics_delius_target_account_id  = var.env_name == "dev" ? var.platform_vars.environment_management.account_ids["delius-core-test"] : var.env_name == "preprod" ? var.platform_vars.environment_management.account_ids["delius-core-production"] : ""
   oracle_statistics_delius_target_environment = var.env_name == "dev" ? "test" : var.env_name == "preprod" ? "prod" : var.env_name == "stage" ? "preprod" : ""
   oracle_statistics_delius_source_account_id  = var.env_name == "test" ? var.platform_vars.environment_management.account_ids["delius-core-development"] : var.env_name == "prod" ? var.platform_vars.environment_management.account_ids["delius-core-preproduction"] : ""
diff --git a/terraform/environments/delius-core/modules/components/oracle_db_shared/policies/oracle_statistics_backup_data.json b/terraform/environments/delius-core/modules/components/oracle_db_shared/policies/oracle_statistics_backup_data.json
index f6c0897d5c3..9caab20482d 100644
--- a/terraform/environments/delius-core/modules/components/oracle_db_shared/policies/oracle_statistics_backup_data.json
+++ b/terraform/environments/delius-core/modules/components/oracle_db_shared/policies/oracle_statistics_backup_data.json
@@ -1,6 +1,6 @@
 {
   "Version": "2012-10-17",
-  
+
   "Statement": [
     {
       "Sid": "OracleStatisticsListPolicy",
@@ -17,10 +17,12 @@
       "Principal": {
         "AWS": "arn:aws:iam::${oracle_statistics_delius_target_account_id}:role/instance-role-${oracle_statistics_delius_target_environment}-delius-db-1"
       },
-      "Action": ["s3:PutObjectAcl",
-                 "s3:PutObject",
-                 "s3:GetObjectTagging",
-                 "s3:GetObject"],
+      "Action": [
+        "s3:PutObjectAcl",
+        "s3:PutObject",
+        "s3:GetObjectTagging",
+        "s3:GetObject"
+      ],
       "Resource": "${s3bucket_arn}/*"
     }
   ]
diff --git a/terraform/environments/delius-core/modules/components/oracle_db_shared/s3.tf b/terraform/environments/delius-core/modules/components/oracle_db_shared/s3.tf
index 843c889b4d7..466fa56ad03 100644
--- a/terraform/environments/delius-core/modules/components/oracle_db_shared/s3.tf
+++ b/terraform/environments/delius-core/modules/components/oracle_db_shared/s3.tf
@@ -106,8 +106,8 @@ data "aws_iam_policy_document" "oracledb_backup_bucket_access" {
 data "aws_iam_policy_document" "oracle_remote_statistics_bucket_access" {
 
   statement {
-    sid     = "allowAccessToListOracleStatistics${title(local.oracle_statistics_delius_source_environment)}Bucket"
-    effect  = "Allow"
+    sid    = "allowAccessToListOracleStatistics${title(local.oracle_statistics_delius_source_environment)}Bucket"
+    effect = "Allow"
     actions = [
       "s3:ListBucket"
     ]
@@ -115,8 +115,8 @@ data "aws_iam_policy_document" "oracle_remote_statistics_bucket_access" {
   }
 
   statement {
-    sid     = "allowAccessToOracleStatistics${title(local.oracle_statistics_delius_source_environment)}BucketObjects"
-    effect  = "Allow"
+    sid    = "allowAccessToOracleStatistics${title(local.oracle_statistics_delius_source_environment)}BucketObjects"
+    effect = "Allow"
     actions = [
       "s3:PutObjectAcl",
       "s3:PutObject",
@@ -129,9 +129,9 @@ data "aws_iam_policy_document" "oracle_remote_statistics_bucket_access" {
 
 data "aws_iam_policy_document" "combined" {
   source_policy_documents = compact([
-                              data.aws_iam_policy_document.oracledb_backup_bucket_access.json,
-                              local.oracle_statistics_delius_source_environment != "" ? data.aws_iam_policy_document.oracle_remote_statistics_bucket_access.json : null
-                            ])
+    data.aws_iam_policy_document.oracledb_backup_bucket_access.json,
+    local.oracle_statistics_delius_source_environment != "" ? data.aws_iam_policy_document.oracle_remote_statistics_bucket_access.json : null
+  ])
 }
 
 resource "aws_iam_policy" "oracledb_backup_bucket_access" {
@@ -221,12 +221,12 @@ module "s3_bucket_oracle_statistics" {
   ownership_controls  = "BucketOwnerEnforced"
   replication_enabled = false
   custom_kms_key      = var.account_config.kms_keys.general_shared
-  bucket_policy       = compact([ local.oracle_statistics_delius_target_environment != "" ? templatefile("${path.module}/policies/oracle_statistics_backup_data.json", 
-                                                            { 
-                                                              s3bucket_arn = module.s3_bucket_oracle_statistics.bucket.arn,
-                                                              oracle_statistics_delius_target_account_id = local.oracle_statistics_delius_target_account_id,
-                                                              oracle_statistics_delius_target_environment = local.oracle_statistics_delius_target_environment
-                                                            }) : null])
+  bucket_policy = compact([local.oracle_statistics_delius_target_environment != "" ? templatefile("${path.module}/policies/oracle_statistics_backup_data.json",
+    {
+      s3bucket_arn                                = module.s3_bucket_oracle_statistics.bucket.arn,
+      oracle_statistics_delius_target_account_id  = local.oracle_statistics_delius_target_account_id,
+      oracle_statistics_delius_target_environment = local.oracle_statistics_delius_target_environment
+  }) : null])
   providers = {
     aws.bucket-replication = aws.bucket-replication
   }
diff --git a/terraform/environments/delius-core/modules/delius_environment/merge_api_service.tf b/terraform/environments/delius-core/modules/delius_environment/merge_api_service.tf
index 564dac7a818..3427f6caf37 100644
--- a/terraform/environments/delius-core/modules/delius_environment/merge_api_service.tf
+++ b/terraform/environments/delius-core/modules/delius_environment/merge_api_service.tf
@@ -40,18 +40,18 @@ module "merge_api_service" {
   health_check_path       = "/merge/api/actuator/health"
   account_info            = var.account_info
 
-  create_rds            = var.delius_microservice_configs.merge_api.create_rds
-  rds_engine            = var.delius_microservice_configs.merge_api.rds_engine
-  rds_engine_version    = var.delius_microservice_configs.merge_api.rds_engine_version
-  rds_instance_class    = var.delius_microservice_configs.merge_api.rds_instance_class
-  rds_port              = var.delius_microservice_configs.merge_api.rds_port
-  rds_allocated_storage = var.delius_microservice_configs.merge_api.rds_allocated_storage
-  rds_username          = var.delius_microservice_configs.merge_api.rds_username
-  rds_license_model     = var.delius_microservice_configs.merge_api.rds_license_model
+  create_rds              = var.delius_microservice_configs.merge_api.create_rds
+  rds_engine              = var.delius_microservice_configs.merge_api.rds_engine
+  rds_engine_version      = var.delius_microservice_configs.merge_api.rds_engine_version
+  rds_instance_class      = var.delius_microservice_configs.merge_api.rds_instance_class
+  rds_port                = var.delius_microservice_configs.merge_api.rds_port
+  rds_allocated_storage   = var.delius_microservice_configs.merge_api.rds_allocated_storage
+  rds_username            = var.delius_microservice_configs.merge_api.rds_username
+  rds_license_model       = var.delius_microservice_configs.merge_api.rds_license_model
   rds_deletion_protection = var.delius_microservice_configs.merge_api.rds_deletion_protection
   snapshot_identifier     = var.delius_microservice_configs.merge_api.snapshot_identifier
   rds_skip_final_snapshot = var.delius_microservice_configs.merge_api.rds_skip_final_snapshot
-  
+
   container_environment_vars = [
     {
       name  = "SERVER_SERVLET_CONTEXT_PATH"
diff --git a/terraform/environments/digital-prison-reporting/locals.tf b/terraform/environments/digital-prison-reporting/locals.tf
index 7976178d525..150476ae0de 100644
--- a/terraform/environments/digital-prison-reporting/locals.tf
+++ b/terraform/environments/digital-prison-reporting/locals.tf
@@ -32,13 +32,13 @@ locals {
 
   glue_job_common_log_level = local.application_data.accounts[local.environment].glue_job_common_log_level
 
-  kinesis_endpoint         = "https://kinesis.eu-west-2.amazonaws.com"
-  cloud_platform_cidr      = "172.20.0.0/16"
-  enable_dpr_cloudtrail    = local.application_data.accounts[local.environment].enable_cloud_trail
-  generic_lambda           = "${local.project}-generic-lambda"
+  kinesis_endpoint      = "https://kinesis.eu-west-2.amazonaws.com"
+  cloud_platform_cidr   = "172.20.0.0/16"
+  enable_dpr_cloudtrail = local.application_data.accounts[local.environment].enable_cloud_trail
+  generic_lambda        = "${local.project}-generic-lambda"
 
   lambda_log_retention_in_days = local.application_data.accounts[local.environment].lambda_log_retention_in_days
-  enable_generic_lambda_sg = true # True for all Envs, Common SG Group
+  enable_generic_lambda_sg     = true # True for all Envs, Common SG Group
   # DMS Specific
   setup_dms_instance                = local.application_data.accounts[local.environment].setup_dms_instance
   enable_replication_task           = local.application_data.accounts[local.environment].enable_dms_replication_task
@@ -53,7 +53,7 @@ locals {
   # Glue Job parameters
   glue_placeholder_script_location = "s3://${local.project}-artifact-store-${local.environment}/build-artifacts/digital-prison-reporting-jobs/scripts/digital-prison-reporting-jobs-vLatest.scala"
   glue_jobs_latest_jar_location    = "s3://${local.project}-artifact-store-${local.environment}/build-artifacts/digital-prison-reporting-jobs/jars/digital-prison-reporting-jobs-vLatest-all.jar"
-  glue_log_retention_in_days = local.application_data.accounts[local.environment].glue_log_retention_in_days
+  glue_log_retention_in_days       = local.application_data.accounts[local.environment].glue_log_retention_in_days
   # Reporting Hub Job
   reporting_hub_driver_mem   = local.application_data.accounts[local.environment].reporting_hub_spark_driver_mem
   reporting_hub_executor_mem = local.application_data.accounts[local.environment].reporting_hub_spark_executor_mem
diff --git a/terraform/environments/digital-prison-reporting/modules/dms_s3_v2/main.tf b/terraform/environments/digital-prison-reporting/modules/dms_s3_v2/main.tf
index 77ac8894cf5..386a5e587b6 100644
--- a/terraform/environments/digital-prison-reporting/modules/dms_s3_v2/main.tf
+++ b/terraform/environments/digital-prison-reporting/modules/dms_s3_v2/main.tf
@@ -9,7 +9,7 @@ resource "aws_cloudwatch_log_group" "dms-instance-log-group" {
     var.tags,
     {
       name = "${var.name}-instance-log-group-${var.env}"
-    })
+  })
 }
 
 ### DMS replication instance
diff --git a/terraform/environments/digital-prison-reporting/modules/dms_s3_v2/outputs.tf b/terraform/environments/digital-prison-reporting/modules/dms_s3_v2/outputs.tf
index 64bf467e269..3f8e42d2033 100644
--- a/terraform/environments/digital-prison-reporting/modules/dms_s3_v2/outputs.tf
+++ b/terraform/environments/digital-prison-reporting/modules/dms_s3_v2/outputs.tf
@@ -37,5 +37,5 @@ output "dms_s3_iam_policy_admin_arn" {
 
 output "dms_instance_log_group_arn" {
   description = "The ARM of the DMS instance log group"
-  value = var.setup_dms_endpoints && var.setup_dms_instance ? join("", aws_cloudwatch_log_group.dms-instance-log-group.*.arn) : ""
+  value       = var.setup_dms_endpoints && var.setup_dms_instance ? join("", aws_cloudwatch_log_group.dms-instance-log-group.*.arn) : ""
 }
\ No newline at end of file
diff --git a/terraform/environments/hmpps-domain-services/locals.tf b/terraform/environments/hmpps-domain-services/locals.tf
index 0e341baccda..307ac7ff37b 100644
--- a/terraform/environments/hmpps-domain-services/locals.tf
+++ b/terraform/environments/hmpps-domain-services/locals.tf
@@ -59,25 +59,25 @@ locals {
       }]
     },
     PatchBucketAccessPolicy = {
-    description = "Permissions to upload and download patches"
-    statements = [{
+      description = "Permissions to upload and download patches"
+      statements = [{
         effect = "Allow"
         actions = [
           "s3:ListBucket",
         ]
         resources = ["arn:aws:s3:::hmpps-domain-services-development-patch-logs"]
-      },
-      {
-        effect = "Allow"
-        actions = [
-          "s3:PutObject",
-          "s3:GetObject",
-          "s3:DeleteObject",
-          "s3:PutObjectAcl"
-        ]
-        resources = ["arn:aws:s3:::hmpps-domain-services-development-patch-logs/*"]
-      }
-   ]}
+        },
+        {
+          effect = "Allow"
+          actions = [
+            "s3:PutObject",
+            "s3:GetObject",
+            "s3:DeleteObject",
+            "s3:PutObjectAcl"
+          ]
+          resources = ["arn:aws:s3:::hmpps-domain-services-development-patch-logs/*"]
+        }
+    ] }
   }
 
   baseline_iam_roles                = {}
diff --git a/terraform/environments/hmpps-domain-services/locals_preproduction.tf b/terraform/environments/hmpps-domain-services/locals_preproduction.tf
index b46f444f749..2fbac2ddabe 100644
--- a/terraform/environments/hmpps-domain-services/locals_preproduction.tf
+++ b/terraform/environments/hmpps-domain-services/locals_preproduction.tf
@@ -33,7 +33,7 @@ locals {
     baseline_ec2_instances = {
       pp-rdgw-1-a = merge(local.rds_ec2_instance, {
         config = merge(local.rds_ec2_instance.config, {
-          availability_zone = "eu-west-2a"
+          availability_zone         = "eu-west-2a"
           instance_profile_policies = concat(local.rds_ec2_instance.config.instance_profile_policies, ["SSMPolicy", "PatchBucketAccessPolicy"])
         })
         tags = merge(local.rds_ec2_instance.tags, {
diff --git a/terraform/environments/hmpps-domain-services/locals_production.tf b/terraform/environments/hmpps-domain-services/locals_production.tf
index c356aee78a9..4828a8050a7 100644
--- a/terraform/environments/hmpps-domain-services/locals_production.tf
+++ b/terraform/environments/hmpps-domain-services/locals_production.tf
@@ -39,8 +39,8 @@ locals {
     baseline_ec2_instances = {
       pd-rdgw-1-a = merge(local.rds_ec2_instance, {
         config = merge(local.rds_ec2_instance.config, {
-          availability_zone = "eu-west-2a"
-          instance_profile_policies = concat(local.rds_ec2_instance.config.instance_profile_policies,["SSMPolicy", "PatchBucketAccessPolicy"])
+          availability_zone         = "eu-west-2a"
+          instance_profile_policies = concat(local.rds_ec2_instance.config.instance_profile_policies, ["SSMPolicy", "PatchBucketAccessPolicy"])
         })
         tags = merge(local.rds_ec2_instance.tags, {
           description = "Remote Desktop Gateway for azure.hmpp.root domain"
@@ -48,8 +48,8 @@ locals {
       })
       pd-rdgw-1-b = merge(local.rds_ec2_instance, {
         config = merge(local.rds_ec2_instance.config, {
-          availability_zone = "eu-west-2b"
-          instance_profile_policies = concat(local.rds_ec2_instance.config.instance_profile_policies,["SSMPolicy", "PatchBucketAccessPolicy"])
+          availability_zone         = "eu-west-2b"
+          instance_profile_policies = concat(local.rds_ec2_instance.config.instance_profile_policies, ["SSMPolicy", "PatchBucketAccessPolicy"])
         })
         tags = merge(local.rds_ec2_instance.tags, {
           description = "Remote Desktop Gateway for azure.hmpp.root domain"
@@ -59,7 +59,7 @@ locals {
         config = merge(local.rds_ec2_instance.config, {
           availability_zone         = "eu-west-2a"
           user_data_raw             = base64encode(file("./templates/user-data-domain-join.yaml"))
-          instance_profile_policies = concat(local.rds_ec2_instance.config.instance_profile_policies,["SSMPolicy", "PatchBucketAccessPolicy"])
+          instance_profile_policies = concat(local.rds_ec2_instance.config.instance_profile_policies, ["SSMPolicy", "PatchBucketAccessPolicy"])
         })
         instance = merge(local.rds_ec2_instance.instance, {
           instance_type = "t3.large"
diff --git a/terraform/environments/ncas/ec2_bastion_linux.tf b/terraform/environments/ncas/ec2_bastion_linux.tf
index 42d4cde65c7..d63c870c70e 100644
--- a/terraform/environments/ncas/ec2_bastion_linux.tf
+++ b/terraform/environments/ncas/ec2_bastion_linux.tf
@@ -7,7 +7,7 @@ module "bastion_linux" {
     aws.share-tenant = aws          # The default provider (unaliased, `aws`) is the tenant
   }
   # s3 - used for logs and user ssh public keys
-  bucket_name          = "bastion-example"
+  bucket_name = "bastion-example"
   # bucket_versioning    = true
   # bucket_force_destroy = true
   # public keys
diff --git a/terraform/environments/nomis/locals_development.tf b/terraform/environments/nomis/locals_development.tf
index 23b0a9c1143..efdc7c3e564 100644
--- a/terraform/environments/nomis/locals_development.tf
+++ b/terraform/environments/nomis/locals_development.tf
@@ -368,8 +368,8 @@ locals {
           oracle-db-hostname-a = "SDPDL0001.azure.noms.root"
           oracle-db-hostname-b = "none"
           oracle-db-name       = "qa11r"
-         })
-       })
+        })
+      })
     }
 
     baseline_lbs = {
diff --git a/terraform/environments/oasys/locals_production.tf b/terraform/environments/oasys/locals_production.tf
index 86e9e334d1b..793b2c9f5b5 100644
--- a/terraform/environments/oasys/locals_production.tf
+++ b/terraform/environments/oasys/locals_production.tf
@@ -275,7 +275,7 @@ locals {
           description                             = "practice and training ${local.application_name} database"
           "${local.application_name}-environment" = "ptctrn"
           bip-db-name                             = "TRBIPINF"
-          oracle-sids = "PROASYS TROASYS TRBIPINF"
+          oracle-sids                             = "PROASYS TROASYS TRBIPINF"
         })
       })
 
diff --git a/terraform/environments/performance-hub/bastion_linux.tf b/terraform/environments/performance-hub/bastion_linux.tf
index 8ed00d8cf48..afc4afe5618 100644
--- a/terraform/environments/performance-hub/bastion_linux.tf
+++ b/terraform/environments/performance-hub/bastion_linux.tf
@@ -12,7 +12,7 @@ module "bastion_linux" {
   }
 
   # s3 - used for logs and user ssh public keys
-  bucket_name          = "bastion"
+  bucket_name = "bastion"
   # public keys
   public_key_data = local.public_key_data.keys[local.environment]
   # logs
diff --git a/terraform/environments/pra-register/ec2_bastion_linux.tf b/terraform/environments/pra-register/ec2_bastion_linux.tf
index 42d4cde65c7..d63c870c70e 100644
--- a/terraform/environments/pra-register/ec2_bastion_linux.tf
+++ b/terraform/environments/pra-register/ec2_bastion_linux.tf
@@ -7,7 +7,7 @@ module "bastion_linux" {
     aws.share-tenant = aws          # The default provider (unaliased, `aws`) is the tenant
   }
   # s3 - used for logs and user ssh public keys
-  bucket_name          = "bastion-example"
+  bucket_name = "bastion-example"
   # bucket_versioning    = true
   # bucket_force_destroy = true
   # public keys
diff --git a/terraform/environments/wardship/ec2_bastion_linux.tf b/terraform/environments/wardship/ec2_bastion_linux.tf
index 42d4cde65c7..d63c870c70e 100644
--- a/terraform/environments/wardship/ec2_bastion_linux.tf
+++ b/terraform/environments/wardship/ec2_bastion_linux.tf
@@ -7,7 +7,7 @@ module "bastion_linux" {
     aws.share-tenant = aws          # The default provider (unaliased, `aws`) is the tenant
   }
   # s3 - used for logs and user ssh public keys
-  bucket_name          = "bastion-example"
+  bucket_name = "bastion-example"
   # bucket_versioning    = true
   # bucket_force_destroy = true
   # public keys
diff --git a/terraform/modules/ip_addresses/azure_fixngo.tf b/terraform/modules/ip_addresses/azure_fixngo.tf
index 1b75defb1cb..c1c76b69246 100644
--- a/terraform/modules/ip_addresses/azure_fixngo.tf
+++ b/terraform/modules/ip_addresses/azure_fixngo.tf
@@ -8,7 +8,7 @@ locals {
     pcmcw1012 = "10.40.64.133"
 
     # DevTest Domain Controllers
-    MGMCW0002    = "10.102.0.196"
+    MGMCW0002 = "10.102.0.196"
   }
 
   azure_fixngo_ips = {
@@ -49,7 +49,7 @@ locals {
     noms_prod_domain_controller_pcmcw1011 = "10.40.144.196/32"
     noms_prod_domain_controller_pcmcw1012 = "10.40.64.133/32"
 
-    noms_devtest_domain_controller_MGMCW0002    = "10.102.0.196/32"
+    noms_devtest_domain_controller_MGMCW0002 = "10.102.0.196/32"
   }
 
   noms_live_subnet = {
diff --git a/terraform/modules/patch_manager/README.md b/terraform/modules/patch_manager/README.md
index a6a50888713..df7c41fb01b 100644
--- a/terraform/modules/patch_manager/README.md
+++ b/terraform/modules/patch_manager/README.md
@@ -1,6 +1,6 @@
 # AWS Systems Manager Patch Manager Module
 
-- Use this module to set up a patch schedule for instances. 
+- Use this module to set up a patch schedule for instances.
 - Register instances to patch by giving the `target_tag` map the tag name and value of the instance that requires patching.
 - Successful patches will be picked up from the development environment and referenced by the other environments
 
diff --git a/terraform/modules/patch_manager/patch-manager.tf b/terraform/modules/patch_manager/patch-manager.tf
index 7eebb22d19c..229379c2797 100644
--- a/terraform/modules/patch_manager/patch-manager.tf
+++ b/terraform/modules/patch_manager/patch-manager.tf
@@ -34,8 +34,8 @@ resource "aws_cloudwatch_log_group" "this" {
 }
 
 resource "aws_ssm_maintenance_window_task" "this" {
-  description     = "Maintenance window task for ${var.application}-${var.environment}"
-  task_type       = "RUN_COMMAND"
+  description = "Maintenance window task for ${var.application}-${var.environment}"
+  task_type   = "RUN_COMMAND"
   # Only development uses AWS-RunPatchBaselineWithHooks to trigger post patching jobs and you can't use this task
   # when specifying exact patches so the environments will run the standard AWS-RunPatchBaseline task
   task_arn        = var.environment == "development" ? "AWS-RunPatchBaselineWithHooks" : "AWS-RunPatchBaseline"
diff --git a/terraform/modules/patch_manager/variables.tf b/terraform/modules/patch_manager/variables.tf
index abc49892153..1ec5cd422e1 100644
--- a/terraform/modules/patch_manager/variables.tf
+++ b/terraform/modules/patch_manager/variables.tf
@@ -21,5 +21,5 @@ variable "operating_system" {
 }
 
 variable "target_tag" {
-  type = map
+  type = map(any)
 }
\ No newline at end of file