Fix issue where elasticsearch would not connect

Author: callmekatootie

.gitignore

@@ -3,3 +3,4 @@ node_modules
 coverage
 
 .DS_Store
+.env

package-lock.json

@@ -30,7 +30,7 @@
     "aws-sdk": "^2.476.0",
     "bluebird": "^3.5.5",
     "config": "^3.1.0",
-    "elasticsearch": "^16.1.1",
+    "elasticsearch": "^16.7.1",
     "get-parameter-names": "^0.3.0",
     "http-aws-es": "^6.0.0",
     "lodash": "^4.17.15",

package.json

@@ -33,24 +33,22 @@ async function getESClient () {
   if (esClient) {
     return esClient
   }
-  const hosts = config.ES.HOST
+  const host = config.ES.HOST
   const apiVersion = config.ES.API_VERSION
 
   // AWS ES configuration is different from other providers
-  if (/.*amazonaws.*/.test(hosts)) {
-    esClient = new elasticsearch.Client({
-      apiVersion,
-      hosts,
-      connectionClass: require('http-aws-es'), // eslint-disable-line global-require
-      amazonES: {
-        region: config.ES.AWS_REGION,
-        credentials: new AWS.EnvironmentCredentials('AWS')
-      }
-    })
+  if (/.*amazonaws.*/.test(host)) {
+    try {
+      esClient = new elasticsearch.Client({
+        apiVersion,
+        host,
+        connectionClass: require('http-aws-es') // eslint-disable-line global-require
+      })
+    } catch (error) { console.log(error) }
   } else {
     esClient = new elasticsearch.Client({
       apiVersion,
-      hosts
+      host
     })
   }
   return esClient