Merge pull request #185 from DivanteLtd/develop

apiVersion fix

Author: pkarw

config/default.json

@@ -29,7 +29,8 @@
       "attribute",
       "taxrule",
       "review"
-    ]
+    ],
+    "apiVersion": "5.6"
   },
   "redis": {
     "host": "localhost",

migrations/.common.js

@@ -7,7 +7,7 @@ let es = require('elasticsearch')
 const esConfig = {
   host: config.elasticsearch.host + ':' + config.elasticsearch.port,
   log: 'debug',
-  apiVersion: '5.5',
+  apiVersion: config.elasticsearch.apiVersion,
   requestTimeout: 1000 * 60 * 60,
   keepAlive: false
 }

src/api/extensions/gls-parcelshop-dk/cli.js

@@ -21,7 +21,7 @@ cli.command('buildcache', () => {
           port: config.elasticsearch.port
         },
         log: 'debug',
-        apiVersion: '5.5',
+        apiVersion: config.elasticsearch.apiVersion,
         requestTimeout: 1000 * 60 * 60,
         keepAlive: false
       }

src/platform/magento2/tax.js

@@ -64,7 +64,7 @@ class TaxProxy extends AbstractTaxProxy {
         const esConfig = { // as we're runing tax calculation and other data, we need a ES indexer
           host: this._config.elasticsearch.host + ':' + this._config.elasticsearch.port,
           log: 'debug',
-          apiVersion: '5.5',
+          apiVersion: this._config.elasticsearch.apiVersion,
           requestTimeout: 5000
         }
         if (this._config.elasticsearch.user) {