aws-v3-sdk 1.0.24 → 1.0.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/README.md +2 -0
  2. package/es-handler/es-audits-wrapper.js +17 -23
  3. package/es-handler/es-wrapper.js +0 -2
  4. package/es-handler/sendGetRequest.js +28 -63
  5. package/package.json +1 -1
  6. package/utils/logger.js +0 -16
package/README.md CHANGED
@@ -1,2 +1,4 @@
1
1
  # aws-v3-sdk
2
2
  AWS JS SDK UTILS
3
+
4
+ PROD Release
package/es-handler/es-audits-wrapper.js CHANGED
@@ -1,7 +1,6 @@
1
1
  const { Client, Connection } = require('@opensearch-project/opensearch')
2
2
  const { defaultProvider } = require('@aws-sdk/credential-provider-node')
3
3
  const aws4 = require('aws4')
4
- const logger = require('../utils/logger')
5
4
 
6
5
  const { REGION, ELASTICSEARCH_AUDITS_ENDPOINT } = process.env
7
6
 
@@ -33,28 +32,23 @@ const getClient = async () => {
33
32
  }
34
33
 
35
34
  exports.sendAuditsReqToES = async (method, index, type, id, data) => {
36
- try {
37
- const client = await getClient()
38
- if (method === 'DELETE') {
39
- const response = await client.delete({
40
- index,
41
- type,
42
- id
43
- })
44
- return response.body
45
- } else {
46
- const response = await client.index({
47
- id,
48
- index,
49
- type,
50
- body: data,
51
- refresh: true
35
+ const client = await getClient()
36
+ if (method === 'DELETE') {
37
+ const response = await client.delete({
38
+ index,
39
+ type,
40
+ id
41
+ })
42
+ return response.body
43
+ } else {
44
+ const response = await client.index({
45
+ id,
46
+ index,
47
+ type,
48
+ body: data,
49
+ refresh: true
52
50
 
53
- })
54
- return response.body
55
- }
56
- } catch (error) {
57
- logger.error('ES Error', { error })
58
- return error
51
+ })
52
+ return response.body
59
53
  }
60
54
  }
package/es-handler/es-wrapper.js CHANGED
@@ -1,7 +1,6 @@
1
1
  const { Client, Connection } = require('@opensearch-project/opensearch')
2
2
  const { defaultProvider } = require('@aws-sdk/credential-provider-node')
3
3
  const aws4 = require('aws4')
4
- const logger = require('../utils/logger')
5
4
 
6
5
  const { REGION, ELASTICSEARCH_ENDPOINT } = process.env
7
6
 
@@ -62,7 +61,6 @@ exports.sendReqToES = async (method, index, type, id, data) => {
62
61
  return response.body
63
62
  }
64
63
  } catch (error) {
65
- logger.error('ES Error', { error })
66
64
  return error
67
65
  }
68
66
  }
package/es-handler/sendGetRequest.js CHANGED
@@ -1,7 +1,6 @@
1
1
  const { Client, Connection } = require('@opensearch-project/opensearch')
2
2
  const { defaultProvider } = require('@aws-sdk/credential-provider-node')
3
3
  const aws4 = require('aws4')
4
- const logger = require('../utils/logger')
5
4
 
6
5
  const { REGION, ELASTICSEARCH_ENDPOINT } = process.env
7
6
  const host = 'https://' + ELASTICSEARCH_ENDPOINT
