Chore: [AEA-6165] - remove code to make service search v2 calls (#2422)

## Summary

- 🤖 Operational or Infrastructure Change

### Details

- remove code to make service search v2 calls now that we've rolled v3
out in production

Author: tstephen-nhs

.trivyignore.yaml

@@ -15,3 +15,9 @@ vulnerabilities:
   - id: CVE-2026-26996
     statement: minimatch vulnerability accepted as risk
     expired_at: 2026-06-01
+  - id: CVE-2026-27903
+    statement: minimatch vulnerability accepted as risk
+    expired_at: 2026-06-01
+  - id: CVE-2026-27904
+    statement: minimatch vulnerability accepted as risk
+    expired_at: 2026-06-01

SAMtemplates/functions/main.yaml

@@ -21,7 +21,6 @@ Globals:
         SpineASIDARN: !ImportValue account-resources:SpineASID
         SpinePartyKeyARN: !ImportValue account-resources:SpinePartyKey
         SpineCAChainARN: !ImportValue account-resources:SpineCAChain
-        ServiceSearchApiKeyARN: !ImportValue account-resources:ServiceSearchApiKey
         ServiceSearch3ApiKeyARN: !Ref ServiceSearch3ApiKeyARN
     Layers:
       - !Sub arn:aws:lambda:${AWS::Region}:580247275435:layer:LambdaInsightsExtension:52

packages/common/testing/src/mockServiceSearchResponseBodyPharmacy2u.json

@@ -3,8 +3,13 @@
     "value": [
         {
             "@search.score": 12.937448,
-            "URL": "https://www.pharmacy2u.co.uk",
-            "OrganisationSubType": "DistanceSelling"
+            "OrganisationSubType": "DistanceSelling",
+            "Contacts": [
+                {
+                    "ContactMethodType": "Website",
+                    "ContactValue": "https://www.pharmacy2u.co.uk"
+                }
+            ]
         }
     ]
 }

packages/common/testing/src/mockServiceSearchResponseBodyPharmica.json

@@ -3,8 +3,13 @@
     "value": [
         {
             "@search.score": 13.098481,
-            "URL": "www.pharmica.co.uk",
-            "OrganisationSubType": "DistanceSelling"
+            "OrganisationSubType": "DistanceSelling",
+            "Contacts": [
+                {
+                    "ContactMethodType": "Website",
+                    "ContactValue": "www.pharmica.co.uk"
+                }
+            ]
         }
     ]
 }

packages/distanceSelling/tests/distanceSelling.test.ts

@@ -14,6 +14,7 @@ import {Logger} from "@aws-lambda-powertools/logger"
 const mock = new MockAdapter(axios)
 const mockBundleString = JSON.stringify(mockInteractionResponseBody)
 const dummyCorrelationId = "corr-id-123"
