From c2c78a83ef3732e21b4f91c688559234cb09a778 Mon Sep 17 00:00:00 2001 From: modernisation-platform-ci Date: Mon, 18 Nov 2024 05:10:33 +0000 Subject: [PATCH] Updates from GitHub Actions Format Code workflow --- .../digital-prison-reporting/cloudtrail.tf | 2 +- .../modules/domains/ingestion-pipeline/pipeline.tf | 4 ++-- .../modules/domains/maintenance-pipeline/pipeline.tf | 2 +- .../modules/domains/reload-pipeline/pipeline.tf | 10 +++++----- .../modules/domains/replay-pipeline/pipeline.tf | 6 +++--- .../electronic-monitoring-data/ap_airflow_iam.tf | 2 +- .../modules/landing_bucket/main.tf | 6 +++--- .../environments/electronic-monitoring-data/s3.tf | 4 ++-- terraform/environments/ppud/iam.tf | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/terraform/environments/digital-prison-reporting/cloudtrail.tf b/terraform/environments/digital-prison-reporting/cloudtrail.tf index bb1889b9122..08a22cd364e 100644 --- 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/terraform/environments/digital-prison-reporting/modules/domains/ingestion-pipeline/pipeline.tf b/terraform/environments/digital-prison-reporting/modules/domains/ingestion-pipeline/pipeline.tf index 9bd7ee262ea..12c44bbf026 100644 --- a/terraform/environments/digital-prison-reporting/modules/domains/ingestion-pipeline/pipeline.tf +++ b/terraform/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/terraform/environments/digital-prison-reporting/modules/domains/maintenance-pipeline/pipeline.tf b/terraform/environments/digital-prison-reporting/modules/domains/maintenance-pipeline/pipeline.tf index c4b0b577f56..4281d701e6f 100644 --- a/terraform/environments/digital-prison-reporting/modules/domains/maintenance-pipeline/pipeline.tf +++ b/terraform/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 index 7ef9bd52c4f..0c08a0b111b 100644 --- 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 index 9d35ca65005..ea6f367fa08 100644 --- 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 index 2e784fc55c6..46796740c63 100644 --- 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 index 54231a132b0..3c5c67d8f07 100644 --- 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 index c68dba4167d..8de10c7fa24 100644 --- 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 index c0d5b92848f..303a03e63e7 100644 --- 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 ] - } + } } ####################################################