aws-v3-sdk 1.0.23 → 1.0.25

package/README.md

@@ -1,2 +1,4 @@
 # aws-v3-sdk
 AWS JS SDK UTILS
+
+PROD Release

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

@@ -1,7 +1,6 @@
 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
 
@@ -33,28 +32,23 @@ const getClient = async () => {
 }
 
 exports.sendAuditsReqToES = async (method, index, type, id, data) => {
-  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
+  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
-    }
-  } catch (error) {
-    logger.error('ES Error', { error })
-    return error
+    })
+    return response.body
   }
 }

package/es-handler/es-wrapper.js

@@ -1,7 +1,6 @@
 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
 
@@ -62,7 +61,6 @@ 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,7 +1,6 @@
 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
@@ -34,37 +33,25 @@ const getClient = async () => {
 exports.sendGetRequest = async (index, query, from, size, sort, _source) => {
   const client = await getClient()
   return new Promise((resolve, reject) => {
-    const body = {}
-    if (query) {
-      body.query = query
-    }
+    let body = { query }
     if (sort) {
-      body.sort = sort
+      body = { query, sort }
     }
-    const options = {
+    client.search({
       index,
+      from,
+      size,
+      _source,
       body
-    }
-    if (from) {
-      options.from = from
-    }
-    if (size) {
-      options.size = size
-    }
-    if (_source) {
-      options._source = size
-    }
-    client.search(options).then(response => {
-      logger.debug(response, { response })
+    }).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(err => {
-      logger.error('ES sendGetRequest Error', { err })
-      reject(err)
+    }).catch(e => {
+      resolve({ items: [], data: [], totalCount: 0 })
     })
   })
 }
@@ -89,8 +76,7 @@ exports.sendGetRequestCallback = async (index, query, from, size, sort, callback
       })
       callback(null, { items: mappedData, data: mappedData, totalCount })
     }).catch(e => {
-      logger.error('ES Error', { e })
-      reject(e)
+      callback(null, { items: [], data: [], totalCount: 0 })
     })
   })
 }
@@ -105,8 +91,8 @@ exports.getCount = async (index, query) => {
       const data = response.body
       resolve({ data })
     }).catch(e => {
-      logger.error('ES Error', { e })
-      reject(e)
+      console.log(e);
+      resolve({ })
     })
   })
 }
@@ -114,14 +100,17 @@ exports.getCount = async (index, query) => {
 exports.multiSearch = async (query) => {
   const client = await getClient()
   return new Promise((resolve, reject) => {
-    const body = query
+    let body = query 
     client.msearch({
       body
     }).then(response => {
-      resolve(response)
+      resolve(response);
     }).catch(e => {
-      logger.error('ES sendGetRequest Error', { e })
-      reject(e)
+      console.log(e);
+      resolve({ items: [], data: [], totalCount: 0 })
     })
   })
 }
+
+
+

package/package.json

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

package/utils/logger.js

@@ -1,16 +0,0 @@
-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