+const SERVICE_SEARCH_API_URL = "https://live/service-search-api/"
 
 describe("ServiceSearch tests", function () {
   const logger = new Logger({serviceName: "distanceSelling"})
@@ -204,7 +205,7 @@ describe("ServiceSearch tests", function () {
   })
 
   it("processOdsCodes uses returned value in telecom", async () => {
-    mock.onGet("https://live/service-search").reply(200, mockPharmacy2uResponse)
+    mock.onGet(SERVICE_SEARCH_API_URL).reply(200, mockPharmacy2uResponse)
     const distanceSelling = new DistanceSelling({}, logger)
     const searchsetBundle = JSON.parse(mockBundleString) as Bundle
 
@@ -250,7 +251,7 @@ describe("ServiceSearch tests", function () {
   })
 
   it("searchOdsCode adds item to cache when url returned by service search", async () => {
-    mock.onGet("https://live/service-search").reply(200, mockPharmacy2uResponse)
+    mock.onGet(SERVICE_SEARCH_API_URL).reply(200, mockPharmacy2uResponse)
     const servicesCache: ServicesCache = {}
     const distanceSelling = new DistanceSelling(servicesCache, logger)
     const searchsetBundle = JSON.parse(mockBundleString) as Bundle
@@ -267,7 +268,7 @@ describe("ServiceSearch tests", function () {
   })
 
   it("searchOdsCode adds empty item to cache when no url returned by service search", async () => {
-    mock.onGet("https://live/service-search").reply(200, {value: []})
+    mock.onGet(SERVICE_SEARCH_API_URL).reply(200, {"@odata.context": "", value: []})
     const servicesCache: ServicesCache = {}
     const distanceSelling = new DistanceSelling(servicesCache, logger)
     const searchsetBundle = JSON.parse(mockBundleString) as Bundle
@@ -284,7 +285,7 @@ describe("ServiceSearch tests", function () {
   })
 
   it("searchOdsCode does not add to cache when service search error", async () => {
-    mock.onGet("https://live/service-search").networkError()
+    mock.onGet(SERVICE_SEARCH_API_URL).networkError()
     const servicesCache: ServicesCache = {}
     const distanceSelling = new DistanceSelling(servicesCache, logger)
     const searchsetBundle = JSON.parse(mockBundleString) as Bundle

packages/serviceSearchClient/src/live-serviceSearch-client.ts

@@ -17,20 +17,11 @@ import {ServiceSearchClient} from "./serviceSearch-client"
 const SERVICE_SEARCH_TIMEOUT = 3000 // 3 seconds
 const DISTANCE_SELLING = "DistanceSelling"
 
-type Service = {
-  "URL": string
-  "OrganisationSubType": string
-}
-
 type Contact = {
   "ContactMethodType": string
   "ContactValue": string
 }
 
-export type ServiceSearchData = {
-  "value": Array<Service>
-}
-
 export type ServiceSearch3Data = {
   "@odata.context": string
   "value": Array<{
@@ -41,33 +32,21 @@ export type ServiceSearch3Data = {
 }
 
 export const SERVICE_SEARCH_BASE_QUERY_PARAMS = {
-  "api-version": 2,
+  "api-version": 3,
   "searchFields": "ODSCode",
-  "$filter": "OrganisationTypeId eq 'PHA' and OrganisationSubType eq 'DistanceSelling'",
-  "$select": "URL,OrganisationSubType",
+  "$filter": `OrganisationTypeId eq 'PHA' and OrganisationSubType eq '${DISTANCE_SELLING}'`,
+  "$select": "Contacts,OrganisationSubType",
   "$top": 1
 }
 
 export function getServiceSearchVersion(logger: Logger | null = null): number {
-  const endpoint = process.env.TargetServiceSearchServer || "service-search"
-  if (endpoint.toLowerCase().includes("api.service.nhs.uk")) {
-    logger?.info("Using service search v3 endpoint")
-    SERVICE_SEARCH_BASE_QUERY_PARAMS["api-version"] = 3
-    SERVICE_SEARCH_BASE_QUERY_PARAMS["$select"] = "Contacts,OrganisationSubType"
-    return 3
-  }
-  logger?.warn("Using service search v2 endpoint")
-  return 2
+  logger?.info("Service search v3 enabled")
+  return 3
 }
 
 export function getServiceSearchEndpoint(logger: Logger | null = null): string {
-  switch (getServiceSearchVersion(logger)) {
-    case 3:
-      return `https://${process.env.TargetServiceSearchServer}/service-search-api/`
-    case 2:
-    default:
-      return `https://${process.env.TargetServiceSearchServer}/service-search`
-  }
+  logger?.info("Using service search v3 endpoint")
+  return `https://${process.env.TargetServiceSearchServer}/service-search-api/`
 }
 
 export class LiveServiceSearchClient implements ServiceSearchClient {
@@ -76,7 +55,6 @@ export class LiveServiceSearchClient implements ServiceSearchClient {
   private readonly httpsAgent: Agent
   private readonly outboundHeaders: {
     "apikey"?: string,
-    "Subscription-Key"?: string,
     "x-request-id"?: string,
     "x-correlation-id"?: string
   }
@@ -85,7 +63,6 @@ export class LiveServiceSearchClient implements ServiceSearchClient {
     this.logger = logger
     this.logger.info("ServiceSearchClient configured",
       {
-        v2: process.env.ServiceSearchApiKey !== undefined,
         v3: process.env.ServiceSearch3ApiKey !== undefined
       })
     this.httpsAgent = new Agent({
@@ -149,15 +126,8 @@ export class LiveServiceSearchClient implements ServiceSearchClient {
       return Promise.reject(err)
     })
 
-    const version = getServiceSearchVersion(this.logger)
-    if (version === 3) {
-      this.outboundHeaders = {
-        "apikey": process.env.ServiceSearch3ApiKey
-      }
-    } else {
-      this.outboundHeaders = {
-        "Subscription-Key": process.env.ServiceSearchApiKey
-      }
+    this.outboundHeaders = {
+      "apikey": process.env.ServiceSearch3ApiKey
     }
   }
 
@@ -211,11 +181,7 @@ export class LiveServiceSearchClient implements ServiceSearchClient {
 
     this.logger.info(`received response from serviceSearch for ods code ${odsCode}`,
       {odsCode: odsCode, status: response.status, data: response.data})
-    if (apiVsn === 2) {
-      return this.handleV2Response(odsCode, response.data)
-    } else {
-      return this.handleV3Response(odsCode, response.data)
-    }
+    return this.handleV3Response(odsCode, response.data)
   }
 
   private getReusedSocket(request: unknown): boolean | undefined {
@@ -238,26 +204,8 @@ export class LiveServiceSearchClient implements ServiceSearchClient {
     return serviceUrl
   }
 
-  handleV2Response(odsCode: string, data: ServiceSearchData): URL | undefined {
-    const services = data.value
-    if (services.length === 0) {
-      return undefined
-    }
-
-    this.logger.info(`pharmacy with ods code ${odsCode} is of type ${DISTANCE_SELLING}`, {odsCode: odsCode})
-    const service = services[0]
-    const urlString = service["URL"]
-
-    if (urlString === null) {
-      this.logger.warn(`ods code ${odsCode} has no URL but is of type ${DISTANCE_SELLING}`, {odsCode: odsCode})
-      return undefined
-    }
-    const serviceUrl = handleUrl(urlString, odsCode, this.logger)
-    return serviceUrl
-  }
-
   stripApiKeyFromHeaders(error: AxiosError) {
-    const headerKeys = ["subscription-key", "apikey"]
+    const headerKeys = ["apikey"]
     headerKeys.forEach((key) => {
       if (error.response?.headers?.[key]) {
         delete error.response.headers[key]