From 976173d91afc6b4ddff3036dc3c390ff08929142 Mon Sep 17 00:00:00 2001
From: modernisation-platform-ci
 <modernisation-platform+github@digital.justice.gov.uk>
Date: Mon, 21 Oct 2024 05:05:33 +0000
Subject: [PATCH] Updates from GitHub Actions Format Code workflow

---
 .../security-groups.tf                        |   6 +-
 terraform/environments/apex/backups.tf        |   2 +-
 terraform/environments/apex/locals.tf         |   2 +-
 .../components/dms/dms_db_target_endpoints.tf |   4 +-
 .../modules/dms_s3_v2/main.tf                 |   2 +-
 .../locals_preproduction.tf                   | 188 +++++++++---------
 terraform/environments/ppud/alb_external.tf   |  10 +-
 .../ppud/cloudwatch_alarms_windows.tf         |  12 +-
 terraform/environments/ppud/s3.tf             |  92 ++++-----
 terraform/environments/ppud/sns.tf            |  78 ++++----
 10 files changed, 198 insertions(+), 198 deletions(-)

diff --git a/terraform/environments/analytical-platform-ingestion/security-groups.tf b/terraform/environments/analytical-platform-ingestion/security-groups.tf
index 606e2b3f2db..59d9767fe25 100644
--- a/terraform/environments/analytical-platform-ingestion/security-groups.tf
+++ b/terraform/environments/analytical-platform-ingestion/security-groups.tf
@@ -90,10 +90,10 @@ module "datasync_activation_nlb_security_group" {
   vpc_id = module.connected_vpc.vpc_id
 
   egress_cidr_blocks = ["${local.environment_configuration.datasync_instance_private_ip}/32"]
-  egress_rules       = ["http-80-tcp",]
+  egress_rules       = ["http-80-tcp", ]
 
   ingress_cidr_blocks = ["${data.external.external_ip.result["ip"]}/32"]
-  ingress_rules = ["http-80-tcp"]
+  ingress_rules       = ["http-80-tcp"]
 
   tags = local.tags
 }
