Small refactor, graphql

Author: pkarw

docker-compose.elastic7.yml

@@ -1,7 +1,7 @@
 version: '3.0'
 services:
   es7:
-    container_name: elasticsearch7
+    container_name: es7
     build: docker/elasticsearch7/
     ulimits:
       memlock:
@@ -12,6 +12,11 @@ services:
     ports:
       - '9200:9200'
       - '9300:9300'
+    environment:
+      - discovery.type=single-node
+      - cluster.name=docker-cluster
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xmx512m -Xms512m"
 
   redis:
     image: 'redis:4-alpine'

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.0'
+version: '2.0'
 services:
   es1:
     container_name: elasticsearch
@@ -7,14 +7,18 @@ services:
       memlock:
         soft: -1
         hard: -1    
+    mem_limit: 1g
     volumes:
       - ./docker/elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro
       - ./docker/elasticsearch/data:/usr/share/elasticsearch/data
     ports:
       - '9200:9200'
       - '9300:9300'
     environment:
-      ES_JAVA_OPTS: "-Xmx512m -Xms512m"
+      - discovery.type=single-node
+      - cluster.name=docker-cluster
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xmx512m -Xms512m"
 
   kibana:
     build: docker/kibana/

src/graphql/elasticsearch/client.js

@@ -1,8 +1,4 @@
 import config from 'config';
-import elasticsearch from '@elastic/elasticsearch';
+import es from '../../lib/elastic'
 
-const client = new elasticsearch.Client({
-  node: `${config.elasticsearch.protocol}://${config.elasticsearch.host}:${config.elasticsearch.port}`
-});
-
-export default client;
+export default es.getClient(config)

src/lib/elastic.js

@@ -23,6 +23,16 @@ function _updateQueryStringParameter (uri, key, value) {
   }
 }
 
+
+function adjustIndexName (indexName, entityType, config) {
+  if (parseInt(config.elasticsearch.apiVersion) < 6) {
+    return indexName
+  } else {
+    return `${indexName}_${entityType}`
+  }  
+}
+
+
 function adjustBackendProxyUrl (req, indexName, entityType, config) {
   let url
   if (parseInt(config.elasticsearch.apiVersion) < 6) { // legacy for ES 5
@@ -35,7 +45,7 @@ function adjustBackendProxyUrl (req, indexName, entityType, config) {
     delete parsedQuery._source_exclude
     delete parsedQuery._source_include
     delete parsedQuery.request
-    url = config.elasticsearch.host + ':' + config.elasticsearch.port + '/' + `${indexName}_${entityType}` + '/_search?' + queryString.stringify(parsedQuery)
+    url = config.elasticsearch.host + ':' + config.elasticsearch.port + '/' + adjustIndexName(indexName, entityType, config) + '/_search?' + queryString.stringify(parsedQuery)
   }
   if (!url.startsWith('http')) {
     url = config.elasticsearch.protocol + '://' + url
@@ -46,9 +56,8 @@ function adjustBackendProxyUrl (req, indexName, entityType, config) {
 function adjustQuery (esQuery, entityType, config) {
   if (parseInt(config.elasticsearch.apiVersion) < 6) {
     esQuery.type = entityType
-  } else {
-    esQuery.index = `${esQuery.index}_${entityType}`
   }
+  esQuery.index = adjustIndexName(esQuery.index, entityType, config)
   return esQuery
 }
 
@@ -271,5 +280,6 @@ module.exports = {
   adjustBackendProxyUrl,
   getClient,
   getHits,
+  adjustIndexName,
   putMappings
 }