Merge gnm 2026 06 15 - merge latests GNM changes into BBC Images repo

.github/workflows/ci.yml

@@ -77,7 +77,7 @@ jobs:
           npm test
       - name: Image Embedder bundling
         run: ./scripts/embedder-deploy/build.sh
-      - uses: guardian/actions-riff-raff@v4.2.4
+      - uses: guardian/actions-riff-raff@v4.3.3
         if: "! github.event.pull_request.head.repo.fork"
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sbt-dependency-graph.yaml

@@ -19,7 +19,7 @@ jobs:
           java-version: 17
       - name: Install sbt
         id: sbt
-        uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14
+        uses: sbt/setup-sbt@4ed7b7ec4bfa2074fe48554c09e341267397247c # v1.2.0
       - name: Submit dependencies
         id: submit
         uses: scalacenter/sbt-dependency-submission@f43202114d7522a4b233e052f82c2eea8d658134 # v3.2.1

build.sbt

@@ -76,8 +76,8 @@ Global / concurrentRestrictions := Seq(
   Tags.limitAll(12)
 )
 
-val awsSdkVersion = "1.12.470"
-val awsSdkV2Version = "2.42.25"
+val awsSdkVersion = "1.12.797"
+val awsSdkV2Version = "2.44.13"
 val elastic4sVersion = "8.19.1"
 val awsKclVersion = "3.4.3"
 val okHttpVersion = "3.12.1"

common-lib/src/main/scala/com/gu/mediaservice/lib/aws/SimpleSqsMessageConsumer.scala

@@ -16,7 +16,7 @@ class SimpleSqsMessageConsumer (queueUrl: String, config: CommonConfig) {
       new ReceiveMessageRequest(queueUrl)
         .withWaitTimeSeconds(20) // Wait for maximum duration (20s) as per doc recommendation: http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-long-polling.html
         .withMaxNumberOfMessages(1) // Pull 1 message at a time to avoid starvation
-        .withAttributeNames(attributeNames: _*)
+        .withMessageSystemAttributeNames(attributeNames: _*)
     ).getMessages.asScala.headOption
 
   def deleteMessage(message: SQSMessage): Unit =

common-lib/src/main/scala/com/gu/mediaservice/lib/config/CommonConfigWithElastic.scala

@@ -13,7 +13,8 @@ class CommonConfigWithElastic(resources: GridConfigResources) extends CommonConf
     ),
     url = string("es6.url"),
     shards = string("es6.shards").toInt,
-    replicas = string("es6.replicas").toInt
+    replicas = string("es6.replicas").toInt,
+    includeDenseVectorMappings = booleanOpt("es.includeDenseVectorMappings").getOrElse(true)
   )
 
   private val persistenceIdentifier = string("persistence.identifier")

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

@@ -37,6 +37,7 @@ trait ElasticSearchClient extends ElasticSearchExecutions with GridLogging {
 
   def shards: Int
   def replicas: Int
+  def includeDenseVectorMappings: Boolean
 
   lazy val client = {
     logger.info("Connecting to Elastic 8: " + url)
@@ -146,7 +147,7 @@ trait ElasticSearchClient extends ElasticSearchExecutions with GridLogging {
         "to remove the need for these: " + nonRecommendenedIndexSettingOverrides)
 
       createIndex(index).
-        mapping(Mappings.imageMapping).
+        mapping(Mappings.imageMapping(includeDenseVectorMappings)).
         analysis(IndexSettings.analysis).
         settings(nonRecommendenedIndexSettingOverrides).
         shards(shards).

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

@@ -1,3 +1,3 @@
 package com.gu.mediaservice.lib.elasticsearch
 
-case class ElasticSearchConfig(aliases: ElasticSearchAliases, url: String, shards: Int, replicas: Int)
+case class ElasticSearchConfig(aliases: ElasticSearchAliases, url: String, shards: Int, replicas: Int, includeDenseVectorMappings: Boolean = true)

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

@@ -8,7 +8,7 @@ import play.api.libs.json.{JsObject, Json}
 
 object Mappings {
 
-  val imageMapping: MappingDefinition = {
+  def imageMapping(includeDenseVectorMappings: Boolean = true): MappingDefinition = {
 
     // Non indexed fields stored as keywords can still participate in exists / has queries
     def filemetaDataStringsAsKeyword: DynamicTemplateRequest = {
@@ -75,8 +75,7 @@ object Mappings {
         leasesMapping("leases"),
         collectionMapping("collections"),
         esInfoMapping("esInfo"),
-        embeddingMapping("embedding"),
-      )
+      ) ++ (if (includeDenseVectorMappings) Seq(embeddingMapping("embedding")) else Seq.empty)
     )
   }
 

dev/oidc-provider/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:24
 
 WORKDIR /usr/src/app
 

dev/oidc-provider/app.js

@@ -2,7 +2,7 @@
 import { findAccountFunc } from "./find-account.js";
 import { makeProvider } from "./make-provider.js";
 // relative path to the users file within the localstack box ( to /etc/grid/users.json)
-import USER_JSON from "../../../etc/grid/users.json" assert { type: "json" };
+import USER_JSON from "../../../etc/grid/users.json" with { type: "json" };
 
 const { DOMAIN, EMAIL_DOMAIN, OIDC_CLIENT_ID, OIDC_CLIENT_SECRET } =
   process.env;