Merge pull request #3334 from terascope/update-facade-client-tests

Update facade client tests
terascope · Feb 1, 2023 · 20d6e4b · 20d6e4b
2 parents 89fffb5 + d634a86
commit 20d6e4b
Show file tree

Hide file tree

Showing 27 changed files with 249 additions and 104 deletions.
diff --git a/e2e/package.json b/e2e/package.json
@@ -33,7 +33,7 @@
     },
     "devDependencies": {
         "bunyan": "^1.8.15",
-        "elasticsearch-store": "^0.65.2",
+        "elasticsearch-store": "^0.65.3",
         "fs-extra": "^10.1.0",
         "ms": "^2.1.3",
         "nanoid": "^3.3.4",

diff --git a/packages/data-mate/package.json b/packages/data-mate/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@terascope/data-mate",
     "displayName": "Data-Mate",
-    "version": "0.40.1",
+    "version": "0.40.2",
     "description": "Library of data validations/transformations",
     "homepage": "https://github.com/terascope/teraslice/tree/master/packages/data-mate#readme",
     "repository": {
@@ -29,9 +29,9 @@
         "test:watch": "TZ=utc ts-scripts test --watch . --"
     },
     "dependencies": {
-        "@terascope/data-types": "^0.36.2",
-        "@terascope/types": "^0.11.1",
-        "@terascope/utils": "^0.45.2",
+        "@terascope/data-types": "^0.36.3",
+        "@terascope/types": "^0.11.2",
+        "@terascope/utils": "^0.45.3",
         "@types/validator": "^13.7.7",
         "awesome-phonenumber": "^2.70.0",
         "date-fns": "^2.29.3",
@@ -46,7 +46,7 @@
         "uuid": "^9.0.0",
         "valid-url": "^1.0.9",
         "validator": "^13.7.0",
-        "xlucene-parser": "^0.43.2"
+        "xlucene-parser": "^0.43.3"
     },
     "devDependencies": {
         "@types/ip6addr": "^0.2.2",

diff --git a/packages/data-types/package.json b/packages/data-types/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@terascope/data-types",
     "displayName": "Data Types",
-    "version": "0.36.2",
+    "version": "0.36.3",
     "description": "A library for defining the data structures and mapping",
     "homepage": "https://github.com/terascope/teraslice/tree/master/packages/data-types#readme",
     "bugs": {
@@ -26,8 +26,8 @@
         "test:watch": "ts-scripts test --watch . --"
     },
     "dependencies": {
-        "@terascope/types": "^0.11.1",
-        "@terascope/utils": "^0.45.2",
+        "@terascope/types": "^0.11.2",
+        "@terascope/utils": "^0.45.3",
         "graphql": "^14.7.0",
         "lodash": "^4.17.21",
         "yargs": "^17.6.0"

diff --git a/packages/elasticsearch-api/package.json b/packages/elasticsearch-api/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@terascope/elasticsearch-api",
     "displayName": "Elasticsearch API",
-    "version": "3.3.4",
+    "version": "3.3.5",
     "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": {
@@ -22,16 +22,16 @@
         "test:watch": "ts-scripts test --watch . --"
     },
     "dependencies": {
-        "@terascope/types": "^0.11.1",
-        "@terascope/utils": "^0.45.2",
+        "@terascope/types": "^0.11.2",
+        "@terascope/utils": "^0.45.3",
         "bluebird": "^3.7.2",
         "setimmediate": "^1.0.5"
     },
     "devDependencies": {
         "@opensearch-project/opensearch": "^1.1.0",
         "@types/elasticsearch": "^5.0.40",
         "elasticsearch": "^15.4.1",
-        "elasticsearch-store": "^0.65.2",
+        "elasticsearch-store": "^0.65.3",
         "elasticsearch6": "npm:@elastic/elasticsearch@^6.7.0",
         "elasticsearch7": "npm:@elastic/elasticsearch@^7.0.0",
         "elasticsearch8": "npm:@elastic/elasticsearch@^8.0.0"

diff --git a/packages/elasticsearch-store/package.json b/packages/elasticsearch-store/package.json
@@ -1,7 +1,7 @@
 {
     "name": "elasticsearch-store",
     "displayName": "Elasticsearch Store",
-    "version": "0.65.2",
+    "version": "0.65.3",
     "description": "An API for managing an elasticsearch index, with versioning and migration support.",
     "homepage": "https://github.com/terascope/teraslice/tree/master/packages/elasticsearch-store#readme",
     "bugs": {
@@ -29,18 +29,18 @@
     },
     "dependencies": {
         "@opensearch-project/opensearch": "^1.1.0",
-        "@terascope/data-mate": "^0.40.1",
-        "@terascope/data-types": "^0.36.2",
-        "@terascope/types": "^0.11.1",
-        "@terascope/utils": "^0.45.2",
+        "@terascope/data-mate": "^0.40.2",
+        "@terascope/data-types": "^0.36.3",
+        "@terascope/types": "^0.11.2",
+        "@terascope/utils": "^0.45.3",
         "ajv": "^6.12.6",
         "elasticsearch": "^15.4.1",
         "elasticsearch6": "npm:@elastic/elasticsearch@^6.7.0",
         "elasticsearch7": "npm:@elastic/elasticsearch@^7.0.0",
         "elasticsearch8": "npm:@elastic/elasticsearch@^8.0.0",
         "setimmediate": "^1.0.5",
         "uuid": "^9.0.0",
-        "xlucene-translator": "^0.28.3"
+        "xlucene-translator": "^0.28.4"
     },
     "devDependencies": {
         "@types/uuid": "^8.3.4"

diff --git a/packages/elasticsearch-store/src/elasticsearch-client/client.ts b/packages/elasticsearch-store/src/elasticsearch-client/client.ts
@@ -569,7 +569,7 @@ export class Client {
                     distributionMeta
                 );
 
-                const resp = await client.indices.getSettings(parsedParams);
+                const resp = await client.indices.getFieldMapping(parsedParams);
 
                 return _removeBody(resp);
             },
@@ -580,7 +580,7 @@ export class Client {
              * @returns IndicesGetSettingsResponse
              */
             async getSettings(
-                params: ClientParams.IndicesGetSettingsParams
+                params: ClientParams.IndicesGetSettingsParams = {}
             ): Promise<ClientResponse.IndicesGetSettingsResponse> {
                 const parsedParams = methods.convertIndicesGetSettingsParams(
                     params as ClientParams.IndicesGetSettingsParams,
@@ -617,7 +617,7 @@ export class Client {
              * can be an empty query
             */
             async refresh(
-                params: ClientParams.IndicesRefreshParams
+                params: ClientParams.IndicesRefreshParams = {}
             ): Promise<ClientResponse.IndicesRefreshResponse> {
                 const parsedParams = methods.convertIndicesRefreshParams(
                     params as ClientParams.IndicesRefreshParams,
@@ -636,7 +636,7 @@ export class Client {
              * can be an empty query
             */
             async recovery(
-                params: ClientParams.IndicesRecoveryParams
+                params: ClientParams.IndicesRecoveryParams = {}
             ): Promise<ClientResponse.IndicesRecoveryResponse> {
                 const parsedParams = methods.convertIndicesRecoveryParams(
                     params as ClientParams.IndicesRecoveryParams,

diff --git a/packages/elasticsearch-store/src/test-helpers/elasticsearch.ts b/packages/elasticsearch-store/src/test-helpers/elasticsearch.ts
@@ -89,6 +89,18 @@ export async function upload(
     return client.bulk(query);
 }
 
+export function createMappingFromDatatype(
+    client: Client,
+    dataType: DataType,
+    type = '_doc',
+    overrides = {}
+) {
+    const metaData = getClientMetadata(client);
+    const mapping = dataType.toESMapping({ typeName: type, overrides, ...metaData });
+
+    return fixMappingRequest(client, { body: mapping }, false);
+}
+
 export async function populateIndex(
     client: Client,
     index: string,
@@ -103,21 +115,12 @@ export async function populateIndex(
         },
     };
 
-    const metaData = getClientMetadata(client);
-    const mapping = dataType.toESMapping({ typeName: type, overrides, ...metaData });
-
-    await client.indices.create(
-        fixMappingRequest(
-            client,
-            {
-                index,
-                wait_for_active_shards: 'all',
-                body: mapping,
-            },
-            false
-        )
+    const mapping = createMappingFromDatatype(
+        client, dataType, type, overrides
     );
 
+    await client.indices.create(mapping);
+
     const body = formatUploadData(index, records);
 
     const results = await client.bulk({

diff --git a/packages/elasticsearch-store/src/utils/elasticsearch.ts b/packages/elasticsearch-store/src/utils/elasticsearch.ts
@@ -153,6 +153,7 @@ export function isElasticsearch8(client: Client): boolean {
     return distribution === ElasticsearchDistribution.elasticsearch && parsedVersion === 8;
 }
 
+// TODO: move this logic over to datatype
 export function fixMappingRequest(
     client: Client, _params: Record<string, any>, isTemplate: boolean
 ): any {