@defra-fish/connectors-lib 1.61.0-rc.17 → 1.61.0-rc.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/connectors-lib",
-  "version": "1.61.0-rc.17",
+  "version": "1.61.0-rc.19",
   "description": "Shared connectors",
   "type": "module",
   "engines": {
@@ -46,5 +46,5 @@
     "node-fetch": "^2.7.0",
     "redlock": "^4.2.0"
   },
-  "gitHead": "e35e018372742acfe0cb41e31abd14d3b0c7f742"
+  "gitHead": "74d6ad7d56ff5dd9ec7b5567b08d726352dd275a"
 }

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/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
   }
 }