Merge pull request #8694 from ministryofjustice/date_2024_11_18

GitHub Actions Code Formatter workflow
ministryofjustice · Nov 18, 2024 · 89b4b48 · 89b4b48
2 parents ac7a3e6 + c2c78a8
commit 89b4b48
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/terraform/environments/digital-prison-reporting/cloudtrail.tf b/terraform/environments/digital-prison-reporting/cloudtrail.tf
@@ -13,7 +13,7 @@ resource "aws_cloudtrail" "trail" {
   include_global_service_events = true
   enable_log_file_validation    = true
 
-  kms_key_id                    = aws_kms_key.cloudtrail.key_id   # Get KEY ID from Resource
+  kms_key_id = aws_kms_key.cloudtrail.key_id # Get KEY ID from Resource
 
 
   event_selector {

diff --git a/...form/environments/digital-prison-reporting/modules/domains/ingestion-pipeline/pipeline.tf b/...form/environments/digital-prison-reporting/modules/domains/ingestion-pipeline/pipeline.tf
@@ -104,7 +104,7 @@ module "data_ingestion_pipeline" {
               "--dpr.file.transfer.destination.bucket" : var.s3_temp_reload_bucket_id,
               "--dpr.file.transfer.retention.period.amount" : "0",
               "--dpr.file.transfer.delete.copied.files" : "false",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis),
               "--dpr.config.s3.bucket" : var.s3_glue_bucket_id,
@@ -194,7 +194,7 @@ module "data_ingestion_pipeline" {
               "--dpr.file.transfer.destination.bucket" : var.s3_raw_archive_bucket_id,
               "--dpr.file.transfer.retention.period.amount" : "0",
               "--dpr.file.transfer.delete.copied.files" : "true",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis),
               "--dpr.config.s3.bucket" : var.s3_glue_bucket_id,

diff --git a/...rm/environments/digital-prison-reporting/modules/domains/maintenance-pipeline/pipeline.tf b/...rm/environments/digital-prison-reporting/modules/domains/maintenance-pipeline/pipeline.tf
@@ -31,7 +31,7 @@ module "maintenance_pipeline" {
             "JobName" : var.glue_unprocessed_raw_files_check_job,
             "Arguments" : {
               "--dpr.orchestration.wait.interval.seconds" : "60",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis)
             }

diff --git a/terraform/environments/digital-prison-reporting/modules/domains/reload-pipeline/pipeline.tf b/terraform/environments/digital-prison-reporting/modules/domains/reload-pipeline/pipeline.tf
@@ -78,7 +78,7 @@ module "reload_pipeline" {
               "--dpr.file.transfer.source.bucket" : var.s3_raw_bucket_id,
               "--dpr.file.transfer.destination.bucket" : var.s3_raw_archive_bucket_id,
               "--dpr.file.transfer.delete.copied.files" : "true",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis),
               "--dpr.config.s3.bucket" : var.s3_glue_bucket_id,
@@ -121,7 +121,7 @@ module "reload_pipeline" {
               "--dpr.file.transfer.destination.bucket" : var.s3_temp_reload_bucket_id,
               "--dpr.file.transfer.retention.period.amount" : "0",
               "--dpr.file.transfer.delete.copied.files" : "false",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis),
               "--dpr.config.s3.bucket" : var.s3_glue_bucket_id,
@@ -233,7 +233,7 @@ module "reload_pipeline" {
               "--dpr.file.transfer.destination.bucket" : var.s3_raw_archive_bucket_id,
               "--dpr.file.transfer.retention.period.amount" : "0",
               "--dpr.file.transfer.delete.copied.files" : "true",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis),
               "--dpr.config.s3.bucket" : var.s3_glue_bucket_id,
@@ -253,7 +253,7 @@ module "reload_pipeline" {
               "--dpr.file.transfer.destination.bucket" : var.s3_raw_archive_bucket_id,
               "--dpr.file.transfer.retention.period.amount" : "0",
               "--dpr.file.transfer.delete.copied.files" : "true",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis),
               "--dpr.config.s3.bucket" : var.s3_glue_bucket_id,
@@ -273,7 +273,7 @@ module "reload_pipeline" {
               "--dpr.file.transfer.destination.bucket" : var.s3_raw_archive_bucket_id,
               "--dpr.file.transfer.retention.period.amount" : "0",
               "--dpr.file.transfer.delete.copied.files" : "true",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis),
               "--dpr.config.s3.bucket" : var.s3_glue_bucket_id,

diff --git a/terraform/environments/digital-prison-reporting/modules/domains/replay-pipeline/pipeline.tf b/terraform/environments/digital-prison-reporting/modules/domains/replay-pipeline/pipeline.tf
@@ -89,7 +89,7 @@ module "replay_pipeline" {
               "--dpr.file.transfer.source.bucket" : var.s3_curated_bucket_id,
               "--dpr.file.transfer.destination.bucket" : var.s3_temp_reload_bucket_id,
               "--dpr.file.transfer.delete.copied.files" : "false",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis),
               "--dpr.config.s3.bucket" : var.s3_glue_bucket_id,
@@ -131,7 +131,7 @@ module "replay_pipeline" {
               "--dpr.file.transfer.source.bucket" : var.s3_raw_bucket_id,
               "--dpr.file.transfer.destination.bucket" : var.s3_raw_archive_bucket_id,
               "--dpr.file.transfer.delete.copied.files" : "true",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis),
               "--dpr.config.s3.bucket" : var.s3_glue_bucket_id,
@@ -150,7 +150,7 @@ module "replay_pipeline" {
               "--dpr.file.transfer.destination.bucket" : var.s3_raw_bucket_id,
               "--dpr.file.transfer.retention.period.amount" : "0",
               "--dpr.file.transfer.delete.copied.files" : "false",
-              "--dpr.datastorage.retry.maxAttempts"   : tostring(var.glue_s3_max_attempts),
+              "--dpr.datastorage.retry.maxAttempts" : tostring(var.glue_s3_max_attempts),
               "--dpr.datastorage.retry.minWaitMillis" : tostring(var.glue_s3_retry_min_wait_millis),
               "--dpr.datastorage.retry.maxWaitMillis" : tostring(var.glue_s3_retry_max_wait_millis),
               "--dpr.config.s3.bucket" : var.s3_glue_bucket_id,

diff --git a/terraform/environments/electronic-monitoring-data/ap_airflow_iam.tf b/terraform/environments/electronic-monitoring-data/ap_airflow_iam.tf
@@ -21,7 +21,7 @@ module "test_ap_airflow" {
 module "load_alcohol_monitoring_database" {
   count  = local.is-production ? 1 : 0
   source = "./modules/ap_airflow_load_data_iam_role"
-  
+
   name               = "alcohol-monitoring"
   environment        = local.environment
   database_name      = "capita-alcohol-monitoring"

diff --git a/terraform/environments/electronic-monitoring-data/modules/landing_bucket/main.tf b/terraform/environments/electronic-monitoring-data/modules/landing_bucket/main.tf
@@ -57,8 +57,8 @@ module "this-bucket" {
   # Optionally add cross account access to bucket policy.
   bucket_policy_v2 = var.cross_account_access_role != null ? [
     {
-      sid     = "CrossAccountAccess"
-      effect  = "Allow"
+      sid    = "CrossAccountAccess"
+      effect = "Allow"
       actions = [
         "s3:PutObject",
         "s3:PutObjectAcl"
@@ -68,7 +68,7 @@ module "this-bucket" {
         type        = "AWS"
       }
     }
-    ] : []
+  ] : []
 
   tags = merge(
     var.local_tags,

diff --git a/terraform/environments/electronic-monitoring-data/s3.tf b/terraform/environments/electronic-monitoring-data/s3.tf
@@ -5,11 +5,11 @@ locals {
     "production" = null
     "preproduction" = {
       "account_number" = 173142358744
-      "role_name" = "juniper-dt-lambda-role"
+      "role_name"      = "juniper-dt-lambda-role"
     }
     "test" = {
       "account_number" = 173142358744
-      role_name = "dev-dt-lambda-role"
+      role_name        = "dev-dt-lambda-role"
     }
     "development" = null
   }

diff --git a/terraform/environments/ppud/iam.tf b/terraform/environments/ppud/iam.tf
@@ -893,7 +893,7 @@ data "aws_iam_policy_document" "sns_topic_policy_ec2cw" {
     resources = [
       aws_sns_topic.cw_alerts[0].arn
     ]
-   } 
+  }
 }
 
 ####################################################
-Original file line number
+Diff line change
@@ Expand Up / @@ -893,7 +893,7 @@ data "aws_iam_policy_document" "sns_topic_policy_ec2cw" { @@
         resources = [
           aws_sns_topic.cw_alerts[0].arn
         ]
-       }
+      }
     }
     ####################################################
@@ Expand Down @@