@velocitycareerlabs/aws-clients 1.25.0-dev-build.103d7afd4 → 1.25.0-dev-build.1cf0e9e04

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/aws-clients",
-  "version": "1.25.0-dev-build.103d7afd4",
+  "version": "1.25.0-dev-build.1cf0e9e04",
   "description": "Set of aws functions and utils used by Velocity Foundation projects",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "main": "index.js",
@@ -29,8 +29,8 @@
     "twilio": "^5.0.0"
   },
   "devDependencies": {
-    "@velocitycareerlabs/crypto": "1.25.0-dev-build.103d7afd4",
-    "@velocitycareerlabs/jwt": "1.25.0-dev-build.103d7afd4",
+    "@velocitycareerlabs/crypto": "1.25.0-dev-build.1cf0e9e04",
+    "@velocitycareerlabs/jwt": "1.25.0-dev-build.1cf0e9e04",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "14.2.1",
     "eslint-config-prettier": "8.10.0",
@@ -43,5 +43,5 @@
     "jest": "29.7.0",
     "prettier": "2.8.8"
   },
-  "gitHead": "8b82d0eb01cc9e22f9c2ee4b3e1f097476424526"
+  "gitHead": "bceb4e5e24bc6215aed7b4aaa754e53c112dd73d"
 }

package/src/client-config.js

@@ -1,15 +1,23 @@
-const buildClientConfig = ({ apiVersion, awsRegion, awsEndpoint }) => ({
+const buildClientConfig = ({
+  apiVersion,
+  awsRegion,
+  awsEndpoint,
+  accessKeyId,
+  secretAccessKey,
+}) => ({
   apiVersion,
   region: awsRegion,
-  ...(awsEndpoint && awsEndpoint != '' ? {
-    credentials: {
-      accessKeyId: 'tests-key-id',
-      secretAccessKey: 'tests-key',
-    },
-    endpoint: awsEndpoint,
-  } : {}),
+  ...(awsEndpoint
+    ? {
+        credentials: {
+          accessKeyId: accessKeyId ?? 'tests-key-id',
+          secretAccessKey: secretAccessKey ?? 'tests-key',
+        },
+        endpoint: awsEndpoint,
+      }
+    : {}),
 });
 
 module.exports = {
   buildClientConfig,
-};
+};

package/src/document-storage.js

@@ -24,11 +24,13 @@ const { buildClientConfig } = require('./client-config');
 
 const createDynamoDbDocumentClient = ({ awsRegion, awsEndpoint }) =>
   DynamoDBDocumentClient.from(
-    new DynamoDB(buildClientConfig({
-      apiVersion: '2012-08-10',
-      awsRegion,
-      awsEndpoint,
-    }))
+    new DynamoDB(
+      buildClientConfig({
+        apiVersion: '2012-08-10',
+        awsRegion,
+        awsEndpoint,
+      })
+    )
   );
 
 const initReadDocument =

package/src/email-notifications.js

@@ -23,26 +23,27 @@ const {
   SESv2Client,
   SendEmailCommand: SESv2SendEmailCommand,
 } = require('@aws-sdk/client-sesv2');
+const { buildClientConfig } = require('./client-config');
 
 // 2020-10-20: At the moment free Localstack doesn't support SESv2,
 // so SES is used for testing when a value is passed for endpoint (local address)
 
 const createSesClient = ({ awsRegion, awsEndpoint }) =>
-  new SESClient({
-    apiVersion: '2010-12-01',
-    region: awsRegion,
-    credentials: {
-      accessKeyId: 'tests-key-id',
-      secretAccessKey: 'tests-key',
-    },
-    endpoint: awsEndpoint,
-  });
+  new SESClient(
+    buildClientConfig({
+      apiVersion: '2010-12-01',
+      awsRegion,
+      awsEndpoint,
+    })
+  );
 
 const createSesV2Client = ({ awsRegion }) =>
-  new SESv2Client({
-    apiVersion: '2019-09-27',
-    region: awsRegion,
-  });
+  new SESv2Client(
+    buildClientConfig({
+      apiVersion: '2019-09-27',
+      awsRegion,
+    })
+  );
 
 const initSendEmailNotification =
   ({ awsRegion, awsEndpoint }) =>

package/src/kms-client.js

@@ -19,18 +19,15 @@ const {
   EncryptCommand,
   DecryptCommand,
 } = require('@aws-sdk/client-kms');
+const { buildClientConfig } = require('./client-config');
 
 const initKmsClient = ({ awsRegion, awsEndpoint }) => {
-  const kmsClient = new KMSClient({
-    region: awsRegion,
-    credentials: awsEndpoint
-      ? {
-          accessKeyId: 'tests-key-id',
-          secretAccessKey: 'tests-key',
-        }
-      : awsEndpoint,
-    endpoint: awsEndpoint,
-  });
+  const kmsClient = new KMSClient(
+    buildClientConfig({
+      awsRegion,
+      awsEndpoint,
+    })
+  );
 
   const encrypt = async (keyId, plaintext) => {
     const command = new EncryptCommand({

package/src/s3-client.js

@@ -23,26 +23,27 @@ const {
 const {
   getSignedUrl: awsGetSignedUrl,
 } = require('@aws-sdk/s3-request-presigner');
+const { buildClientConfig } = require('./client-config');
 
 const initS3Client = ({
   awsRegion,
   awsEndpoint,
   s3Bucket,
-  s3PresignedUrlExpiration,
   accessKeyId,
   secretAccessKey,
+  s3PresignedUrlExpiration,
   isTest,
 }) => {
   const s3Client = new S3Client({
-    apiVersion: '2006-03-01',
-    region: awsRegion,
-    signatureVersion: 'v4',
-    credentials: {
+    ...buildClientConfig({
+      apiVersion: '2006-03-01',
+      awsRegion,
+      awsEndpoint,
       accessKeyId,
       secretAccessKey,
-    },
+    }),
     forcePathStyle: isTest,
-    endpoint: awsEndpoint,
+    signatureVersion: 'v4',
   });
 
   const getSignedUrl = async ({ key, contentType, metadata }) => {

package/src/sms-notifications.js

@@ -16,6 +16,7 @@
 const { startsWith } = require('lodash/fp');
 const { SNSClient, PublishCommand } = require('@aws-sdk/client-sns');
 const { createTwilioClient } = require('./twilio-factory');
+const { buildClientConfig } = require('./client-config');
 
 const singaporePhoneCode = '+65';
 
@@ -39,17 +40,13 @@ const initSendSmsNotification =
     onlyTwilioSms,
   }) =>
   async ({ message, phoneNumber, senderId }) => {
-    const awsSns = new SNSClient({
-      apiVersion: '2010-03-31',
-      region: awsRegion,
-      credentials: awsEndpoint
-        ? {
-            accessKeyId: 'tests-key-id',
-            secretAccessKey: 'tests-key',
-          }
-        : awsEndpoint,
-      endpoint: awsEndpoint,
-    });
+    const awsSns = new SNSClient(
+      buildClientConfig({
+        apiVersion: '2010-03-31',
+        awsRegion,
+        awsEndpoint,
+      })
+    );
     const { sendTwilioSms } = createTwilioClient({
       twilioAccountSid,
       twilioAuthToken,