dont need lifecycle for parameter store

guardian · Dec 3, 2024 · 0088f55 · 0088f55
1 parent 0361b2e
commit 0088f55
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 70 deletions.
diff --git a/article/app/AppLoader.scala b/article/app/AppLoader.scala
@@ -4,7 +4,6 @@ import app.{FrontendApplicationLoader, FrontendBuildInfo, FrontendComponents}
 import com.softwaremill.macwire._
 import common._
 import common.dfp.DfpAgentLifecycle
-import common.commercial.CommercialBundleUrlLifecycle
 import concurrent.BlockingOperations
 import conf.{CachedHealthCheckLifeCycle, Configuration}
 import conf.switches.SwitchboardLifecycle
@@ -46,7 +45,6 @@ trait AppComponents extends FrontendComponents with ArticleControllers {
   override lazy val lifecycleComponents = List(
     wire[NewspaperBooksAndSectionsAutoRefresh],
     wire[DfpAgentLifecycle],
-    wire[CommercialBundleUrlLifecycle],
     wire[CloudWatchMetricsLifecycle],
     wire[SurgingContentAgentLifecycle],
     wire[SwitchboardLifecycle],

diff --git a/commercial/app/AppLoader.scala b/commercial/app/AppLoader.scala
@@ -9,7 +9,6 @@ import commercial.model.merchandise.jobs.{Industries, JobsAgent}
 import commercial.model.merchandise.travel.TravelOffersAgent
 import common.CloudWatchMetricsLifecycle
 import common.dfp.DfpAgentLifecycle
-import common.commercial.CommercialBundleUrlLifecycle
 import conf.switches.SwitchboardLifecycle
 import conf.CachedHealthCheckLifeCycle
 import contentapi.{CapiHttpClient, ContentApiClient, HttpClient}
@@ -56,7 +55,6 @@ trait AppComponents extends FrontendComponents with CommercialControllers with C
   override lazy val lifecycleComponents = List(
     wire[CommercialLifecycle],
     wire[DfpAgentLifecycle],
-    wire[CommercialBundleUrlLifecycle],
     wire[SwitchboardLifecycle],
     wire[CloudWatchMetricsLifecycle],
     wire[CachedHealthCheckLifeCycle],

diff --git a/common/app/common/CommercialBundle.scala b/common/app/common/CommercialBundle.scala
@@ -0,0 +1,29 @@
+package common
+
+import scala.concurrent.duration._
+import org.joda.time.Instant
+import conf.Configuration
+
+object CommercialBundle {
+  import GuardianConfiguration._
+
+  private var cachedBundlePath: String =
+    "test_commercial_bundles/" + configuration.getMandatoryStringProperty("commercial.bundlePath")
+  private var cachedTimestamp: Instant = Instant.now()
+  private val cacheDuration: FiniteDuration = 1.minute
+
+  private val assetHost = Configuration.assets.path
+
+  private def updateBundlePath(): Unit = {
+    cachedBundlePath = "test_commercial_bundles/" + configuration.getMandatoryStringProperty("commercial.bundlePath")
+    cachedTimestamp = Instant.now()
+  }
+
+  private def bundlePath: String = {
+    if (Instant.now().isAfter(cachedTimestamp.plus(cacheDuration.toMillis))) updateBundlePath()
+
+    cachedBundlePath
+  }
+
+  def getBundleUrl: String = s"$assetHost$bundlePath"
+}
diff --git a/common/app/common/commercial/CommercialBundleUrlAgent.scala b/common/app/common/commercial/CommercialBundleUrlAgent.scala
diff --git a/common/app/common/commercial/CommercialBundleUrlLifecycle.scala b/common/app/common/commercial/CommercialBundleUrlLifecycle.scala
diff --git a/common/app/views/support/JavaScriptPage.scala b/common/app/views/support/JavaScriptPage.scala
@@ -13,7 +13,7 @@ import model.IpsosTags.getScriptTag
 import model.dotcomrendering.DotcomRenderingUtils.assetURL
 import play.api.mvc.RequestHeader
 import views.support.Commercial.isAdFree
-import common.commercial.CommercialBundleUrlAgent
+import common.CommercialBundle
 
 object JavaScriptPage {
 
@@ -72,7 +72,7 @@ object JavaScriptPage {
     val ipsos = if (page.metadata.isFront) getScriptTag(page.metadata.id) else getScriptTag(page.metadata.sectionId)
 
     def commercialBundleUrl = JsString(
-      CommercialBundleUrlAgent.bundleUrl,
+      CommercialBundle.getBundleUrl,
     )
 
     javascriptConfig ++ config ++ commercialMetaData ++ journalismMetaData ++ Map(

diff --git a/dev-build/app/AppLoader.scala b/dev-build/app/AppLoader.scala
@@ -16,7 +16,6 @@ import cricket.conf.CricketLifecycle
 import cricket.controllers.CricketControllers
 import dev.DevAssetsController
 import dfp.DfpDataCacheLifecycle
-import common.commercial.CommercialBundleUrlLifecycle
 import feed._
 import football.controllers._
 import http.{CorsHttpErrorHandler, DevBuildParametersHttpRequestHandler, DevFilters}
@@ -91,7 +90,6 @@ trait AppComponents
       wire[OnwardJourneyLifecycle],
       wire[CommercialLifecycle],
       wire[DfpDataCacheLifecycle],
-      wire[CommercialBundleUrlLifecycle],
       wire[FaciaDfpAgentLifecycle],
       wire[ConfigAgentLifecycle],
       wire[SurgingContentAgentLifecycle],

diff --git a/facia/app/AppLoader.scala b/facia/app/AppLoader.scala
@@ -4,7 +4,6 @@ import app.{FrontendApplicationLoader, FrontendBuildInfo, FrontendComponents}
 import com.softwaremill.macwire._
 import common._
 import common.dfp.FaciaDfpAgentLifecycle
-import common.commercial.CommercialBundleUrlLifecycle
 import concurrent.BlockingOperations
 import conf.switches.SwitchboardLifecycle
 import conf.CachedHealthCheckLifeCycle
@@ -55,7 +54,6 @@ trait AppComponents extends FrontendComponents with FaciaControllers with FapiSe
     wire[ConfigAgentLifecycle],
     wire[CloudWatchMetricsLifecycle],
     wire[FaciaDfpAgentLifecycle],
-    wire[CommercialBundleUrlLifecycle],
     wire[SurgingContentAgentLifecycle],
     wire[IndexListingsLifecycle],
     wire[SwitchboardLifecycle],

diff --git a/preview/app/AppLoader.scala b/preview/app/AppLoader.scala
@@ -8,7 +8,6 @@ import commercial.CommercialLifecycle
 import commercial.controllers.CommercialControllers
 import commercial.targeting.TargetingLifecycle
 import common.dfp.FaciaDfpAgentLifecycle
-import common.commercial.CommercialBundleUrlLifecycle
 import common.{ApplicationMetrics, CloudWatchMetricsLifecycle, ContentApiMetrics, DCRMetrics}
 import conf.switches.SwitchboardLifecycle
 import conf.{CachedHealthCheckLifeCycle, FootballLifecycle}
@@ -54,7 +53,6 @@ trait PreviewLifecycleComponents
       wire[OnwardJourneyLifecycle],
       wire[ConfigAgentLifecycle],
       wire[FaciaDfpAgentLifecycle],
-      wire[CommercialBundleUrlLifecycle],
       wire[SwitchboardLifecycle],
       wire[FootballLifecycle],
       wire[CricketLifecycle],