From b8477ed471d9154179310120e8230c30e2fd63bd Mon Sep 17 00:00:00 2001
From: koladeadewuyi-moj <136330532+koladeadewuyi-moj@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:24:06 +0100
Subject: [PATCH] DPR2-713: Update transfer job args (#6715)

---
 .../application_variables.json                   | 16 ++++------------
 .../digital-prison-reporting/locals.tf           |  2 --
 .../modules/domains/ingestion-jobs/variables.tf  |  6 ------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/terraform/environments/digital-prison-reporting/application_variables.json b/terraform/environments/digital-prison-reporting/application_variables.json
index c69d117e4e2..234d4ada14d 100644
--- a/terraform/environments/digital-prison-reporting/application_variables.json
+++ b/terraform/environments/digital-prison-reporting/application_variables.json
@@ -94,10 +94,8 @@
       "enable_dms_replication_task": true,
       "enable_domain_builder_lambda": true,
       "enable_dbuilder_flyway_lambda": true,
-      "enable_s3_file_transfer_trigger": true,
-      "scheduled_s3_file_transfer_retention_period_amount": 2,
+      "scheduled_s3_file_transfer_retention_period_amount": 0,
       "scheduled_s3_file_transfer_retention_period_unit": "days",
-      "scheduled_s3_file_transfer_schedule": "cron(0 0/3 ? * * *)",
       "enable_domain_builder_rds": true,
       "enable_domain_builder_agent": true,
       "enable_cloud_trail": false,
@@ -285,10 +283,8 @@
       "enable_dms_replication_task": true,
       "enable_domain_builder_lambda": true,
       "enable_dbuilder_flyway_lambda": true,
-      "enable_s3_file_transfer_trigger": true,
-      "scheduled_s3_file_transfer_retention_period_amount": 2,
+      "scheduled_s3_file_transfer_retention_period_amount": 0,
       "scheduled_s3_file_transfer_retention_period_unit": "days",
-      "scheduled_s3_file_transfer_schedule": "cron(0 0/3 ? * * *)",
       "enable_domain_builder_rds": true,
       "enable_domain_builder_agent": true,
       "enable_cloud_trail": false,
@@ -476,10 +472,8 @@
       "enable_dms_replication_task": true,
       "enable_domain_builder_lambda": true,
       "enable_dbuilder_flyway_lambda": true,
-      "enable_s3_file_transfer_trigger": true,
-      "scheduled_s3_file_transfer_retention_period_amount": 2,
+      "scheduled_s3_file_transfer_retention_period_amount": 0,
       "scheduled_s3_file_transfer_retention_period_unit": "days",
-      "scheduled_s3_file_transfer_schedule": "cron(0 0/3 ? * * *)",
       "enable_domain_builder_rds": true,
       "enable_domain_builder_agent": true,
       "enable_cloud_trail": false,
@@ -669,10 +663,8 @@
       "enable_dms_replication_task": true,
       "enable_domain_builder_lambda": true,
       "enable_dbuilder_flyway_lambda": true,
-      "enable_s3_file_transfer_trigger": true,
-      "scheduled_s3_file_transfer_retention_period_amount": 2,
+      "scheduled_s3_file_transfer_retention_period_amount": 0,
       "scheduled_s3_file_transfer_retention_period_unit": "days",
-      "scheduled_s3_file_transfer_schedule": "cron(0 0/3 ? * * *)",
       "enable_domain_builder_rds": true,
       "enable_domain_builder_agent": true,
       "enable_cloud_trail": false,
diff --git a/terraform/environments/digital-prison-reporting/locals.tf b/terraform/environments/digital-prison-reporting/locals.tf
index b34a201f95c..494776772e7 100644
--- a/terraform/environments/digital-prison-reporting/locals.tf
+++ b/terraform/environments/digital-prison-reporting/locals.tf
@@ -242,8 +242,6 @@ locals {
   # s3 transfer
   scheduled_s3_file_transfer_retention_period_amount = local.application_data.accounts[local.environment].scheduled_s3_file_transfer_retention_period_amount
   scheduled_s3_file_transfer_retention_period_unit   = local.application_data.accounts[local.environment].scheduled_s3_file_transfer_retention_period_unit
-  scheduled_s3_file_transfer_schedule                = local.application_data.accounts[local.environment].scheduled_s3_file_transfer_schedule
-  enable_s3_file_transfer_trigger                    = local.application_data.accounts[local.environment].enable_s3_file_transfer_trigger
 
   # step function notification lambda
   step_function_notification_lambda_handler = "uk.gov.justice.digital.lambda.StepFunctionDMSNotificationLambda::handleRequest"
diff --git a/terraform/environments/digital-prison-reporting/modules/domains/ingestion-jobs/variables.tf b/terraform/environments/digital-prison-reporting/modules/domains/ingestion-jobs/variables.tf
index 7c04a6c551e..cf1937f6d56 100644
--- a/terraform/environments/digital-prison-reporting/modules/domains/ingestion-jobs/variables.tf
+++ b/terraform/environments/digital-prison-reporting/modules/domains/ingestion-jobs/variables.tf
@@ -269,12 +269,6 @@ variable "setup_unprocessed_raw_files_check_job" {
   default     = false
 }
 
-variable "glue_unprocessed_raw_files_check_job_schedule" {
-  description = "Cron schedule for the Unprocessed Raw Files Check job"
-  default     = "cron(0 0/3 ? * * *)"
-  type        = string
-}
-
 variable "glue_unprocessed_raw_files_check_job_name" {
   description = "Name of the Glue Unprocessed Raw Files Check Job"
   default     = ""