Merge branch 'feature/enrich' into enrich

Author: Sande3p

config/default.js

@@ -38,6 +38,7 @@ module.exports = {
   ES: {
     HOST: process.env.ES_HOST || 'http://localhost:9200',
     ES_REFRESH: process.env.ES_REFRESH || 'true',
+    ES_API_VERSION: process.env.ES_API_VERSION || "7.4",
 
     ELASTICCLOUD: {
       id: process.env.ELASTICCLOUD_ID,

package-lock.json

@@ -41,6 +41,9 @@
     "swagger-ui-express": "^4.1.4",
     "tc-core-library-js": "github:appirio-tech/tc-core-library-js#v2.6.4",
     "umzug": "^2.3.0",
+    "aws-sdk": "^2.610.0",
+    "http-aws-es": "^4.0.0",
+    "elasticsearch": "^16.1.1",
     "winston": "^3.2.1"
   },
   "devDependencies": {

package.json

@@ -26,9 +26,18 @@ function getESClient () {
       }
     })
   } else {
-    esClient = new elasticsearch.Client({
-      node: host
-    })
+    if (/.*amazonaws.*/.test(host)) {
+      esClient = new elasticsearch.Client({
+        apiVersion: config.get('ES.ES_API_VERSION'),
+        node: host,
+        connectionClass: require('http-aws-es'), // eslint-disable-line global-require
+      });
+      console.log('esClient=> ', esClient)
+    } else {
+      esClient = new elasticsearch.Client({
+        node: host
+      })
+    }
   }
   return esClient
 }