@defra-fish/connectors-lib 1.61.0-rc.16 → 1.61.0-rc.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/connectors-lib",
-  "version": "1.61.0-rc.16",
+  "version": "1.61.0-rc.18",
   "description": "Shared connectors",
   "type": "module",
   "engines": {
@@ -46,5 +46,5 @@
     "node-fetch": "^2.7.0",
     "redlock": "^4.2.0"
   },
-  "gitHead": "a4d24d55c8279ed8fad6436a48312f8542adfada"
+  "gitHead": "e6a140250c115a25e37da3f1639e83df2e6ca886"
 }

package/src/__tests__/aws.spec.js

@@ -21,13 +21,38 @@ describe('AWS Special cases', () => {
       })
     )
   })
+
+  it('exports ListObjectsV2Command from S3 SDK', () => {
+    const { ListObjectsV2Command } = AWS()
+    expect(ListObjectsV2Command).toBeDefined()
+  })
+
+  describe('AWS connectors for S3Client', () => {
+    it('has region set to eu-west-2', async () => {
+      const { s3 } = AWS()
+      const region = await s3.config.region()
+      expect(region).toBe('eu-west-2')
+    })
+
+    it('sets forcePathStyle to true when endpoint is defined', () => {
+      Config.aws.s3.endpoint = 'http://localhost:8080'
+      const { s3 } = AWS()
+      expect(s3.config.forcePathStyle).toBe(true)
+      delete Config.aws.s3.endpoint
+    })
+
+    it('does not set forcePathStyle when no endpoint is defined', () => {
+      const { s3 } = AWS()
+      expect(s3.config.forcePathStyle).not.toBe(true)
+    })
+  })
 })
 
 describe.each`
   name                | clientName            | configName          | expectedAPIVersion
   ${'ddb'}            | ${'DynamoDB'}         | ${''}               | ${'2012-08-10'}
   ${'sqs'}            | ${'SQS'}              | ${''}               | ${'2012-11-05'}
-  ${'s3'}             | ${'S3'}               | ${''}               | ${'2006-03-01'}
+  ${'s3'}             | ${'S3Client'}         | ${'s3'}             | ${'2006-03-01'}
   ${'secretsManager'} | ${'SecretsManager'}   | ${'secretsManager'} | ${'2017-10-17'}
   ${'docClient'}      | ${'DynamoDBDocument'} | ${'dynamodb'}       | ${'2012-08-10'}
 `('AWS connectors for $clientName', ({ name, clientName, configName, expectedAPIVersion }) => {

package/src/__tests__/sales-api-connector.spec.js

@@ -706,52 +706,4 @@ describe('sales-api-connector', () => {
       })
     })
   })
-
-  describe('linkRecurringPayments', () => {
-    describe.each([
-      ['existing-recurring-payment-id', 'agreement-id'],
-      ['abc-123', 'def-456']
-    ])("Processing payment for transaction id '%s'", (existingRecurringPaymentId, agreementId) => {
-      beforeEach(() => {
-        fetch.mockReturnValue({
-          ok: true,
-          status: 200,
-          statusText: 'OK',
-          text: async () => JSON.stringify({ existingRecurringPaymentId, agreementId })
-        })
-      })
-
-      it('calls the endpoint with the correct parameters', async () => {
-        await salesApi.linkRecurringPayments(existingRecurringPaymentId, agreementId)
-
-        expect(fetch).toHaveBeenCalledWith(`http://0.0.0.0:4000/linkRecurringPayments/${existingRecurringPaymentId}/${agreementId}`, {
-          method: 'get',
-          headers: expect.any(Object),
-          timeout: 20000
-        })
-      })
-
-      it('returns the expected response data', async () => {
-        const processedResult = await salesApi.linkRecurringPayments(existingRecurringPaymentId, agreementId)
-
-        expect(processedResult).toEqual({ existingRecurringPaymentId, agreementId })
-      })
-    })
-
-    it('throws an error on non-2xx response', async () => {
-      fetch.mockReturnValue({
-        ok: false,
-        status: 500,
-        statusText: 'Internal Server Error',
-        text: async () => 'Server Error'
-      })
-
-      await expect(salesApi.linkRecurringPayments('existing-recurring-payment-id', 'agreement-id')).rejects.toThrow('Internal Server Error')
-      expect(fetch).toHaveBeenCalledWith('http://0.0.0.0:4000/linkRecurringPayments/existing-recurring-payment-id/agreement-id', {
-        method: 'get',
-        headers: expect.any(Object),
-        timeout: 20000
-      })
-    })
-  })
 })

package/src/aws.js

@@ -2,7 +2,7 @@ import Config from './config.js'
 import { createDocumentClient } from './documentclient-decorator.js'
 import { DynamoDB } from '@aws-sdk/client-dynamodb'
 import { SQS } from '@aws-sdk/client-sqs'
-import { S3 } from '@aws-sdk/client-s3'
+import { S3Client, ListObjectsV2Command } from '@aws-sdk/client-s3'
 import { SecretsManager } from '@aws-sdk/client-secrets-manager'
 
 export default function () {
@@ -26,7 +26,8 @@ export default function () {
         endpoint: Config.aws.sqs.endpoint
       })
     }),
-    s3: new S3({
+    s3: new S3Client({
+      region: 'eu-west-2',
       apiVersion: '2006-03-01',
       ...(Config.aws.s3.endpoint && {
         endpoint: Config.aws.s3.endpoint,
@@ -38,6 +39,7 @@ export default function () {
       ...(Config.aws.secretsManager.endpoint && {
         endpoint: Config.aws.secretsManager.endpoint
       })
-    })
+    }),
+    ListObjectsV2Command
   }
 }

package/src/sales-api-connector.js

@@ -308,15 +308,3 @@ export const preparePermissionDataForRenewal = async referenceNumber =>
 export const processRPResult = async (transactionId, paymentId, createdDate) => {
   return exec2xxOrThrow(call(new URL(`/processRPResult/${transactionId}/${paymentId}/${createdDate}`, urlBase), 'get'))
 }
-
-/**
- * Link an old RecurringPayment to its replacement
- *
- * @param existingRecurringPaymentId
- * @param agreementId
- * @returns {Promise<*>}
- * @throws on a non-2xx response
- */
-export const linkRecurringPayments = async (existingRecurringPaymentId, agreementId) => {
-  return exec2xxOrThrow(call(new URL(`/linkRecurringPayments/${existingRecurringPaymentId}/${agreementId}`, urlBase), 'get'))
-}