whoops merge

wellcomecollection · Nov 20, 2024 · a6005ee · a6005ee
1 parent 7bd28a6
commit a6005ee
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -47,7 +47,7 @@ module "toucher_lambda" {
   source = "./modules/toucher_lambda"
 
   environment = "production"
-  lambda_zip = data.archive_file.transfer_throttle_zip
+  lambda_zip = data.archive_file.toucher_zip
     providers = {
     aws: aws.digitisation
   }

diff --git a/terraform/modules/restorer_lambda/main.tf b/terraform/modules/restorer_lambda/main.tf
@@ -1,12 +1,7 @@
 locals {
   lambda_name = "editorial-photography-transfer-restorer"
-<<<<<<< HEAD
   lambda_timeout = 600
   input_queue_visibility_timeout = 1200
-=======
-  lambda_timeout = 60
-  input_queue_visibility_timeout = 120
->>>>>>> improve-report
   environment = "production"
   digitisation_account = "404315009621"
 }

diff --git a/terraform/modules/transfer_throttle/main.tf b/terraform/modules/transfer_throttle/main.tf
@@ -41,11 +41,7 @@ module "transfer_throttle_lambda" {
 module "transfer_scheduler" {
   source = "../lambda_scheduler"
   cron                 = "cron(30 7,9,11,13,15,16 ? * MON-FRI *)"
-<<<<<<< HEAD
-  description          = "Moves batches of shoots to the transferer at a rate Archivematica can handle"
-=======
-  description          = "Restore a batch of shoots in the evening so they are ready to be transferred in the morning"
->>>>>>> improve-report
+  description          = "Moves batches of shoots to the transferrer at a rate Archivematica can handle"
   lambda_arn           = module.transfer_throttle_lambda.lambda.arn
   lambda_function_name = module.transfer_throttle_lambda.lambda.function_name
   name                 = "transfer_throttle"