@@ -110,7 +110,7 @@ module "datasync_vpc_endpoint_security_group" {
   vpc_id = module.connected_vpc.vpc_id
 
   egress_cidr_blocks = [module.connected_vpc.vpc_cidr_block]
-  egress_rules       = ["all-all",]
+  egress_rules       = ["all-all", ]
 
   ingress_with_cidr_blocks = [
     {
diff --git a/terraform/environments/apex/backups.tf b/terraform/environments/apex/backups.tf
index bfb2c531b81..081707a0940 100644
--- a/terraform/environments/apex/backups.tf
+++ b/terraform/environments/apex/backups.tf
@@ -63,7 +63,7 @@ resource "aws_backup_vault_policy" "apex" {
 
 resource "aws_backup_vault" "prod_apex" {
   count = local.environment == "production" ? 1 : 0
-  name = "${local.application_name}-production-backup-vault"
+  name  = "${local.application_name}-production-backup-vault"
   tags = merge(
     local.tags,
     { "Name" = "${local.application_name}-production-backup-vault" },
diff --git a/terraform/environments/apex/locals.tf b/terraform/environments/apex/locals.tf
index 1e713522d1d..454c5a3d931 100644
--- a/terraform/environments/apex/locals.tf
+++ b/terraform/environments/apex/locals.tf
@@ -78,7 +78,7 @@ locals {
   app_db_password_name = "APP_APEX_DBPASSWORD_TAD"
   db_hostname          = "db.${local.application_name}"
 
-  backup_schedule_tags = local.environment == "production" ? { "snapshot-35-day-retention" = "yes" } : null
+  backup_schedule_tags       = local.environment == "production" ? { "snapshot-35-day-retention" = "yes" } : null
   database-instance-userdata = <<EOF
 #!/bin/bash
 cd /tmp
diff --git a/terraform/environments/delius-core/modules/components/dms/dms_db_target_endpoints.tf b/terraform/environments/delius-core/modules/components/dms/dms_db_target_endpoints.tf
index 448b239e258..db45df7e538 100644
--- a/terraform/environments/delius-core/modules/components/dms/dms_db_target_endpoints.tf
+++ b/terraform/environments/delius-core/modules/components/dms/dms_db_target_endpoints.tf
@@ -16,7 +16,7 @@ resource "aws_dms_endpoint" "dms_user_target_endpoint_db" {
   certificate_arn = aws_dms_certificate.empty_oracle_wallet.certificate_arn
   # Ignore subsequent replacement with a valid wallet
   lifecycle {
-     ignore_changes = [certificate_arn]
+    ignore_changes = [certificate_arn]
   }
   depends_on = [aws_dms_certificate.empty_oracle_wallet]
 }
@@ -38,7 +38,7 @@ resource "aws_dms_endpoint" "dms_audit_target_endpoint_db" {
   certificate_arn = aws_dms_certificate.empty_oracle_wallet.certificate_arn
   # Ignore subsequent replacement with a valid wallet
   lifecycle {
-     ignore_changes = [certificate_arn]
+    ignore_changes = [certificate_arn]
   }
   depends_on = [aws_dms_certificate.empty_oracle_wallet]
 }
\ No newline at end of file
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 ff24ba8d702..078ccf9d24b 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
@@ -78,7 +78,7 @@ resource "aws_security_group" "dms_s3_target_sec_group" {
     to_port     = 1521
     protocol    = "tcp"
     cidr_blocks = var.vpc_cidr
-  }  
+  }
   egress {
     from_port   = 0
     to_port     = 0
diff --git a/terraform/environments/oasys-national-reporting/locals_preproduction.tf b/terraform/environments/oasys-national-reporting/locals_preproduction.tf
index 15e762d3ce1..6c7c62f0c57 100644
--- a/terraform/environments/oasys-national-reporting/locals_preproduction.tf
+++ b/terraform/environments/oasys-national-reporting/locals_preproduction.tf
@@ -176,109 +176,109 @@ locals {
         })
       })
 
-    # No web instances built yet, not in use
-    # private = {
-    #   drop_invalid_header_fields       = false # https://me.sap.com/notes/0003348935
-    #   enable_cross_zone_load_balancing = true
-    #   enable_delete_protection         = false
-    #   idle_timeout                     = 3600
-    #   internal_lb                      = true
-    #   load_balancer_type               = "application"
-    #   security_groups                  = ["lb"]
-    #   subnets                          = module.environment.subnets["private"].ids
+      # No web instances built yet, not in use
+      # private = {
+      #   drop_invalid_header_fields       = false # https://me.sap.com/notes/0003348935
+      #   enable_cross_zone_load_balancing = true
+      #   enable_delete_protection         = false
+      #   idle_timeout                     = 3600
+      #   internal_lb                      = true
+      #   load_balancer_type               = "application"
+      #   security_groups                  = ["lb"]
+      #   subnets                          = module.environment.subnets["private"].ids
 
-    #   instance_target_groups = {
-    #     pp-onr-web-1-a = {
-    #       port     = 7777
-    #       protocol = "HTTP"
-    #       health_check = {
-    #         enabled             = true
-    #         healthy_threshold   = 3
-    #         interval            = 30
-    #         matcher             = "200-399"
-    #         path                = "/"
-    #         port                = 7777
-    #         timeout             = 5
-    #         unhealthy_threshold = 5
-    #       }
-    #       stickiness = {
-    #         enabled = true
-    #         type    = "lb_cookie"
-    #       }
-    #       attachments = [
-    #         { ec2_instance_name = "pp-onr-web-1-a" },
-    #       ]
-    #     }
-    #   }
+      #   instance_target_groups = {
+      #     pp-onr-web-1-a = {
+      #       port     = 7777
+      #       protocol = "HTTP"
+      #       health_check = {
+      #         enabled             = true
+      #         healthy_threshold   = 3
+      #         interval            = 30
+      #         matcher             = "200-399"
+      #         path                = "/"
+      #         port                = 7777
+      #         timeout             = 5
+      #         unhealthy_threshold = 5
+      #       }
+      #       stickiness = {
+      #         enabled = true
+      #         type    = "lb_cookie"
+      #       }
+      #       attachments = [
+      #         { ec2_instance_name = "pp-onr-web-1-a" },
+      #       ]
+      #     }
+      #   }
 
-    #   listeners = {
-    #     http = {
-    #       port     = 7777
-    #       protocol = "HTTP"
+      #   listeners = {
+      #     http = {
+      #       port     = 7777
+      #       protocol = "HTTP"
 
-    #       default_action = {
-    #         type = "fixed-response"
-    #         fixed_response = {
-    #           content_type = "text/plain"
-    #           message_body = "Not implemented"
-    #           status_code  = "501"
-    #         }
-    #       }
-    #       rules = {
-    #         pp-onr-web-1-a = {
-    #           priority = 4000
+      #       default_action = {
+      #         type = "fixed-response"
+      #         fixed_response = {
+      #           content_type = "text/plain"
+      #           message_body = "Not implemented"
+      #           status_code  = "501"
+      #         }
+      #       }
+      #       rules = {
+      #         pp-onr-web-1-a = {
+      #           priority = 4000
 
-    #           actions = [{
-    #             type              = "forward"
-    #             target_group_name = "pp-onr-web-1-a"
-    #           }]
+      #           actions = [{
+      #             type              = "forward"
+      #             target_group_name = "pp-onr-web-1-a"
+      #           }]
 
-    #           conditions = [{
-    #             host_header = {
-    #               values = [
-    #                 "pp-onr-web-1-a.oasys-national-reporting.hmpps-test.modernisation-platform.service.justice.gov.uk",
-    #               ]
-    #             }
-    #           }]
-    #         }
-    #       }
-    #     }
-    #     https = {
-    #       certificate_names_or_arns = ["oasys_national_reporting_wildcard_cert"]
-    #       port                      = 443
-    #       protocol                  = "HTTPS"
-    #       ssl_policy                = "ELBSecurityPolicy-2016-08"
+      #           conditions = [{
+      #             host_header = {
+      #               values = [
+      #                 "pp-onr-web-1-a.oasys-national-reporting.hmpps-test.modernisation-platform.service.justice.gov.uk",
+      #               ]
+      #             }
+      #           }]
+      #         }
+      #       }
+      #     }
+      #     https = {
+      #       certificate_names_or_arns = ["oasys_national_reporting_wildcard_cert"]
+      #       port                      = 443
+      #       protocol                  = "HTTPS"
+      #       ssl_policy                = "ELBSecurityPolicy-2016-08"
 
-    #       default_action = {
-    #         type = "fixed-response"
-    #         fixed_response = {
-    #           content_type = "text/plain"
-    #           message_body = "Not implemented"
-    #           status_code  = "501"
-    #         }
-    #       }
+      #       default_action = {
+      #         type = "fixed-response"
+      #         fixed_response = {
+      #           content_type = "text/plain"
+      #           message_body = "Not implemented"
+      #           status_code  = "501"
+      #         }
+      #       }
 
-    #       rules = {
-    #         pp-onr-web-1-a = {
-    #           priority = 4580
+      #       rules = {
+      #         pp-onr-web-1-a = {
+      #           priority = 4580
 
-    #           actions = [{
-    #             type              = "forward"
-    #             target_group_name = "pp-onr-web-1-a"
-    #           }]
+      #           actions = [{
+      #             type              = "forward"
+      #             target_group_name = "pp-onr-web-1-a"
+      #           }]
 
-    #           conditions = [{
-    #             host_header = {
-    #               values = [
-    #                 "pp-onr-web-1-a.oasys-national-reporting.hmpps-preproduction.modernisation-platform.service.justice.gov.uk",
-    #               ]
-    #             }
-    #           }]
-    #         }
-    #       }
-    #     }
-    #   }
-    # }
+      #           conditions = [{
+      #             host_header = {
+      #               values = [
+      #                 "pp-onr-web-1-a.oasys-national-reporting.hmpps-preproduction.modernisation-platform.service.justice.gov.uk",
+      #               ]
+      #             }
+      #           }]
+      #         }
+      #       }
+      #     }
+      #   }
+      # }
     } # end of lbs
 
     route53_zones = {
diff --git a/terraform/environments/ppud/alb_external.tf b/terraform/environments/ppud/alb_external.tf
index fd84c843cbb..e9a9ff7d401 100644
--- a/terraform/environments/ppud/alb_external.tf
+++ b/terraform/environments/ppud/alb_external.tf
@@ -8,11 +8,11 @@ resource "aws_lb" "PPUD-ALB" {
   load_balancer_type = "application"
   security_groups    = [aws_security_group.PPUD-ALB.id]
   subnets            = [data.aws_subnet.public_subnets_b.id, data.aws_subnet.public_subnets_c.id]
-#   access_logs {
-#    bucket  = aws_s3_bucket.moj-log-files-dev[0].id
-#    prefix  = "alb-logs"
-#    enabled = true
-#   }
+  #   access_logs {
+  #    bucket  = aws_s3_bucket.moj-log-files-dev[0].id
+  #    prefix  = "alb-logs"
+  #    enabled = true
+  #   }
 
   enable_deletion_protection = true
   drop_invalid_header_fields = true
diff --git a/terraform/environments/ppud/cloudwatch_alarms_windows.tf b/terraform/environments/ppud/cloudwatch_alarms_windows.tf
index 7e80d612c97..7e03d62b9b1 100644
--- a/terraform/environments/ppud/cloudwatch_alarms_windows.tf
+++ b/terraform/environments/ppud/cloudwatch_alarms_windows.tf
@@ -428,7 +428,7 @@ resource "aws_cloudwatch_metric_alarm" "malware-event-signature-update-failed" {
   alarm_description   = "Monitors for windows defender malware signature update failed events"
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance = each.key
+    Instance               = each.key
     MalwareSignatureFailed = "MalwareSignatureFailed"
   }
 }
@@ -450,7 +450,7 @@ resource "aws_cloudwatch_metric_alarm" "malware-event-state-detected" {
   alarm_description   = "Monitors for windows defender malware state detected events"
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance = each.key
+    Instance             = each.key
     MalwareStateDetected = "MalwareStateDetected"
   }
 }
@@ -472,7 +472,7 @@ resource "aws_cloudwatch_metric_alarm" "malware-event-scan-failed" {
   alarm_description   = "Monitors for windows defender malware scan failed events"
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance = each.key
+    Instance          = each.key
     MalwareScanFailed = "MalwareScanFailed"
   }
 }
@@ -494,7 +494,7 @@ resource "aws_cloudwatch_metric_alarm" "malware-event-engine-update-failed" {
   alarm_description   = "Monitors for windows defender malware engine update events"
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance = each.key
+    Instance            = each.key
     MalwareEngineFailed = "MalwareEngineFailed"
   }
 }
@@ -516,7 +516,7 @@ resource "aws_cloudwatch_metric_alarm" "malware-event-engine-out-of-date" {
   alarm_description   = "Monitors for windows defender malware engine out of date events"
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance = each.key
+    Instance               = each.key
     MalwareEngineOutofDate = "MalwareEngineOutofDate"
   }
 }
