@velocitycareerlabs/aws-clients 1.24.0-dev-build.183959a2c → 1.24.0-dev-build.1bc10e07c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/aws-clients",
-  "version": "1.24.0-dev-build.183959a2c",
+  "version": "1.24.0-dev-build.1bc10e07c",
   "description": "Set of aws functions and utils used by Velocity Foundation projects",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "main": "index.js",
@@ -15,22 +15,14 @@
     "lint:fix": "eslint --fix --ext .js ."
   },
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.731.1",
-    "@aws-sdk/client-kms": "^3.731.1",
-    "@aws-sdk/client-s3": "^3.731.1",
-    "@aws-sdk/client-ses": "^3.731.1",
-    "@aws-sdk/client-sesv2": "^3.731.1",
-    "@aws-sdk/client-sns": "^3.731.1",
-    "@aws-sdk/lib-dynamodb": "^3.731.1",
-    "@aws-sdk/s3-request-presigner": "^3.731.1",
-    "aws-sdk": "^2.784.0",
+    "aws-sdk": "2.1692.0",
     "fastify-plugin": "~4.5.1",
-    "lodash": "~4.17.20",
+    "lodash": "^4.17.21",
     "twilio": "^5.0.0"
   },
   "devDependencies": {
-    "@velocitycareerlabs/crypto": "1.24.0-dev-build.183959a2c",
-    "@velocitycareerlabs/jwt": "1.24.0-dev-build.183959a2c",
+    "@velocitycareerlabs/crypto": "1.24.0-dev-build.1bc10e07c",
+    "@velocitycareerlabs/jwt": "1.24.0-dev-build.1bc10e07c",
     "eslint": "8.57.1",
     "eslint-config-airbnb-base": "14.2.1",
     "eslint-config-prettier": "8.10.0",
@@ -43,5 +35,5 @@
     "jest": "29.7.0",
     "prettier": "2.8.8"
   },
-  "gitHead": "54fcb604008282dc5c7809fd3806b5fbbc80d4bb"
+  "gitHead": "75caedc95a2a0f92af65851a2c14f3e683599160"
 }

package/src/aws-factory.js

@@ -0,0 +1,85 @@
+/**
+ * Copyright 2023 Velocity Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+const AWS = require('aws-sdk');
+
+const testsConfig = (awsEndpoint) =>
+  awsEndpoint
+    ? {
+        credentials: new AWS.Credentials('tests-kei-id', 'tests-key'),
+        endpoint: awsEndpoint,
+      }
+    : {};
+
+const createKmsClient = ({ awsRegion, awsEndpoint }) => {
+  return new AWS.KMS({
+    region: awsRegion,
+    ...testsConfig(awsEndpoint),
+  });
+};
+
+const createSesClient = ({ awsRegion, awsEndpoint }) =>
+  new AWS.SES({
+    apiVersion: '2010-12-01',
+    region: awsRegion,
+    ...testsConfig(awsEndpoint),
+  });
+
+const createSesV2Client = ({ awsRegion }) =>
+  new AWS.SESV2({
+    apiVersion: '2019-09-27',
+    region: awsRegion,
+  });
+
+const createDynamoDbDocumentClient = ({ awsRegion, awsEndpoint }) =>
+  new AWS.DynamoDB.DocumentClient({
+    apiVersion: '2012-08-10',
+    region: awsRegion,
+    ...testsConfig(awsEndpoint),
+  });
+
+const createS3Client = ({
+  awsRegion,
+  awsEndpoint,
+  accessKeyId,
+  secretAccessKey,
+  isTest,
+}) =>
+  new AWS.S3({
+    apiVersion: '2006-03-01',
+    region: awsRegion,
+    signatureVersion: 'v4',
+    accessKeyId,
+    secretAccessKey,
+    s3ForcePathStyle: isTest,
+    ...testsConfig(awsEndpoint),
+  });
+
+const createSnsClient = ({ awsRegion, awsEndpoint }) =>
+  new AWS.SNS({
+    apiVersion: '2010-03-31',
+    region: awsRegion,
+    ...testsConfig(awsEndpoint),
+  });
+
+module.exports = {
+  createSnsClient,
+  createSesClient,
+  createSesV2Client,
+  createDynamoDbDocumentClient,
+  createS3Client,
+  createKmsClient,
+};

package/src/document-storage.js

@@ -14,27 +14,7 @@
  * limitations under the License.
  */
 
