aws-v3-sdk 1.0.21 → 1.0.23

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

@@ -1,6 +1,7 @@
 const { Client, Connection } = require('@opensearch-project/opensearch')
 const { defaultProvider } = require('@aws-sdk/credential-provider-node')
 const aws4 = require('aws4')
+const logger = require('../utils/logger')
 
 const { REGION, ELASTICSEARCH_AUDITS_ENDPOINT } = process.env
 
@@ -32,23 +33,28 @@ const getClient = async () => {
 }
 
 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,
-      type,
-      body: data,
-      refresh: true
+  try {
+    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,
+        type,
+        body: data,
+        refresh: true
 
-    })
-    return response.body
+      })
+      return response.body
+    }
+  } catch (error) {
+    logger.error('ES Error', { error })
+    return error
   }
 }

package/es-handler/es-wrapper.js

@@ -1,6 +1,7 @@
 const { Client, Connection } = require('@opensearch-project/opensearch')
 const { defaultProvider } = require('@aws-sdk/credential-provider-node')
 const aws4 = require('aws4')
+const logger = require('../utils/logger')
 
 const { REGION, ELASTICSEARCH_ENDPOINT } = process.env
 
@@ -61,6 +62,7 @@ exports.sendReqToES = async (method, index, type, id, data) => {
       return response.body
     }
   } catch (error) {
+    logger.error('ES Error', { error })
     return error
   }
 }

package/es-handler/sendGetRequest.js

@@ -1,6 +1,7 @@
 const { Client, Connection } = require('@opensearch-project/opensearch')
 const { defaultProvider } = require('@aws-sdk/credential-provider-node')
 const aws4 = require('aws4')
+const logger = require('../utils/logger')
 
 const { REGION, ELASTICSEARCH_ENDPOINT } = process.env
 const host = 'https://' + ELASTICSEARCH_ENDPOINT
@@ -33,25 +34,37 @@ const getClient = async () => {
 exports.sendGetRequest = async (index, query, from, size, sort, _source) => {
   const client = await getClient()
   return new Promise((resolve, reject) => {
-    let body = { query }
+    const body = {}
+    if (query) {
+      body.query = query
+    }
     if (sort) {
-      body = { query, sort }
+      body.sort = sort
     }
-    client.search({
+    const options = {
       index,
-      from,
-      size,
-      _source,
       body
-    }).then(response => {
+    }
+    if (from) {
+      options.from = from
+    }
+    if (size) {
+      options.size = size
+    }
+    if (_source) {
+      options._source = size
+    }
+    client.search(options).then(response => {
+      logger.debug(response, { 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 })
+    }).catch(err => {
+      logger.error('ES sendGetRequest Error', { err })
+      reject(err)
     })
   })
 }
@@ -76,7 +89,8 @@ exports.sendGetRequestCallback = async (index, query, from, size, sort, callback
       })
       callback(null, { items: mappedData, data: mappedData, totalCount })
     }).catch(e => {
-      callback(null, { items: [], data: [], totalCount: 0 })
+      logger.error('ES Error', { e })
+      reject(e)
     })
   })
 }
@@ -91,8 +105,8 @@ exports.getCount = async (index, query) => {
       const data = response.body
       resolve({ data })
     }).catch(e => {
-      console.log(e);
-      resolve({ })
+      logger.error('ES Error', { e })
+      reject(e)
     })
   })
 }
@@ -100,17 +114,14 @@ exports.getCount = async (index, query) => {
 exports.multiSearch = async (query) => {
   const client = await getClient()
   return new Promise((resolve, reject) => {
-    let body = query 
+    const body = query
     client.msearch({
       body
     }).then(response => {
-      resolve(response);
+      resolve(response)
     }).catch(e => {
-      console.log(e);
-      resolve({ items: [], data: [], totalCount: 0 })
+      logger.error('ES sendGetRequest Error', { e })
+      reject(e)
     })
   })
 }
-
-
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-v3-sdk",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "AWS v3 SDK Utils",
   "main": "index.js",
   "scripts": {

package/utils/logger.js

@@ -0,0 +1,16 @@
+const winston = require('winston')
+
+const level = process.env.LOG_LEVEL || 'debug'
+const logger = winston.createLogger({
+  level,
+  transports: [
+    new winston.transports.Console({
+      level,
+      timestamp: function () {
+        return (new Date()).toISOString()
+      }
+    })
+  ]
+})
+
+module.exports = logger