@@ -538,7 +538,7 @@ resource "aws_cloudwatch_metric_alarm" "malware-event-behavior-detected" {
   alarm_description   = "Monitors for windows defender malware behavior detected events"
   alarm_actions       = [aws_sns_topic.cw_alerts[0].arn]
   dimensions = {
-    Instance = each.key
+    Instance                = each.key
     MalwareBehaviorDetected = "MalwareBehaviorDetected"
   }
 }
\ No newline at end of file
diff --git a/terraform/environments/ppud/s3.tf b/terraform/environments/ppud/s3.tf
index e0a6661e884..12aa86f0513 100644
--- a/terraform/environments/ppud/s3.tf
+++ b/terraform/environments/ppud/s3.tf
@@ -408,23 +408,23 @@ resource "aws_s3_bucket_lifecycle_configuration" "moj-log-files-prod" {
   count  = local.is-production == true ? 1 : 0
   bucket = aws_s3_bucket.moj-log-files-prod[0].id
   rule {
-      id     = "Move-to-IA-then-delete-moj-log-files-prod"
-      status = "Enabled"
-      abort_incomplete_multipart_upload {
+    id     = "Move-to-IA-then-delete-moj-log-files-prod"
+    status = "Enabled"
+    abort_incomplete_multipart_upload {
       days_after_initiation = 7
-      }
-      noncurrent_version_transition {
-        noncurrent_days = 30
-        storage_class   = "STANDARD_IA"
-      }
-      transition {
-        days          = 30
-        storage_class = "STANDARD_IA"
-      }
-      expiration {
-        days = 365
-      }
     }
+    noncurrent_version_transition {
+      noncurrent_days = 30
+      storage_class   = "STANDARD_IA"
+    }
+    transition {
+      days          = 30
+      storage_class = "STANDARD_IA"
+    }
+    expiration {
+      days = 365
+    }
+  }
 }
 
 resource "aws_s3_bucket_policy" "moj-log-files-prod" {
@@ -583,23 +583,23 @@ resource "aws_s3_bucket_lifecycle_configuration" "moj-log-files-uat" {
   count  = local.is-preproduction == true ? 1 : 0
   bucket = aws_s3_bucket.moj-log-files-uat[0].id
   rule {
-      id     = "Move-to-IA-then-delete-moj-log-files-uat"
-      status = "Enabled"
-      abort_incomplete_multipart_upload {
+    id     = "Move-to-IA-then-delete-moj-log-files-uat"
+    status = "Enabled"
+    abort_incomplete_multipart_upload {
       days_after_initiation = 7
-      }
-      noncurrent_version_transition {
-        noncurrent_days = 30
-        storage_class   = "STANDARD_IA"
-      }
-      transition {
-        days          = 30
-        storage_class = "STANDARD_IA"
-      }
-      expiration {
-        days = 365
-      }
     }
+    noncurrent_version_transition {
+      noncurrent_days = 30
+      storage_class   = "STANDARD_IA"
+    }
+    transition {
+      days          = 30
+      storage_class = "STANDARD_IA"
+    }
+    expiration {
+      days = 365
+    }
+  }
 }
 
 resource "aws_s3_bucket_policy" "moj-log-files-uat" {
@@ -703,7 +703,7 @@ resource "aws_s3_bucket_policy" "moj-log-files-uat" {
           Service = "elasticloadbalancing.amazonaws.com"
         }
       }
-     ]
+    ]
   })
 }
 
