stdout logger with pelias-elasticsearch

The legacy elasticsearch client had an integrated stdout logger.
The new elasticsearch client does not, so instead we use the
pelias-elasticsearch which integrates the modern elasticsearch client
with pelias-logger.

package.json

@@ -30,7 +30,7 @@
   "dependencies": {
     "@hapi/joi": "^16.1.8",
     "colors": "^1.1.2",
-    "@elastic/elasticsearch": "~7.17.0",
+    "pelias-elasticsearch": "https://github.com/michaelkirk-pelias/pelias-elasticsearch#mkirk\/elastic8",
     "glob": "^7.1.6",
     "lodash": "^4.17.15",
     "pelias-config": "^6.0.0",

scripts/check_plugins.js

@@ -1,7 +1,7 @@
 const colors = require('colors/safe');
 const config = require('pelias-config').generate();
-const es = require('@elastic/elasticsearch');
-const client = new es.Client(config.esclient);
+const buildClient = require('pelias-elasticsearch');
+const client = buildClient(config.esclient);
 const cli = require('./cli');
 
 // mandatory plugins

scripts/check_version.js

@@ -1,8 +1,8 @@
 const _ = require('lodash');
 const semver = require('semver');
-const es = require('@elastic/elasticsearch');
+const buildClient = require('pelias-elasticsearch');
 const config = require('pelias-config').generate();
-const client = new es.Client(config.esclient);
+const client = buildClient(config.esclient);
 const cli = require('./cli');
 
 // pass target elastic version semver as the first CLI arg

scripts/create_index.js

@@ -1,14 +1,14 @@
 const child_process = require('child_process');
 const config = require('pelias-config').generate();
-const es = require('@elastic/elasticsearch');
+const buildClient = require('pelias-elasticsearch');
 const SUPPORTED_ES_VERSIONS = '>=7.4.2';
 
 const cli = require('./cli');
 const schema = require('../schema');
 
 cli.header("create index");
 
-const client = new es.Client(config.esclient);
+const client = buildClient(config.esclient);
 
 // check minimum elasticsearch versions before continuing
 try {

scripts/drop_index.js

@@ -1,7 +1,7 @@
 const colors = require('colors/safe');
 const config = require('pelias-config').generate();
-const es = require('@elastic/elasticsearch');
-const client = new es.Client(config.esclient);
+const buildClient = require('pelias-elasticsearch');
+const client = buildClient(config.esclient);
 const readline = require('readline');
 const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
 

scripts/info.js

@@ -1,5 +1,5 @@
 var config = require('pelias-config').generate().esclient;
-var es = require('@elastic/elasticsearch');
-var client = new es.Client(config);
+var buildClient = require('pelias-elasticsearch');
+var client = buildClient(config);
 
 client.info( {}, console.log.bind(console) );

scripts/update_settings.js

@@ -1,6 +1,6 @@
 var config = require('pelias-config').generate();
-var es = require('@elastic/elasticsearch');
-var client = new es.Client(config.esclient);
+var buildClient = require('pelias-elasticsearch');
+var client = buildClient(config.esclient);
 var schema = require('../schema');
 
 var _index = config.schema.indexName;

test/elastictest/Suite.js

@@ -1,6 +1,6 @@
 const _ = require('lodash')
 const randomstring = require('randomstring')
-const elasticsearch = require('elasticsearch')
+const buildClient = require('pelias-elasticsearch');
 const async = require('async')
 
 function Suite (clientOpts, props) {
@@ -26,7 +26,7 @@ Suite.prototype.assert = function (assert) {
 }
 
 Suite.prototype.start = function (cb) {
-  this.client = new elasticsearch.Client(this.clientOpts)
+  this.client = buildClient(this.clientOpts)
   cb()
 }