-const { DynamoDB } = require('@aws-sdk/client-dynamodb');
-const {
-  DynamoDBDocumentClient,
-  GetCommand,
-  PutCommand,
-} = require('@aws-sdk/lib-dynamodb');
-
-const createDynamoDbDocumentClient = ({ awsRegion, awsEndpoint }) =>
-  DynamoDBDocumentClient.from(
-    new DynamoDB({
-      apiVersion: '2012-08-10',
-      region: awsRegion,
-      credentials: awsEndpoint
-        ? {
-            accessKeyId: 'tests-key-id',
-            secretAccessKey: 'tests-key',
-          }
-        : awsEndpoint,
-      endpoint: awsEndpoint,
-    })
-  );
+const { createDynamoDbDocumentClient } = require('./aws-factory');
 
 const initReadDocument =
   ({ awsRegion, awsEndpoint }) =>
@@ -44,12 +24,12 @@ const initReadDocument =
       awsEndpoint,
     });
 
-    return dynamoDbDocClient.send(
-      new GetCommand({
+    return dynamoDbDocClient
+      .get({
         TableName: table,
         Key: key,
       })
-    );
+      .promise();
   };
 
 const initWriteDocument =
@@ -60,12 +40,12 @@ const initWriteDocument =
       awsEndpoint,
     });
 
-    await dynamoDbDocClient.send(
-      new PutCommand({
+    await dynamoDbDocClient
+      .put({
         TableName: table,
         Item: document,
       })
-    );
+      .promise();
   };
 
 module.exports = {

package/src/email-notifications.js

@@ -15,34 +15,28 @@
  */
 
 const { isEmpty, join } = require('lodash/fp');
-const {
-  SESClient,
-  SendEmailCommand: SESSendEmailCommand,
-} = require('@aws-sdk/client-ses');
-const {
-  SESv2Client,
-  SendEmailCommand: SESv2SendEmailCommand,
-} = require('@aws-sdk/client-sesv2');
+const { createSesClient, createSesV2Client } = require('./aws-factory');
 
-// 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)
+// 2020-10-20: At the moment 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,
-  });
+const initVerifyDomain =
+  ({ awsRegion, awsEndpoint }) =>
+  async (domain) => {
+    if (awsEndpoint) {
+      const awsSes = createSesClient({
+        awsRegion,
+        awsEndpoint,
+      });
 
-const createSesV2Client = ({ awsRegion }) =>
-  new SESv2Client({
-    apiVersion: '2019-09-27',
-    region: awsRegion,
-  });
+      await awsSes.verifyDomainDkim({ Domain: domain }).promise();
+    } else {
+      const awsSesV2 = createSesV2Client({
+        awsRegion,
+      });
+
+      await awsSesV2.createEmailIdentity({ EmailIdentity: domain }).promise();
+    }
+  };
 
 const initSendEmailNotification =
   ({ awsRegion, awsEndpoint }) =>
@@ -75,8 +69,8 @@ const initSendEmailNotification =
         awsEndpoint,
       });
 
-      await awsSes.send(
-        new SESSendEmailCommand({
+      await awsSes
+        .sendEmail({
           Source: sender,
           Destination: destination,
           ReplyToAddresses: [replyTo],
@@ -108,14 +102,14 @@ const initSendEmailNotification =
             },
           },
         })
-      );
+        .promise();
     } else {
       const awsSesV2 = createSesV2Client({
         awsRegion,
       });
 
-      await awsSesV2.send(
-        new SESv2SendEmailCommand({
+      await awsSesV2
+        .sendEmail({
           FromEmailAddress: sender,
           Destination: destination,
           ReplyToAddresses: [replyTo],
@@ -149,7 +143,7 @@ const initSendEmailNotification =
                 }),
           },
         })
-      );
+        .promise();
     }
   };
 