@@ -34,41 +33,25 @@ const getClient = async () => {
34
33
  exports.sendGetRequest = async (index, query, from, size, sort, _source) => {
35
34
  const client = await getClient()
36
35
  return new Promise((resolve, reject) => {
37
- const body = {}
38
- if (query) {
39
- body.query = query
40
- }
36
+ let body = { query }
41
37
  if (sort) {
42
- body.sort = sort
38
+ body = { query, sort }
43
39
  }
44
- const options = {
40
+ client.search({
45
41
  index,
42
+ from,
43
+ size,
44
+ _source,
46
45
  body
47
- }
48
- if (from) {
49
- options.from = from
50
- }
51
- if (size) {
52
- options.size = size
53
- }
54
- if (_source) {
55
- options._source = size
56
- }
57
- client.search(options).then(response => {
58
- logger.debug(response, { response })
46
+ }).then(response => {
59
47
  const data = response.body.hits.hits
60
48
  const totalCount = response.body.hits.total
61
49
  const mappedData = data.map(item => {
62
50
  return item._source
63
51
  })
64
52
  resolve({ items: mappedData, data: mappedData, totalCount })
65
- }).catch(err => {
66
- if (err) {
67
- logger.error('ES sendGetRequest Error', { err })
68
- reject(err)
69
- } else {
70
- resolve({ items: [], data: [], totalCount: 0 })
71
- }
53
+ }).catch(e => {
54
+ resolve({ items: [], data: [], totalCount: 0 })
72
55
  })
73
56
  })
74
57
  }
@@ -76,37 +59,24 @@ exports.sendGetRequest = async (index, query, from, size, sort, _source) => {
76
59
  exports.sendGetRequestCallback = async (index, query, from, size, sort, callback) => {
77
60
  const client = await getClient()
78
61
  return new Promise((resolve, reject) => {
79
- const body = {}
80
- if (query) {
81
- body.query = query
82
- }
62
+ let body = { query }
83
63
  if (sort) {
84
- body.sort = sort
64
+ body = { query, sort }
85
65
  }
86
- const options = {
66
+ client.search({
87
67
  index,
68
+ from,
69
+ size,
88
70
  body
89
- }
90
- if (from) {
91
- options.from = from
92
- }
93
- if (size) {
94
- options.size = size
95
- }
96
- client.search(options).then(response => {
71
+ }).then(response => {
97
72
  const data = response.body.hits.hits
98
73
  const totalCount = response.body.hits.total
99
74
  const mappedData = data.map(item => {
100
75
  return item._source
101
76
  })
102
77
  callback(null, { items: mappedData, data: mappedData, totalCount })
103
- }).catch(err => {
104
- if (err) {
105
- logger.error('ES Error', { err })
106
- reject(err)
107
- } else {
108
- resolve({ items: [], data: [], totalCount: 0 })
109
- }
78
+ }).catch(e => {
79
+ callback(null, { items: [], data: [], totalCount: 0 })
110
80
  })
111
81
  })
112
82
  }
@@ -120,13 +90,9 @@ exports.getCount = async (index, query) => {
120
90
  }).then(response => {
121
91
  const data = response.body
122
92
  resolve({ data })
123
- }).catch(err => {
124
- if (err) {
125
- logger.error('ES Error', { err })
126
- reject(err)
127
- } else {
128
- resolve({ items: [], data: [], totalCount: 0 })
129
- }
93
+ }).catch(e => {
94
+ console.log(e);
95
+ resolve({ })
130
96
  })
131
97
  })
132
98
  }
@@ -134,18 +100,17 @@ exports.getCount = async (index, query) => {
134
100
  exports.multiSearch = async (query) => {
135
101
  const client = await getClient()
136
102
  return new Promise((resolve, reject) => {
137
- const body = query
103
+ let body = query
138
104
  client.msearch({
139
105
  body
140
106
  }).then(response => {
141
- resolve(response)
142
- }).catch(err => {
143
- if (err) {
144
- logger.error('ES Error', { err })
145
- reject(err)
146
- } else {
147
- resolve({ items: [], data: [], totalCount: 0 })
148
- }
107
+ resolve(response);
108
+ }).catch(e => {
109
+ console.log(e);
110
+ resolve({ items: [], data: [], totalCount: 0 })
149
111
  })
150
112
  })
151
113
  }
114
+
115
+
116
+
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "aws-v3-sdk",
3
- "version": "1.0.24",
3
+ "version": "1.0.25",
4
4
  "description": "AWS v3 SDK Utils",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/utils/logger.js DELETED
@@ -1,16 +0,0 @@
1
- const winston = require('winston')
2
-
3
- const level = process.env.LOG_LEVEL || 'debug'
4
- const logger = winston.createLogger({
5
- level,
6
- transports: [
7
- new winston.transports.Console({
8
- level,
9
- timestamp: function () {
10
- return (new Date()).toISOString()
11
- }
12
- })
13
- ]
14
- })
15
-
16
- module.exports = logger