Merge pull request #26862 from guardian/facia-press-dev

Only require frontPressToolQueue and frontPressCronQueue if used
guardian · Jan 31, 2024 · a82bc67 · a82bc67
2 parents b7d32b1 + f9eef32
commit a82bc67
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/facia-press/app/frontpress/FrontPressCron.scala b/facia-press/app/frontpress/FrontPressCron.scala
@@ -23,13 +23,17 @@ class FrontPressCron(liveFapiFrontPress: LiveFapiFrontPress, toolPressQueueWorke
     }
   }
 
-  override val queue: JsonMessageQueue[SNSNotification] = (Configuration.faciatool.frontPressCronQueue map { queueUrl =>
-    val credentials = Configuration.aws.mandatoryCredentials
-
-    JsonMessageQueue[SNSNotification](
-      AmazonSQSAsyncClient.asyncBuilder.withCredentials(credentials).withRegion(conf.Configuration.aws.region).build(),
-      queueUrl,
-    )
+  override lazy val queue: JsonMessageQueue[SNSNotification] = (Configuration.faciatool.frontPressCronQueue map {
+    queueUrl =>
+      val credentials = Configuration.aws.mandatoryCredentials
+
+      JsonMessageQueue[SNSNotification](
+        AmazonSQSAsyncClient.asyncBuilder
+          .withCredentials(credentials)
+          .withRegion(conf.Configuration.aws.region)
+          .build(),
+        queueUrl,
+      )
   }) getOrElse {
     throw new RuntimeException("Required property 'frontpress.sqs.cron_queue_url' not set")
   }

diff --git a/facia-press/app/frontpress/JsonQueueWorker.scala b/facia-press/app/frontpress/JsonQueueWorker.scala
@@ -63,7 +63,7 @@ object JsonQueueWorker {
 abstract class JsonQueueWorker[A: Reads]()(implicit executionContext: ExecutionContext) extends GuLogging {
   import JsonQueueWorker._
 
-  val queue: JsonMessageQueue[A]
+  def queue: JsonMessageQueue[A]
   val deleteOnFailure: Boolean = false
 
   final private val lastSuccessfulReceipt = DateTimeRecorder()

diff --git a/facia-press/app/lifecycle/FaciaPressLifecycle.scala b/facia-press/app/lifecycle/FaciaPressLifecycle.scala
@@ -21,7 +21,9 @@ class FaciaPressLifecycle(
   }
 
   override def start(): Unit = {
-    toolPressQueueWorker.start()
+    if (Configuration.faciatool.frontPressToolQueue.isDefined) {
+      toolPressQueueWorker.start()
+    }
     if (Configuration.faciatool.frontPressCronQueue.isDefined) {
       frontPressCron.start()
     }