Merge branch 'main' into jlk/delete-old-api-code

guardian · Jan 30, 2025 · dd35a9f · dd35a9f
2 parents e23bbda + 1ac9f20
commit dd35a9f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/common/app/common/configuration.scala b/common/app/common/configuration.scala
@@ -23,7 +23,7 @@ class BadConfigurationException(msg: String) extends RuntimeException(msg)
 
 object Environment extends GuLogging {
 
-  private[this] val installVars = {
+  private[this] val installVars: Map[String, String] = {
     val source = new File("/etc/gu/install_vars") match {
       case f if f.exists => IOUtils.toString(new FileInputStream(f), Charset.defaultCharset())
       case _             => ""
@@ -34,7 +34,17 @@ object Environment extends GuLogging {
 
   // Prefer env vars over install vars over default
   private[this] def get(name: String, default: String): String = {
-    sys.env.get(name.toUpperCase).orElse(installVars.get(name)).getOrElse(default)
+    sys.env.get(name.toUpperCase) match {
+      case Some(env) =>
+        log.info(s"Environment lookup: resolved $name from environment variable")
+        env
+      case _ if installVars.contains(name) =>
+        log.info(s"Environment lookup: resolved $name from install_vars")
+        installVars(name)
+      case _ =>
+        log.info(s"Environment lookup: resolved $name from default value")
+        default
+    }
   }
 
   val stack = get("stack", "frontend")

diff --git a/common/app/model/dotcomrendering/pageElements/TextCleaner.scala b/common/app/model/dotcomrendering/pageElements/TextCleaner.scala
@@ -17,7 +17,7 @@ object TextCleaner {
       val links = AffiliateLinksCleaner.getAffiliateableLinks(doc)
       links.foreach(el => {
         val id = affiliateLinksConfig.skimlinksId
-        el.attr("href", AffiliateLinksCleaner.linkToSkimLink(el.attr("href"), pageUrl, id))
+        el.attr("href", AffiliateLinksCleaner.linkToSkimLink(el.attr("href"), pageUrl, id)).attr("rel", "sponsored")
       })
 
       if (links.nonEmpty) {

diff --git a/common/app/views/support/HtmlCleaner.scala b/common/app/views/support/HtmlCleaner.scala
@@ -895,14 +895,18 @@ object AffiliateLinksCleaner {
       skimlinksId: String,
   ): Document = {
     val linksToReplace: mutable.Seq[Element] = getAffiliateableLinks(html)
-    linksToReplace.foreach { el => el.attr("href", linkToSkimLink(el.attr("href"), pageUrl, skimlinksId)) }
+    linksToReplace.foreach { el =>
+      el.attr("href", linkToSkimLink(el.attr("href"), pageUrl, skimlinksId)).attr("rel", "sponsored")
+    }
     html
   }
 
   def replaceLinksInElement(html: String, pageUrl: String): TextBlockElement = {
     val doc = Jsoup.parseBodyFragment(html)
     val linksToReplace: mutable.Seq[Element] = getAffiliateableLinks(doc)
-    linksToReplace.foreach { el => el.attr("href", linkToSkimLink(el.attr("href"), pageUrl, skimlinksId)) }
+    linksToReplace.foreach { el =>
+      el.attr("href", linkToSkimLink(el.attr("href"), pageUrl, skimlinksId)).attr("rel", "sponsored")
+    }
 
     if (linksToReplace.nonEmpty) {
       TextBlockElement(doc.body().html())

diff --git a/dev-build/app/AppLoader.scala b/dev-build/app/AppLoader.scala
@@ -103,6 +103,7 @@ trait AppComponents
       wire[StocksDataLifecycle],
       wire[NewsletterSignupLifecycle],
       wire[MostViewedLifecycle],
+      wire[SkimLinksCacheLifeCycle],
     )
 
   override lazy val httpFilters = wire[DevFilters].filters