Merge pull request #272 from bbc/gnm-rebase-20251008

Gnm rebase 20251008

Author: AndyKilmory

.github/workflows/ci.yml

@@ -72,7 +72,7 @@ jobs:
           npm install-clean
           npm test
           npm run build
-      - uses: guardian/actions-riff-raff@v4.1.7
+      - uses: guardian/actions-riff-raff@v4.2.3
         if: "! github.event.pull_request.head.repo.fork"
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}

build.sbt

@@ -40,7 +40,7 @@ val commonSettings = Seq(
     "org.mockito" % "mockito-core" % "2.18.0" % Test,
     "org.scalamock" %% "scalamock" % "5.1.0" % Test,
   ),
-  dependencyOverrides += "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.17.2",
+  dependencyOverrides += "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.19.0",
 
   Compile / doc / sources := Seq.empty,
   Compile / packageDoc / publishArtifact := false
@@ -64,7 +64,7 @@ Global / concurrentRestrictions := Seq(
 
 val awsSdkVersion = "1.12.470"
 val awsSdkV2Version = "2.31.12"
-val elastic4sVersion = "8.3.0"
+val elastic4sVersion = "8.18.2"
 val okHttpVersion = "3.12.1"
 
 val bbcBuildProcess: Boolean = System.getenv().asScala.get("BUILD_ORG").contains("bbc")
@@ -88,9 +88,9 @@ lazy val commonLib = project("common-lib").settings(
     "com.amazonaws" % "aws-java-sdk-sts" % awsSdkVersion,
     "com.amazonaws" % "aws-java-sdk-dynamodb" % awsSdkVersion,
     "com.amazonaws" % "aws-java-sdk-kinesis" % awsSdkVersion,
-    "com.sksamuel.elastic4s" %% "elastic4s-core" % elastic4sVersion,
-    "com.sksamuel.elastic4s" %% "elastic4s-client-esjava" % elastic4sVersion,
-    "com.sksamuel.elastic4s" %% "elastic4s-domain" % elastic4sVersion,
+    "nl.gn0s1s" %% "elastic4s-core" % elastic4sVersion,
+    "nl.gn0s1s" %% "elastic4s-client-esjava" % elastic4sVersion,
+    "nl.gn0s1s" %% "elastic4s-domain" % elastic4sVersion,
     "com.gu" %% "thrift-serializer" % "5.0.2",
     "org.scalaz" %% "scalaz-core" % "7.3.8",
     "org.im4java" % "im4java" % "1.4.0",

common-lib/src/main/resources/application.conf

@@ -17,6 +17,8 @@ play {
   assets.defaultCache="public, max-age=60"
 }
 
+pekko.http.server.parsing.error-handler = "com.gu.mediaservice.lib.play.UnknownMethodParsingErrorHandler$"
+
 es {
   cluster: media-service
   port: 9300

common-lib/src/main/scala/com/gu/mediaservice/lib/elasticsearch/ElasticSearchExecutions.scala

@@ -21,13 +21,13 @@ trait ElasticSearchExecutions extends GridLogging {
 
     val result = client.execute(request).transform {
       case Success(r) =>
-        r.isSuccess match {
-          case true => Success(r)
-          case false => r.status match {
-            case 404 if notFoundSuccessful => {
-                   logger.warn(s"No image found for $message.")
-                   Success(r)
-            }
+        if (r.isSuccess) {
+          Success(r)
+        } else {
+          r.status match {
+            case 404 if notFoundSuccessful =>
+              logger.warn(logMarkers, s"No image found for $message.")
+              Success(r)
             case 404 => Failure(ElasticNotFoundException)
             case _ => Failure(ElasticSearchException(r.error))
           }

image-loader/app/lib/UploadStatusTable.scala

@@ -26,7 +26,7 @@ class UploadStatusTable(config: ImageLoaderConfig) {
 
   def updateStatus(imageId: String, updateRequest: UploadStatus) = {
     val updateExpression = updateRequest.errorMessage match {
-      case Some(error) => set("status", updateRequest.status) and set("errorMessages", error)
+      case Some(error) => set("status", updateRequest.status) and set("errorMessage", error)
       case None => set("status", updateRequest.status)
     }
     val uploadStatusTableWithCondition =

kahuna/app/controllers/KahunaController.scala

@@ -3,7 +3,7 @@ package controllers
 import com.gu.mediaservice.lib.argo.ArgoHelpers
 import com.gu.mediaservice.lib.auth.Authentication.Principal
 import com.gu.mediaservice.lib.auth.{Authentication, Authorisation, BaseControllerWithLoginRedirects}
-import lib.{ExampleSwitch, FeatureSwitches, KahunaConfig}
+import lib.{ExampleSwitch, UseCqlChips, FeatureSwitches, KahunaConfig}
 import play.api.mvc.ControllerComponents
 import play.api.libs.json._
 
@@ -38,7 +38,7 @@ class KahunaController(
 
     val isIFramed = request.headers.get("Sec-Fetch-Dest").contains("iframe")
     val featureSwitches = new FeatureSwitches(
-      List(ExampleSwitch)
+      List(ExampleSwitch, UseCqlChips)
     )
     val featureSwitchesWithClientValues = featureSwitches.getClientSwitchValues(featureSwitches.getFeatureSwitchCookies(request.cookies.get))
     val featureSwitchesJson = Json.stringify(Json.toJson(featureSwitches.getFeatureSwitchesToStringify(featureSwitchesWithClientValues)))

kahuna/app/lib/FeatureSwitch.scala

@@ -10,6 +10,12 @@ object ExampleSwitch extends FeatureSwitch(
   default = false
 )
 
+object UseCqlChips extends FeatureSwitch(
+  key = "use-cql-chips",
+  title = "Use CQL for the chips interface",
+  default = false
+)
+
 class FeatureSwitches(featureSwitches: List[FeatureSwitch]){
   // Feature switches are defined here, but updated by setting a cookie following the pattern e.g. "feature-switch-my-key"
   // for a switch called "my-key".