Undo changes that limit ES access

Author: callmekatootie

src/common/helper.js

@@ -7,77 +7,11 @@ const config = require('config')
 const elasticsearch = require('elasticsearch')
 const _ = require('lodash')
 const Joi = require('@hapi/joi')
-const Mutex = require('async-mutex').Mutex
 
 AWS.config.region = config.ES.AWS_REGION
 
 // Elasticsearch client
-let esClient = {
-  mutex: new Mutex(),
-  client: null,
-
-  ctor (client) {
-    this.client = client
-    this.indices = {
-      exists: client.indices.exists.bind(client.indices),
-      putMapping: client.indices.putMapping.bind(client.indices),
-      create: client.indices.create.bind(client.indices),
-      delete: client.indices.delete.bind(client.indices)
-    }
-  },
-
-  async create () {
-    const release = await this.mutex.acquire()
-
-    try {
-      return this.client.create(...arguments)
-    } finally {
-      release()
-    }
-  },
-
-  async update () {
-    const release = await this.mutex.acquire()
-
-    try {
-      return this.client.update(...arguments)
-    } finally {
-      release()
-    }
-  },
-
-  async delete () {
-    const release = await this.mutex.acquire()
-
-    try {
-      return this.client.delete(...arguments)
-    } finally {
-      release()
-    }
-  },
-
-  async getSource () {
-    const release = await this.mutex.acquire()
-
-    try {
-      return this.client.getSource(...arguments)
-    } finally {
-      release()
-    }
-  },
-
-  async get () {
-    const release = await this.mutex.acquire()
-
-    try {
-      return this.client.get(...arguments)
-    } finally {
-      release()
-    }
-  },
-
-  indices: undefined
-}
+let esClient
 
 /**
  * Get Kafka options
@@ -96,7 +30,7 @@ function getKafkaOptions () {
  * @return {Object} Elasticsearch Client Instance
  */
 async function getESClient () {
-  if (esClient.client) {
+  if (esClient) {
     return esClient
   }
   const host = config.ES.HOST
@@ -105,17 +39,17 @@ async function getESClient () {
   // AWS ES configuration is different from other providers
   if (/.*amazonaws.*/.test(host)) {
     try {
-      esClient.ctor(new elasticsearch.Client({
+      esClient = new elasticsearch.Client({
         apiVersion,
         host,
         connectionClass: require('http-aws-es') // eslint-disable-line global-require
-      }))
+      })
     } catch (error) { console.log(error) }
   } else {
-    esClient.ctor(new elasticsearch.Client({
+    esClient = new elasticsearch.Client({
       apiVersion,
       host
-    }))
+    })
   }
   return esClient
 }