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

---
 environments/delius-core.json                 |  5 +----
 environments/delius-iaps.json                 |  5 +----
 environments/delius-jitbit.json               |  5 +----
 environments/delius-mis.json                  |  5 +----
 environments/delius-nextcloud.json            |  5 +----
 terraform/environments/core-logging/cortex.tf | 20 +++++++++----------
 6 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/environments/delius-core.json b/environments/delius-core.json
index 371e2269a..17f259024 100644
--- a/environments/delius-core.json
+++ b/environments/delius-core.json
@@ -1,9 +1,6 @@
 {
   "account-type": "member",
-  "codeowners": [
-    "hmpps-migration",
-    "hosting-migrations"
-  ],
+  "codeowners": ["hmpps-migration", "hosting-migrations"],
   "environments": [
     {
       "name": "development",
diff --git a/environments/delius-iaps.json b/environments/delius-iaps.json
index 2228fc33b..49c8d02aa 100644
--- a/environments/delius-iaps.json
+++ b/environments/delius-iaps.json
@@ -1,9 +1,6 @@
 {
   "account-type": "member",
-  "codeowners": [
-    "hmpps-migration",
-    "hosting-migrations"
-  ],
+  "codeowners": ["hmpps-migration", "hosting-migrations"],
   "environments": [
     {
       "name": "development",
diff --git a/environments/delius-jitbit.json b/environments/delius-jitbit.json
index 07c1b9589..bf351e6e2 100644
--- a/environments/delius-jitbit.json
+++ b/environments/delius-jitbit.json
@@ -1,9 +1,6 @@
 {
   "account-type": "member",
-  "codeowners": [
-    "hmpps-migration",
-    "hosting-migrations"
-  ],
+  "codeowners": ["hmpps-migration", "hosting-migrations"],
   "environments": [
     {
       "name": "development",
diff --git a/environments/delius-mis.json b/environments/delius-mis.json
index 5e0dd621b..7db13cf03 100644
--- a/environments/delius-mis.json
+++ b/environments/delius-mis.json
@@ -1,9 +1,6 @@
 {
   "account-type": "member",
-  "codeowners": [
-    "hmpps-migration",
-    "hosting-migrations"
-  ],
+  "codeowners": ["hmpps-migration", "hosting-migrations"],
   "environments": [
     {
       "name": "development",
diff --git a/environments/delius-nextcloud.json b/environments/delius-nextcloud.json
index b4bbd551d..09937ce10 100644
--- a/environments/delius-nextcloud.json
+++ b/environments/delius-nextcloud.json
@@ -1,9 +1,6 @@
 {
   "account-type": "member",
-  "codeowners": [
-    "hmpps-migration",
-    "hosting-migrations"
-  ],
+  "codeowners": ["hmpps-migration", "hosting-migrations"],
   "environments": [
     {
       "name": "development",
diff --git a/terraform/environments/core-logging/cortex.tf b/terraform/environments/core-logging/cortex.tf
index 44e65b1db..779e98278 100644
--- a/terraform/environments/core-logging/cortex.tf
+++ b/terraform/environments/core-logging/cortex.tf
@@ -46,7 +46,7 @@ data "aws_iam_policy_document" "logging-sqs" {
       type        = "Service"
       identifiers = ["s3.amazonaws.com"]
     }
-    actions = ["sqs:SendMessage"]
+    actions   = ["sqs:SendMessage"]
     resources = [aws_sqs_queue.logging[each.key].arn]
     condition {
       test     = "ArnEquals"
@@ -70,16 +70,16 @@ data "aws_iam_policy_document" "cortex_user_policy" {
     ]
     resources = flatten([
       aws_sqs_queue.mp_cloudtrail_log_queue.arn,
-    [ for key in aws_sqs_queue.logging : key.arn ]
+      [for key in aws_sqs_queue.logging : key.arn]
     ])
   }
   statement {
-    sid       = "S3GetLogs"
-    effect    = "Allow"
-    actions   = ["s3:GetObject"]
+    sid     = "S3GetLogs"
+    effect  = "Allow"
+    actions = ["s3:GetObject"]
     resources = concat(
       [module.s3-bucket-cloudtrail.bucket.arn, "${module.s3-bucket-cloudtrail.bucket.arn}/*"],
-     [ for key in aws_s3_bucket.logging : "${key.arn}/*"]
+      [for key in aws_s3_bucket.logging : "${key.arn}/*"]
     )
   }
 }
@@ -147,10 +147,10 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "logging" {
 }
 
 resource "aws_sqs_queue" "logging" {
-  for_each                   = local.cortex_logging_buckets
-  name_prefix                = "${local.application_name}-${each.key}"
-  sqs_managed_sse_enabled    = true   # Using managed encryption
-  tags                       = local.tags
+  for_each                = local.cortex_logging_buckets
+  name_prefix             = "${local.application_name}-${each.key}"
+  sqs_managed_sse_enabled = true # Using managed encryption
+  tags                    = local.tags
 }
 
 resource "aws_sqs_queue_policy" "logging" {