@@ -745,23 +745,23 @@ resource "aws_s3_bucket_lifecycle_configuration" "moj-log-files-dev" {
   count  = local.is-development == true ? 1 : 0
   bucket = aws_s3_bucket.moj-log-files-dev[0].id
   rule {
-      id     = "Move-to-IA-then-delete-moj-log-files-dev"
-      status = "Enabled"
-      abort_incomplete_multipart_upload {
+    id     = "Move-to-IA-then-delete-moj-log-files-dev"
+    status = "Enabled"
+    abort_incomplete_multipart_upload {
       days_after_initiation = 7
-      }
-      noncurrent_version_transition {
-        noncurrent_days = 30
-        storage_class   = "STANDARD_IA"
-      }
-      transition {
-        days          = 30
-        storage_class = "STANDARD_IA"
-      }
-      expiration {
-        days = 365
-      }
     }
+    noncurrent_version_transition {
+      noncurrent_days = 30
+      storage_class   = "STANDARD_IA"
+    }
+    transition {
+      days          = 30
+      storage_class = "STANDARD_IA"
+    }
+    expiration {
+      days = 365
+    }
+  }
 }
 
 resource "aws_s3_bucket_policy" "moj-log-files-dev" {
diff --git a/terraform/environments/ppud/sns.tf b/terraform/environments/ppud/sns.tf
index 5d72bd373ff..b20363fd3e4 100644
--- a/terraform/environments/ppud/sns.tf
+++ b/terraform/environments/ppud/sns.tf
@@ -47,53 +47,53 @@ resource "aws_sns_topic_subscription" "cw_uat_subscription" {
 }
 
 resource "aws_sns_topic_policy" "sns_uat_policy" {
-  count  = local.is-preproduction == true ? 1 : 0
-  arn    = aws_sns_topic.cw_uat_alerts[0].arn
+  count = local.is-preproduction == true ? 1 : 0
+  arn   = aws_sns_topic.cw_uat_alerts[0].arn
 
   policy = jsonencode({
     Version = "2012-10-17",
     Statement = [
-       {
-      "Sid": "__default_statement_ID",
-      "Effect": "Allow",
-      "Principal": {
-        "AWS": "*"
-      },
-      "Action": [
-        "SNS:Publish",
-        "SNS:RemovePermission",
-        "SNS:SetTopicAttributes",
-        "SNS:DeleteTopic",
-        "SNS:ListSubscriptionsByTopic",
-        "SNS:GetTopicAttributes",
-        "SNS:Receive",
-        "SNS:AddPermission",
-        "SNS:Subscribe"
-      ],
-      "Resource": "aws_sns_topic.cw_uat_alerts[0].arn",
-      "Condition": {
-        "StringEquals": {
-         "AWS:SourceOwner": "data.aws_caller_identity.current.account_id"
+      {
+        "Sid" : "__default_statement_ID",
+        "Effect" : "Allow",
+        "Principal" : {
+          "AWS" : "*"
+        },
+        "Action" : [
+          "SNS:Publish",
+          "SNS:RemovePermission",
+          "SNS:SetTopicAttributes",
+          "SNS:DeleteTopic",
+          "SNS:ListSubscriptionsByTopic",
+          "SNS:GetTopicAttributes",
+          "SNS:Receive",
+          "SNS:AddPermission",
+          "SNS:Subscribe"
+        ],
+        "Resource" : "aws_sns_topic.cw_uat_alerts[0].arn",
+        "Condition" : {
+          "StringEquals" : {
+            "AWS:SourceOwner" : "data.aws_caller_identity.current.account_id"
+          }
         }
-      }
-    },
-    {
-      "Sid": "S3-to-Publish-SNS",
-      "Effect": "Allow",
-      "Principal": {
-          "Service": "s3.amazonaws.com"
+      },
+      {
+        "Sid" : "S3-to-Publish-SNS",
+        "Effect" : "Allow",
+        "Principal" : {
+          "Service" : "s3.amazonaws.com"
         },
-      "Action": "SNS:Publish",
-      "Resource": "aws_sns_topic.cw_uat_alerts[0].arn"
-      "Condition": {
-      "ArnLike": {
-        "aws:SourceArn": "arn:aws:s3:::moj-log-files-uat"
-       },
-      "StringEquals": {
-        "AWS:SourceAccount": "172753231260"
+        "Action" : "SNS:Publish",
+        "Resource" : "aws_sns_topic.cw_uat_alerts[0].arn"
+        "Condition" : {
+          "ArnLike" : {
+            "aws:SourceArn" : "arn:aws:s3:::moj-log-files-uat"
+          },
+          "StringEquals" : {
+            "AWS:SourceAccount" : "172753231260"
+          }
         }
       }
-      }
     ]
   })
 }
\ No newline at end of file