aws-v3-sdk 1.0.6 → 1.0.8

package/clients/dynamo/DocumentClient.js

@@ -1,4 +1,4 @@
-const { DynamoDB, DynamoDBClient, BatchGetItemCommand } = require('@aws-sdk/client-dynamodb')
+const { DynamoDB, DynamoDBClient } = require('@aws-sdk/client-dynamodb')
 const { DynamoDBDocument, DynamoDBDocumentClient, GetCommand, BatchWriteCommand, PutCommand, QueryCommand, ScanCommand, DeleteCommand } = require('@aws-sdk/lib-dynamodb')
 const ddb = new DynamoDBClient()
 const documentClient = DynamoDBDocumentClient.from(ddb)
@@ -43,6 +43,13 @@ class DocumentClient {
   }
 
   put (params, callback) {
+    let item = params.Item
+    try {
+      item = Object.fromEntries(Object.entries(item).filter(([key, value]) => value !== undefined))
+    } catch (error) {
+
+    }
+    params.Item = item
     const putCommand = new PutCommand(params)
     documentClient.send(putCommand, (err, response) => {
       if (err || !response) {
@@ -53,6 +60,17 @@ class DocumentClient {
   }
 
   delete (params, callback) {
+    const docClient = DynamoDBDocument.from(new DynamoDB())
+    docClient.delete(params, (err, response) => {
+      if (err) {
+        return callback(err)
+      } else {
+        return callback(null, response)
+      }
+    })
+  }
+
+  deletev3 (params, callback) {
     const putCommand = new DeleteCommand(params)
     documentClient.send(putCommand, (err, response) => {
       if (err) {

package/clients/lambda.js

@@ -11,11 +11,6 @@ class Lambda {
   }
 
   async invoke (params, callback) {
-    if (params.Payload) {
-      params.InvokeArgs = fromUtf8(params.Payload)
-      delete params.Payload
-    }
-
     const command = new InvokeCommand(params)
     this.client.send(command).then(response => {
       response.Payload = toUtf8(response.Payload)

package/clients/s3.js

@@ -1,8 +1,84 @@
-const { S3Client, GetObjectCommand, PutObjectCommand, ListObjectsCommand, DeleteObjectsCommand } = require('@aws-sdk/client-s3')
+const { S3Client, GetObjectCommand, PutObjectCommand, ListObjectsCommand, DeleteObjectsCommand, CreateMultipartUploadCommand, CompleteMultipartUploadCommand } = require('@aws-sdk/client-s3')
 const { getSignedUrl } = require('@aws-sdk/s3-request-presigner')
 const client = new S3Client({})
 
 class S3 {
+  getSignedUrl (type, params, callback) {
+    return new Promise((resolve, reject) => {
+      if (type === 'getObject') {
+        const Expires = params.Expires
+        delete params.Expires
+        const command = new GetObjectCommand(params)
+        getSignedUrl(client, command, { expiresIn: Expires }).then(url => {
+          resolve(url)
+        }).catch(err => {
+          resolve(err)
+        })
+      } else if (type === 'putObject') {
+        const Expires = params.Expires
+        delete params.Expires
+        const command = new PutObjectCommand(params)
+        getSignedUrl(client, command, { expiresIn: Expires }).then(url => {
+          resolve(url)
+        }).catch(err => {
+          resolve(err)
+        })
+      }
+    }).then(result => {
+      if (callback && typeof callback === 'function') {
+        callback(null, result)
+      }
+      return result
+    }).catch(error => {
+      if (callback && typeof callback === 'function') {
+        callback(error, null)
+      }
+      return Promise.reject(error)
+    })
+  }
+
+  createMultipartUpload (type, params, callback) {
+    return new Promise((resolve, reject) => {
+      const command = new CreateMultipartUploadCommand(params)
+      client.send(command).then(response => {
+        resolve(response)
+      }).catch(err => {
+        resolve(err)
+      })
+    }).then(result => {
+      if (callback && typeof callback === 'function') {
+        callback(null, result)
+      }
+      return result
+    }).catch(error => {
+      if (callback && typeof callback === 'function') {
+        callback(error, null)
+      }
+      return Promise.reject(error)
+    })
+  }
+
+  completeMultipartUpload (type, params, callback) {
+    return new Promise((resolve, reject) => {
+      const command = new CompleteMultipartUploadCommand(params)
+      client.send(command).then(response => {
+        resolve(response)
+      }).catch(err => {
+        resolve(err)
+      })
+    }).then(result => {
+      if (callback && typeof callback === 'function') {
+        callback(null, result)
+      }
+      return result
+    }).catch(error => {
+      if (callback && typeof callback === 'function') {
+        callback(error, null)
+      }
+      return Promise.reject(error)
+    })
+  }
+
   getObject (params, callback) {
     return new Promise((resolve, reject) => {
       const getObject = new GetObjectCommand(params)
@@ -30,6 +106,30 @@ class S3 {
       return Promise.reject(error)
     })
   }
+
+  putObject (params, callback) {
+    return new Promise((resolve, reject) => {
+      const putObject = new PutObjectCommand(params)
+      client.send(putObject, (err, data) => {
+        if (err || !data) {
+          resolve(err)
+        }
+        if (data) {
+          resolve(data)
+        }
+      })
+    }).then(result => {
+      if (callback && typeof callback === 'function') {
+        callback(null, result)
+      }
+      return result
+    }).catch(error => {
+      if (callback && typeof callback === 'function') {
+        callback(error, null)
+      }
+      return Promise.reject(error)
+    })
+  }
 }
 
 module.exports = S3

package/es-handler/es-audits-wrapper.js

@@ -0,0 +1,53 @@
+const { Client, Connection } = require('@opensearch-project/opensearch')
+const { defaultProvider } = require('@aws-sdk/credential-provider-node')
+const aws4 = require('aws4')
+
+const { AWS_REGION, ELASTICSEARCH_AUDITS_ENDPOINT } = process.env
+
+const host = 'https://' + ELASTICSEARCH_AUDITS_ENDPOINT
+
+const createAwsConnector = (credentials, region) => {
+  class AmazonConnection extends Connection {
+    buildRequestObject (params) {
+      const request = super.buildRequestObject(params)
+      request.service = 'es'
+      request.region = region
+      request.headers = request.headers || {}
+      request.headers.host = request.hostname
+      return aws4.sign(request, credentials)
+    }
+  }
+  return {
+    Connection: AmazonConnection
+  }
+}
+
+const getClient = async () => {
+  const credentials = await defaultProvider()()
+  const cred = createAwsConnector(credentials, AWS_REGION)
+  return new Client({
+    ...cred,
+    node: host
+  })
+}
+
+exports.sendAuditsReqToES = async (method, index, type, id, data) => {
+  const client = await getClient()
+  if (method === 'DELETE') {
+    const response = await client.delete({
+      index,
+      type,
+      id
+    })
+    return response.body
+  } else {
+    const response = await client.index({
+      id,
+      index,
+      body: data,
+      refresh: true
+
+    })
+    return response.body
+  }
+}

package/es-handler/es-wrapper.js

@@ -0,0 +1,53 @@
+const { Client, Connection } = require('@opensearch-project/opensearch')
+const { defaultProvider } = require('@aws-sdk/credential-provider-node')
+const aws4 = require('aws4')
+
+const { AWS_REGION, ELASTICSEARCH_ENDPOINT } = process.env
+
+const host = 'https://' + ELASTICSEARCH_ENDPOINT
+
+const createAwsConnector = (credentials, region) => {
+  class AmazonConnection extends Connection {
+    buildRequestObject (params) {
+      const request = super.buildRequestObject(params)
+      request.service = 'es'
+      request.region = region
+      request.headers = request.headers || {}
+      request.headers.host = request.hostname
+      return aws4.sign(request, credentials)
+    }
+  }
+  return {
+    Connection: AmazonConnection
+  }
+}
+
+const getClient = async () => {
+  const credentials = await defaultProvider()()
+  const cred = createAwsConnector(credentials, AWS_REGION)
+  return new Client({
+    ...cred,
+    node: host
+  })
+}
+
+exports.sendReqToES = async (method, index, type, id, data) => {
+  const client = await getClient()
+  if (method === 'DELETE') {
+    const response = await client.delete({
+      index,
+      type,
+      id
+    })
+    return response.body
+  } else {
+    const response = await client.index({
+      id,
+      index,
+      body: data,
+      refresh: true
+
+    })
+    return response.body
+  }
+}

package/es-handler/index.js

@@ -0,0 +1,9 @@
+const { sendGetRequest } = require('./sendGetRequest')
+const { sendAuditsReqToES } = require('./es-audits-wrapper')
+const { sendReqToES } = require('./es-wrapper')
+
+module.exports = {
+  sendGetRequest,
+  sendReqToES,
+  sendAuditsReqToES
+}

package/es-handler/sendGetRequest.js

@@ -0,0 +1,50 @@
+const { Client, Connection } = require('@opensearch-project/opensearch')
+const { defaultProvider } = require('@aws-sdk/credential-provider-node')
+const aws4 = require('aws4')
+
+const { AWS_REGION, ELASTICSEARCH_ENDPOINT } = process.env
+const host = 'https://' + ELASTICSEARCH_ENDPOINT
+
+const createAwsConnector = (credentials, region) => {
+  class AmazonConnection extends Connection {
+    buildRequestObject (params) {
+      const request = super.buildRequestObject(params)
+      request.service = 'es'
+      request.region = region
+      request.headers = request.headers || {}
+      request.headers.host = request.hostname
+      return aws4.sign(request, credentials)
+    }
+  }
+  return {
+    Connection: AmazonConnection
+  }
+}
+
+const getClient = async () => {
+  const credentials = await defaultProvider()()
+  const cred = createAwsConnector(credentials, AWS_REGION)
+  return new Client({
+    ...cred,
+    node: host
+  })
+}
+
+exports.sendGetRequest = async (index, query, from, size, sort) => {
+  const client = await getClient()
+  return new Promise((resolve, reject) => {
+    client.search({
+      index,
+      body: { query }
+    }).then(response => {
+      const data = response.body.hits.hits
+      const totalCount = response.body.hits.total
+      const mappedData = data.map(item => {
+        return item._source
+      })
+      resolve({ items: mappedData, data: mappedData, totalCount })
+    }).catch(e => {
+      resolve({ items: [], data: [], totalCount: 0 })
+    })
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-v3-sdk",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "AWS v3 SDK Utils",
   "main": "index.js",
   "scripts": {
@@ -11,5 +11,8 @@
     "url": "git@tomymathew:tomymathew/aws-v3-sdk.git"
   },
   "author": "tomy mathew",
-  "license": "ISC"
+  "license": "ISC",
+  "dependencies": {
+    "@opensearch-project/opensearch": "^2.3.1"
+  }
 }