@@ -192,8 +186,7 @@ const buildRawMessage = ({
 };
 
 module.exports = {
-  createSesClient,
-  createSesV2Client,
+  initVerifyDomain,
   initSendEmailNotification,
   buildRawMessage,
 };

package/src/index.js

@@ -1,4 +1,5 @@
 module.exports = {
+  ...require('./aws-factory'),
   ...require('./document-storage'),
   ...require('./email-notifications'),
   ...require('./kms-client'),

package/src/kms-client.js

@@ -14,44 +14,29 @@
  * limitations under the License.
  */
 
-const {
-  KMSClient,
-  EncryptCommand,
-  DecryptCommand,
-} = require('@aws-sdk/client-kms');
+const { createKmsClient } = require('./aws-factory');
 
 const initKmsClient = ({ awsRegion, awsEndpoint }) => {
-  const kmsClient = new KMSClient({
-    region: awsRegion,
-    credentials: awsEndpoint
-      ? {
-          accessKeyId: 'tests-key-id',
-          secretAccessKey: 'tests-key',
-        }
-      : awsEndpoint,
-    endpoint: awsEndpoint,
+  const kmsClient = createKmsClient({
+    awsRegion,
+    awsEndpoint,
   });
 
   const encrypt = async (keyId, plaintext) => {
-    const command = new EncryptCommand({
+    const params = {
       KeyId: keyId,
-      Plaintext: Buffer.from(plaintext),
-    });
+      Plaintext: plaintext,
+    };
 
-    return kmsClient.send(command);
+    return kmsClient.encrypt(params).promise();
   };
 
   const decrypt = async (ciphertextBlob) => {
-    const command = new DecryptCommand({
+    const params = {
       CiphertextBlob: ciphertextBlob,
-    });
-
-    const result = await kmsClient.send(command);
-
-    return {
-      ...result,
-      Plaintext: Buffer.from(result.Plaintext),
     };
+
+    return kmsClient.decrypt(params).promise();
   };
 
   return {

package/src/s3-client.js

@@ -14,15 +14,7 @@
  * limitations under the License.
  */
 
-const {
-  S3Client,
-  GetObjectCommand,
-  PutObjectCommand,
-  DeleteObjectCommand,
-} = require('@aws-sdk/client-s3');
-const {
-  getSignedUrl: awsGetSignedUrl,
-} = require('@aws-sdk/s3-request-presigner');
+const { createS3Client } = require('./aws-factory');
 
 const initS3Client = ({
   awsRegion,
@@ -33,65 +25,50 @@ const initS3Client = ({
   secretAccessKey,
   isTest,
 }) => {
-  const s3Client = new S3Client({
-    apiVersion: '2006-03-01',
-    region: awsRegion,
-    signatureVersion: 'v4',
-    credentials: {
-      accessKeyId,
-      secretAccessKey,
-    },
-    forcePathStyle: isTest,
-    endpoint: awsEndpoint,
+  const s3Client = createS3Client({
+    awsRegion,
+    awsEndpoint,
+    accessKeyId,
+    secretAccessKey,
+    isTest,
   });
 
-  const getSignedUrl = async ({ key, contentType, metadata }) => {
-    const command = new PutObjectCommand({
+  const getSignedUrl = async ({ key, contentType, metadata }) =>
+    s3Client.getSignedUrlPromise('putObject', {
       Bucket: s3Bucket,
       Key: key,
+      Expires: s3PresignedUrlExpiration,
       ContentType: contentType,
       Metadata: metadata,
     });
 
-    return awsGetSignedUrl(s3Client, command, {
-      expiresIn: s3PresignedUrlExpiration,
-    });
-  };
-
   const getObject = async ({ bucket, key }) => {
-    const command = new GetObjectCommand({
+    const params = {
       Bucket: bucket,
       Key: key,
-    });
-
-    const result = await s3Client.send(command);
-    const body = await result.Body.transformToByteArray();
-
-    return {
-      ...result,
-      Body: body,
     };
+
+    return s3Client.getObject(params).promise();
   };
 
   const putObject = async ({ bucket, key, body, contentType, metadata }) => {
-    const command = new PutObjectCommand({
+    const params = {
       Bucket: bucket,
       Key: key,
       Body: body,
       ContentType: contentType,
       Metadata: metadata,
-    });
+    };
 
-    await s3Client.send(command);
+    await s3Client.putObject(params).promise();
   };
 
   const deleteObject = async ({ bucket, key }) => {
-    const command = new DeleteObjectCommand({
+    const params = {
       Bucket: bucket,
       Key: key,
-    });
-
-    await s3Client.send(command);
+    };
+    await s3Client.deleteObject(params).promise();
   };
 
   return {

package/src/sms-notifications.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 const { startsWith } = require('lodash/fp');
-const { SNSClient, PublishCommand } = require('@aws-sdk/client-sns');
+const { createSnsClient } = require('./aws-factory');
 const { createTwilioClient } = require('./twilio-factory');
 
 const singaporePhoneCode = '+65';
@@ -39,16 +39,9 @@ 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 = createSnsClient({
+      awsRegion,
+      awsEndpoint,
     });
     const { sendTwilioSms } = createTwilioClient({
       twilioAccountSid,
@@ -61,8 +54,8 @@ const initSendSmsNotification =
       return;
     }
 
-    await awsSns.send(
-      new PublishCommand({
+    await awsSns
+      .publish({
         Message: message,
         PhoneNumber: phoneNumber,
         MessageAttributes: {
@@ -73,7 +66,7 @@ const initSendSmsNotification =
           },
         },
       })
-    );
+      .promise();
   };
 
 module.exports = {