@terascope/elasticsearch-api 4.1.0 → 4.2.0

package/index.js

@@ -67,13 +67,13 @@ export default function elasticsearchApi(client, logger, _opConfig) {
 
     function search(query) {
         const {
-            _sourceInclude, _source_includes,
-            _sourceExclude, _source_excludes,
+            _sourceInclude, _source_includes: oldSourIncludes,
+            _sourceExclude, _source_excludes: oldSourExcludes,
             ...safeQuery
         } = query;
 
-        const sourceIncludes = _sourceInclude || _source_includes;
-        const sourceExcludes = _sourceExclude || _source_excludes;
+        const sourceIncludes = _sourceInclude || oldSourIncludes;
+        const sourceExcludes = _sourceExclude || oldSourExcludes;
 
         if (sourceIncludes) {
             safeQuery._source_includes = sourceIncludes;
@@ -352,13 +352,16 @@ export default function elasticsearchApi(client, logger, _opConfig) {
                 const actionKey = getFirstKey(record.action);
                 const { _type, ...withoutTypeAction } = record.action[actionKey];
                 // if data is specified return both
-                return record.data ? [{
-                    ...record.action,
-                    [actionKey]: withoutTypeAction
-                }, record.data] : [{
-                    ...record.action,
-                    [actionKey]: withoutTypeAction
-                }];
+                return record.data
+                    ? [{
+                        ...record.action,
+                        [actionKey]: withoutTypeAction
+                    },
+                    record.data]
+                    : [{
+                        ...record.action,
+                        [actionKey]: withoutTypeAction
+                    }];
             }
 
             // if data is specified return both
@@ -1098,7 +1101,8 @@ export default function elasticsearchApi(client, logger, _opConfig) {
                 });
                 return Promise.reject(error);
             });
-        }).catch((err) => Promise.reject(err));
+        })
+            .catch((err) => Promise.reject(err));
     }
 
     function _verifyMapping(query, configMapping, recordType) {
@@ -1175,7 +1179,6 @@ export default function elasticsearchApi(client, logger, _opConfig) {
         clientName,
         _time
     ) {
-         
         const giveupAfter = Date.now() + (_time || 10000);
         return new Promise((resolve, reject) => {
             const attemptToCreateIndex = () => {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@terascope/elasticsearch-api",
     "displayName": "Elasticsearch API",
-    "version": "4.1.0",
+    "version": "4.2.0",
     "description": "Elasticsearch client api used across multiple services, handles retries and exponential backoff",
     "homepage": "https://github.com/terascope/teraslice/tree/master/packages/elasticsearch-api#readme",
     "bugs": {
@@ -25,7 +25,7 @@
     },
     "dependencies": {
         "@terascope/types": "^1.1.0",
-        "@terascope/utils": "^1.1.0",
+        "@terascope/utils": "^1.2.0",
         "bluebird": "^3.7.2",
         "setimmediate": "^1.0.5"
     },
@@ -33,7 +33,7 @@
         "@opensearch-project/opensearch": "^1.2.0",
         "@types/elasticsearch": "^5.0.43",
         "elasticsearch": "^15.4.1",
-        "elasticsearch-store": "^1.1.0",
+        "elasticsearch-store": "^1.2.0",
         "elasticsearch6": "npm:@elastic/elasticsearch@^6.7.0",
         "elasticsearch7": "npm:@elastic/elasticsearch@^7.0.0",
         "elasticsearch8": "npm:@elastic/elasticsearch@^8.0.0"

package/test/api-spec.js

@@ -731,10 +731,10 @@ describe('elasticsearch-api', () => {
         return expect(results).toBeTruthy();
     });
 
-    it('can warn window size with version', () => {
+    it('can warn window size with version', async () => {
         const api = esApi(client, logger, { index: 'some_index' });
-
-        return api.version();
+        // FIXME: this test is only really testing a side effect, need a better test
+        expect(api.version).toBeFunction();
     });
 
     it('can call putTemplate', async () => {
@@ -1157,7 +1157,7 @@ describe('elasticsearch-api', () => {
         expect(api.buildQuery(opConfig3, msg4)).toEqual(makeResponse(opConfig3, msg1, response5));
     });
 
-    it('can set up an index', () => {
+    it('can set up an index', async () => {
         const api = esApi(client, logger);
         const clusterName = 'teracluster';
         const newIndex = 'teracluster__state';
@@ -1165,17 +1165,17 @@ describe('elasticsearch-api', () => {
         const recordType = 'state';
         const clientName = 'default';
 
-        return api.indexSetup(
+        await expect(api.indexSetup(
             clusterName,
             newIndex,
             migrantIndexName,
             template,
             recordType,
             clientName
-        );
+        )).resolves.not.toThrow();
     });
 
-    it('can set up an index and wait for availability', () => {
+    it('can set up an index and wait for availability', async () => {
         const api = esApi(client, logger);
         const clusterName = 'teracluster';
         const newIndex = 'teracluster__state';
@@ -1185,7 +1185,7 @@ describe('elasticsearch-api', () => {
 
         searchError = true;
 
-        return Promise.all([
+        await expect(Promise.all([
             waitFor(300, () => {
                 searchError = false;
             }),
@@ -1197,10 +1197,10 @@ describe('elasticsearch-api', () => {
                 recordType,
                 clientName
             )
-        ]);
+        ])).resolves.not.toThrow();
     });
 
-    it('can wait for elasticsearch availability', () => {
+    it('can wait for elasticsearch availability', async () => {
         const api = esApi(client, logger);
         const clusterName = 'teracluster';
         const newIndex = 'teracluster__state';
@@ -1211,7 +1211,7 @@ describe('elasticsearch-api', () => {
         elasticDown = true;
         recoverError = true;
 
-        return Promise.all([
+        await expect(Promise.all([
             api.indexSetup(
                 clusterName,
                 newIndex,
@@ -1227,7 +1227,7 @@ describe('elasticsearch-api', () => {
             waitFor(1200, () => {
                 recoverError = false;
             })
-        ]);
+        ])).resolves.not.toThrow();
     });
 
     it('can send template on state mapping changes, does not migrate', async () => {

package/test/bulk-send-limit-spec.js

@@ -41,7 +41,9 @@ describe('bulkSend', () => {
                 return api.bulkSend(formattedData);
             }, { concurrency: 9 });
 
-            await waitForData(client, index, EvenDateData.data.length, logger, THREE_MINUTES);
+            await expect(
+                waitForData(client, index, EvenDateData.data.length, logger, THREE_MINUTES)
+            ).resolves.not.toThrow();
         });
     });
 });