elasticsearch-store 0.66.1 → 0.67.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/elasticsearch-client/create-client.d.ts +3 -2
- package/dist/src/elasticsearch-client/create-client.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/create-client.js +37 -27
- package/dist/src/elasticsearch-client/create-client.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/bulk.d.ts +12 -1
- package/dist/src/elasticsearch-client/method-helpers/bulk.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/bulk.js +4 -0
- package/dist/src/elasticsearch-client/method-helpers/bulk.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/catIndices.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/catIndices.js +6 -6
- package/dist/src/elasticsearch-client/method-helpers/catIndices.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/clusterGetSettings.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/clusterGetSettings.js +2 -1
- package/dist/src/elasticsearch-client/method-helpers/clusterGetSettings.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/clusterHealth.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/clusterHealth.js +6 -10
- package/dist/src/elasticsearch-client/method-helpers/clusterHealth.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/count.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/count.js +2 -6
- package/dist/src/elasticsearch-client/method-helpers/count.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/create.js +1 -1
- package/dist/src/elasticsearch-client/method-helpers/create.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/delete.js +1 -1
- package/dist/src/elasticsearch-client/method-helpers/delete.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/deleteByQuery.js +1 -1
- package/dist/src/elasticsearch-client/method-helpers/deleteByQuery.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/exists.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/exists.js +4 -2
- package/dist/src/elasticsearch-client/method-helpers/exists.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/get.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/get.js +3 -2
- package/dist/src/elasticsearch-client/method-helpers/get.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/helper-utils.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/helper-utils.js +3 -1
- package/dist/src/elasticsearch-client/method-helpers/helper-utils.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/index-method.js +1 -1
- package/dist/src/elasticsearch-client/method-helpers/index-method.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesCreate.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesCreate.js +12 -0
- package/dist/src/elasticsearch-client/method-helpers/indicesCreate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesDelete.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesDelete.js +9 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesDelete.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesDeleteTemplate.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesDeleteTemplate.js +9 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesDeleteTemplate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesExists.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesExists.js +3 -2
- package/dist/src/elasticsearch-client/method-helpers/indicesExists.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesExistsTemplate.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesExistsTemplate.js +7 -0
- package/dist/src/elasticsearch-client/method-helpers/indicesExistsTemplate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGet.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGet.js +11 -2
- package/dist/src/elasticsearch-client/method-helpers/indicesGet.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetFieldMapping.js +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetFieldMapping.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetIndexTemplate.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetIndexTemplate.js +15 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetIndexTemplate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetMapping.d.ts +1 -0
- package/dist/src/elasticsearch-client/method-helpers/indicesGetMapping.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetMapping.js +6 -11
- package/dist/src/elasticsearch-client/method-helpers/indicesGetMapping.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetSettings.d.ts +1 -10
- package/dist/src/elasticsearch-client/method-helpers/indicesGetSettings.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetSettings.js +7 -7
- package/dist/src/elasticsearch-client/method-helpers/indicesGetSettings.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetTemplate.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetTemplate.js +15 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesGetTemplate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesPutMapping.d.ts +2 -0
- package/dist/src/elasticsearch-client/method-helpers/indicesPutMapping.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesPutMapping.js +7 -7
- package/dist/src/elasticsearch-client/method-helpers/indicesPutMapping.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesPutSettings.d.ts +1 -11
- package/dist/src/elasticsearch-client/method-helpers/indicesPutSettings.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesPutSettings.js +5 -6
- package/dist/src/elasticsearch-client/method-helpers/indicesPutSettings.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesPutTemplate.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesPutTemplate.js +7 -0
- package/dist/src/elasticsearch-client/method-helpers/indicesPutTemplate.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesRecovery.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesRecovery.js +3 -2
- package/dist/src/elasticsearch-client/method-helpers/indicesRecovery.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesRefresh.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesRefresh.js +3 -2
- package/dist/src/elasticsearch-client/method-helpers/indicesRefresh.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesStats.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesStats.js +4 -2
- package/dist/src/elasticsearch-client/method-helpers/indicesStats.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesValidateQuery.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/indicesValidateQuery.js +4 -2
- package/dist/src/elasticsearch-client/method-helpers/indicesValidateQuery.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/mget.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/mget.js +23 -0
- package/dist/src/elasticsearch-client/method-helpers/mget.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/msearch.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/msearch.js +14 -0
- package/dist/src/elasticsearch-client/method-helpers/msearch.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/nodesInfo.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/nodesInfo.js +6 -10
- package/dist/src/elasticsearch-client/method-helpers/nodesInfo.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/nodesStats.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/nodesStats.js +6 -10
- package/dist/src/elasticsearch-client/method-helpers/nodesStats.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/reindex.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/reindex.js +5 -1
- package/dist/src/elasticsearch-client/method-helpers/reindex.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/search.js +1 -1
- package/dist/src/elasticsearch-client/method-helpers/search.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/tasksCancel.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/tasksCancel.js +3 -2
- package/dist/src/elasticsearch-client/method-helpers/tasksCancel.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/tasksGet.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/tasksGet.js +3 -2
- package/dist/src/elasticsearch-client/method-helpers/tasksGet.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/tasksList.d.ts.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/tasksList.js +3 -2
- package/dist/src/elasticsearch-client/method-helpers/tasksList.js.map +1 -1
- package/dist/src/elasticsearch-client/method-helpers/update.js +1 -1
- package/dist/src/elasticsearch-client/method-helpers/update.js.map +1 -1
- package/dist/src/index-store.d.ts +1 -0
- package/dist/src/index-store.d.ts.map +1 -1
- package/dist/src/index-store.js +4 -1
- package/dist/src/index-store.js.map +1 -1
- package/dist/src/utils/elasticsearch.d.ts +3 -0
- package/dist/src/utils/elasticsearch.d.ts.map +1 -1
- package/dist/src/utils/elasticsearch.js +19 -2
- package/dist/src/utils/elasticsearch.js.map +1 -1
- package/package.json +9 -7
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Logger } from '@terascope/utils';
|
|
2
|
-
import * as
|
|
2
|
+
import * as opensearch1 from 'opensearch1';
|
|
3
|
+
import * as opensearch2 from 'opensearch2';
|
|
3
4
|
import * as elasticsearch6 from 'elasticsearch6';
|
|
4
5
|
import * as elasticsearch7 from 'elasticsearch7';
|
|
5
6
|
import * as elasticsearch8 from 'elasticsearch8';
|
|
@@ -10,5 +11,5 @@ export declare function createClient(config: ClientConfig, logger?: Logger): Pro
|
|
|
10
11
|
log: () => Logger;
|
|
11
12
|
client: Client;
|
|
12
13
|
}>;
|
|
13
|
-
export declare function getBaseClient(clientMetadata: ClientMetadata, config: ClientConfig, logger?: Logger): Promise<elasticsearch8.Client | elasticsearch7.Client | elasticsearch6.Client |
|
|
14
|
+
export declare function getBaseClient(clientMetadata: ClientMetadata, config: ClientConfig, logger?: Logger): Promise<elasticsearch8.Client | elasticsearch7.Client | elasticsearch6.Client | opensearch2.Client | opensearch1.Client>;
|
|
14
15
|
//# sourceMappingURL=create-client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../../../src/elasticsearch-client/create-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACyB,MAAM,EACrC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"create-client.d.ts","sourceRoot":"","sources":["../../../src/elasticsearch-client/create-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACyB,MAAM,EACrC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,WAAW,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,WAAW,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,cAAc,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,cAAc,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,cAAc,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAA6B,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,wBAAsB,YAAY,CAC9B,MAAM,EAAE,YAAY,EACpB,MAAM,SAAsC,GAC7C,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAahD;AAqDD,wBAAsB,aAAa,CAC/B,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,YAAY,EACpB,MAAM,SAAsC,4HAoE/C"}
|
|
@@ -25,14 +25,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.getBaseClient = exports.createClient = void 0;
|
|
27
27
|
const utils_1 = require("@terascope/utils");
|
|
28
|
-
const
|
|
28
|
+
const opensearch1 = __importStar(require("opensearch1"));
|
|
29
|
+
const opensearch2 = __importStar(require("opensearch2"));
|
|
29
30
|
const elasticsearch6 = __importStar(require("elasticsearch6"));
|
|
30
31
|
const elasticsearch7 = __importStar(require("elasticsearch7"));
|
|
31
32
|
const elasticsearch8 = __importStar(require("elasticsearch8"));
|
|
32
33
|
const types_1 = require("@terascope/types");
|
|
33
34
|
const client_1 = require("./client");
|
|
34
35
|
const log_wrapper_1 = require("./log-wrapper");
|
|
35
|
-
const clientList = [
|
|
36
|
+
const clientList = [opensearch1, opensearch2, elasticsearch7, elasticsearch6, elasticsearch8];
|
|
36
37
|
async function createClient(config, logger = (0, utils_1.debugLogger)('elasticsearch-client')) {
|
|
37
38
|
const distributionMetadata = await getClientMetadata(config, logger);
|
|
38
39
|
const baseClient = await getBaseClient(distributionMetadata, config, logger);
|
|
@@ -85,37 +86,46 @@ async function getClientMetadata(config, logger) {
|
|
|
85
86
|
async function getBaseClient(clientMetadata, config, logger = (0, utils_1.debugLogger)('elasticsearch-client')) {
|
|
86
87
|
const { distribution, majorVersion, minorVersion } = clientMetadata;
|
|
87
88
|
try {
|
|
88
|
-
if (distribution === types_1.ElasticsearchDistribution.opensearch
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
98
|
-
if (majorVersion === 7) {
|
|
99
|
-
// 7.13 and lower needs to use opensearch for now as its backwards
|
|
100
|
-
// compatible, anything past this version the newer client will
|
|
101
|
-
// throw if not their proprietary client
|
|
102
|
-
if (minorVersion <= 13) {
|
|
103
|
-
const client = new opensearch.Client(config);
|
|
104
|
-
logger.debug('Creating an opensearch client for elasticsearch v7 for backwards compatibility');
|
|
89
|
+
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
90
|
+
if (majorVersion === 1) {
|
|
91
|
+
const client = new opensearch1.Client(config);
|
|
92
|
+
logger.debug('Creating an opensearch client v1');
|
|
93
|
+
return client;
|
|
94
|
+
}
|
|
95
|
+
if (majorVersion === 2) {
|
|
96
|
+
const client = new opensearch2.Client(config);
|
|
97
|
+
logger.debug('Creating an opensearch client v2');
|
|
105
98
|
return client;
|
|
106
99
|
}
|
|
107
|
-
const client = new elasticsearch7.Client(config);
|
|
108
|
-
logger.debug('Creating an elasticsearch v7 client');
|
|
109
|
-
return client;
|
|
110
100
|
}
|
|
111
|
-
if (
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
101
|
+
if (distribution === types_1.ElasticsearchDistribution.elasticsearch) {
|
|
102
|
+
if (majorVersion === 8) {
|
|
103
|
+
const client = new elasticsearch8.Client(config);
|
|
104
|
+
logger.debug('Creating an elasticsearch v8 client');
|
|
105
|
+
return client;
|
|
106
|
+
}
|
|
107
|
+
if (majorVersion === 7) {
|
|
108
|
+
// 7.13 and lower needs to use opensearch for now as its backwards
|
|
109
|
+
// compatible, anything past this version the newer client will
|
|
110
|
+
// throw if not their proprietary client
|
|
111
|
+
if (minorVersion <= 13) {
|
|
112
|
+
const client = new opensearch1.Client(config);
|
|
113
|
+
logger.debug('Creating an opensearch client for elasticsearch v7 for backwards compatibility');
|
|
114
|
+
return client;
|
|
115
|
+
}
|
|
116
|
+
const client = new elasticsearch7.Client(config);
|
|
117
|
+
logger.debug('Creating an elasticsearch v7 client');
|
|
118
|
+
return client;
|
|
119
|
+
}
|
|
120
|
+
if (majorVersion === 6) {
|
|
121
|
+
const client = new elasticsearch6.Client(config);
|
|
122
|
+
logger.debug('Creating an elasticsearch v6 client');
|
|
123
|
+
return client;
|
|
124
|
+
}
|
|
115
125
|
}
|
|
116
126
|
throw new Error('no valid client available');
|
|
117
127
|
}
|
|
118
|
-
catch (
|
|
128
|
+
catch (error) {
|
|
119
129
|
throw new Error(`Could not create a client for config ${JSON.stringify(config, null, 4)}`);
|
|
120
130
|
}
|
|
121
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-client.js","sourceRoot":"","sources":["../../../src/elasticsearch-client/create-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAE0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"create-client.js","sourceRoot":"","sources":["../../../src/elasticsearch-client/create-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
import { ClientParams, ClientMetadata } from '@terascope/types';
|
|
2
|
-
export declare function convertBulkParams(params: ClientParams.BulkParams, distributionMeta: ClientMetadata):
|
|
2
|
+
export declare function convertBulkParams(params: ClientParams.BulkParams, distributionMeta: ClientMetadata): {
|
|
3
|
+
index?: string | undefined;
|
|
4
|
+
refresh?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").IndexRefresh | undefined;
|
|
5
|
+
routing?: string | undefined;
|
|
6
|
+
_source?: string | boolean | string[] | undefined;
|
|
7
|
+
_source_excludes?: string | string[] | undefined;
|
|
8
|
+
_source_includes?: string | string[] | undefined;
|
|
9
|
+
timeout?: string | number | undefined;
|
|
10
|
+
wait_for_active_shards?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").WaitForActiveShards | undefined;
|
|
11
|
+
require_alias?: boolean | undefined;
|
|
12
|
+
body?: unknown[] | undefined;
|
|
13
|
+
} | {
|
|
3
14
|
index?: string | undefined;
|
|
4
15
|
refresh?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").IndexRefresh | undefined;
|
|
5
16
|
routing?: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/bulk.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,iBAAiB,CAC7B,MAAM,EAAE,YAAY,CAAC,UAAU,EAC/B,gBAAgB,EAAE,cAAc
|
|
1
|
+
{"version":3,"file":"bulk.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/bulk.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,iBAAiB,CAC7B,MAAM,EAAE,YAAY,CAAC,UAAU,EAC/B,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;EA2CnC"}
|
|
@@ -23,6 +23,10 @@ function convertBulkParams(params, distributionMeta) {
|
|
|
23
23
|
if (majorVersion === 1) {
|
|
24
24
|
return params;
|
|
25
25
|
}
|
|
26
|
+
if (majorVersion === 2) {
|
|
27
|
+
const { type, ...parsedParams } = params;
|
|
28
|
+
return parsedParams;
|
|
29
|
+
}
|
|
26
30
|
}
|
|
27
31
|
throw new Error(`Unsupported ${distribution} version ${version}`);
|
|
28
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/bulk.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,iBAAiB,CAC7B,MAA+B,EAC/B,gBAAgC;IAEhC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC;IAEjE,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EACJ,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,UAAU,EAAE,IAAI;gBAChB,GAAG,YAAY;aAClB,CAAC;SACL;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;
|
|
1
|
+
{"version":3,"file":"bulk.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/bulk.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,iBAAiB,CAC7B,MAA+B,EAC/B,gBAAgC;IAEhC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC;IAEjE,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EACJ,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,UAAU,EAAE,IAAI;gBAChB,GAAG,YAAY;aAClB,CAAC;SACL;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AA7CD,8CA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catIndices.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/catIndices.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,uBAAuB,CACnC,MAAM,EAAE,YAAY,CAAC,gBAAgB,EACrC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"catIndices.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/catIndices.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,uBAAuB,CACnC,MAAM,EAAE,YAAY,CAAC,gBAAgB,EACrC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;EAuCnC"}
|
|
@@ -14,13 +14,13 @@ function convertCatIndicesParams(params, distributionMeta) {
|
|
|
14
14
|
}
|
|
15
15
|
}
|
|
16
16
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
17
|
-
|
|
17
|
+
// No major changes between the two as provided below
|
|
18
|
+
if (majorVersion === 1 || majorVersion === 2) {
|
|
18
19
|
const { master_timeout, ...parsedParams } = params;
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
23
|
-
return parsedParams;
|
|
20
|
+
return {
|
|
21
|
+
...parsedParams,
|
|
22
|
+
...(master_timeout !== undefined && { cluster_manager_timeout: master_timeout }),
|
|
23
|
+
};
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
throw new Error(`Unsupported ${distribution} version ${version}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catIndices.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/catIndices.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,uBAAuB,CACnC,MAAqC,EACrC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,cAAc,EACd,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"catIndices.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/catIndices.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,uBAAuB,CACnC,MAAqC,EACrC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,cAAc,EACd,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,qDAAqD;QACrD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,MAAM,EACF,cAAc,EACd,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,GAAG,YAAY;gBACf,GAAG,CAAC,cAAc,KAAK,SAAS,IAAI,EAAE,uBAAuB,EAAE,cAAc,EAAE,CAAC;aACnF,CAAC;SACL;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAzCD,0DAyCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clusterGetSettings.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/clusterGetSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,4BAA4B,CACxC,MAAM,EAAE,YAAY,CAAC,wBAAwB,EAC7C,gBAAgB,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"clusterGetSettings.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/clusterGetSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,4BAA4B,CACxC,MAAM,EAAE,YAAY,CAAC,wBAAwB,EAC7C,gBAAgB,EAAE,cAAc,yCAsBnC"}
|
|
@@ -9,8 +9,9 @@ function convertClusterSettingsParams(params, distributionMeta) {
|
|
|
9
9
|
return params;
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
|
+
// No major changes between the two as provided below
|
|
12
13
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
13
|
-
if (majorVersion === 1) {
|
|
14
|
+
if (majorVersion === 1 || majorVersion === 2) {
|
|
14
15
|
return params;
|
|
15
16
|
}
|
|
16
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clusterGetSettings.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/clusterGetSettings.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,4BAA4B,CACxC,MAA6C,EAC7C,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAClC,OAAO,MAAM,CAAC;SACjB;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"clusterGetSettings.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/clusterGetSettings.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,4BAA4B,CACxC,MAA6C,EAC7C,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAClC,OAAO,MAAM,CAAC;SACjB;KACJ;IAED,qDAAqD;IACrD,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,MAAM,CAAC;SACjB;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAxBD,oEAwBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clusterHealth.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/clusterHealth.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,YAAY,CAAC,mBAAmB,EACxC,gBAAgB,EAAE,cAAc;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"clusterHealth.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/clusterHealth.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,YAAY,CAAC,mBAAmB,EACxC,gBAAgB,EAAE,cAAc;;;;;;;;;;;EAuCnC"}
|
|
@@ -5,10 +5,7 @@ const types_1 = require("@terascope/types");
|
|
|
5
5
|
function convertClusterHealthParams(params, distributionMeta) {
|
|
6
6
|
const { majorVersion, distribution, version } = distributionMeta;
|
|
7
7
|
if (distribution === types_1.ElasticsearchDistribution.elasticsearch) {
|
|
8
|
-
if (majorVersion === 8) {
|
|
9
|
-
return params;
|
|
10
|
-
}
|
|
11
|
-
if (majorVersion === 7) {
|
|
8
|
+
if (majorVersion === 7 || majorVersion === 8) {
|
|
12
9
|
return params;
|
|
13
10
|
}
|
|
14
11
|
if (majorVersion === 6) {
|
|
@@ -18,13 +15,12 @@ function convertClusterHealthParams(params, distributionMeta) {
|
|
|
18
15
|
throw new Error(`Unsupported elasticsearch version: ${version}`);
|
|
19
16
|
}
|
|
20
17
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
21
|
-
if (majorVersion === 1) {
|
|
18
|
+
if (majorVersion === 1 || majorVersion === 2) {
|
|
22
19
|
const { master_timeout, ...parsedParams } = params;
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
}
|
|
27
|
-
return parsedParams;
|
|
20
|
+
return {
|
|
21
|
+
...parsedParams,
|
|
22
|
+
...(master_timeout !== undefined && { cluster_manager_timeout: master_timeout }),
|
|
23
|
+
};
|
|
28
24
|
}
|
|
29
25
|
// future version will have master_timeout gone, renamed to cluster_manager_timeout
|
|
30
26
|
throw new Error(`Unsupported opensearch version: ${version}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clusterHealth.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/clusterHealth.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,0BAA0B,CACtC,MAAwC,EACxC,gBAAgC;IAEhC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC;IAEjE,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"clusterHealth.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/clusterHealth.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,0BAA0B,CACtC,MAAwC,EACxC,gBAAgC;IAEhC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,gBAAgB,CAAC;IAEjE,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,cAAc,EACd,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;QAED,MAAM,IAAI,KAAK,CAAC,sCAAsC,OAAO,EAAE,CAAC,CAAC;KACpE;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,MAAM,EACF,cAAc,EACd,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,GAAG,YAAY;gBACf,GAAG,CAAC,cAAc,KAAK,SAAS,IAAI,EAAE,uBAAuB,EAAE,cAAc,EAAE,CAAC;aACnF,CAAC;SACL;QAED,mFAAmF;QACnF,MAAM,IAAI,KAAK,CAAC,mCAAmC,OAAO,EAAE,CAAC,CAAC;KACjE;IAED,MAAM,IAAI,KAAK,CAAC,4BAA4B,YAAY,EAAE,CAAC,CAAC;AAChE,CAAC;AAzCD,gEAyCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/count.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,kBAAkB,CAC9B,MAAM,EAAE,YAAY,CAAC,WAAW,EAChC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/count.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,kBAAkB,CAC9B,MAAM,EAAE,YAAY,CAAC,WAAW,EAChC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;EAkCnC"}
|
|
@@ -5,21 +5,17 @@ const types_1 = require("@terascope/types");
|
|
|
5
5
|
function convertCountParams(params, distributionMeta) {
|
|
6
6
|
const { majorVersion, distribution, version } = distributionMeta;
|
|
7
7
|
if (distribution === types_1.ElasticsearchDistribution.elasticsearch) {
|
|
8
|
-
if (majorVersion === 8) {
|
|
8
|
+
if (majorVersion === 8 || majorVersion === 7) {
|
|
9
9
|
// make sure to remove type
|
|
10
10
|
const { type, ...parsedParams } = params;
|
|
11
11
|
return parsedParams;
|
|
12
12
|
}
|
|
13
|
-
if (majorVersion === 7) {
|
|
14
|
-
const { type, ...parsedParams } = params;
|
|
15
|
-
return parsedParams;
|
|
16
|
-
}
|
|
17
13
|
if (majorVersion === 6) {
|
|
18
14
|
return params;
|
|
19
15
|
}
|
|
20
16
|
}
|
|
21
17
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
22
|
-
if (majorVersion === 1) {
|
|
18
|
+
if (majorVersion === 1 || majorVersion === 2) {
|
|
23
19
|
const { type, ...parsedParams } = params;
|
|
24
20
|
return parsedParams;
|
|
25
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/count.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,kBAAkB,CAC9B,MAAgC,EAChC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"count.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/count.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,kBAAkB,CAC9B,MAAgC,EAChC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,2BAA2B;YAC3B,MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AApCD,gDAoCC"}
|
|
@@ -25,7 +25,7 @@ function convertCreateParams(params, distributionMeta) {
|
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
28
|
-
if (majorVersion === 1) {
|
|
28
|
+
if (majorVersion === 1 || majorVersion === 2) {
|
|
29
29
|
const { type, ...parsedParams } = params;
|
|
30
30
|
return parsedParams;
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/create.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EAAE,IAAI,EAAE,GAAG,YAAY,EAC9B,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,QAAQ,EAAE,IAAI;gBACd,GAAG,YAAY;aAClB,CAAC;SACL;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,GAAG,MAAM,EACb,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/create.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EAAE,IAAI,EAAE,GAAG,YAAY,EAC9B,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,QAAQ,EAAE,IAAI;gBACd,GAAG,YAAY;aAClB,CAAC;SACL;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,GAAG,MAAM,EACb,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAtDD,kDAsDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/delete.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,IAAI,GAAG,MAAM,EACb,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,YAAY,CAAC;SACvB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/delete.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,IAAI,GAAG,MAAM,EACb,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,YAAY,CAAC;SACvB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,YAAY,CAAC;SACvB;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAnCD,kDAmCC"}
|
|
@@ -23,7 +23,7 @@ function convertDeleteByQueryParams(params, distributionMeta) {
|
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
26
|
-
if (majorVersion === 1) {
|
|
26
|
+
if (majorVersion === 1 || majorVersion === 2) {
|
|
27
27
|
return {
|
|
28
28
|
body,
|
|
29
29
|
...parsedParams
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteByQuery.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/deleteByQuery.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,0BAA0B,CACtC,MAAwC,EACxC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,sDAAsD;IACtD,oEAAoE;IACpE,MAAM,EACF,IAAI,GAAG,MAAM,EACb,IAAI,GAAG,EAAE,EACT,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO;gBACH,IAAI;gBACJ,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"deleteByQuery.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/deleteByQuery.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,0BAA0B,CACtC,MAAwC,EACxC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,sDAAsD;IACtD,oEAAoE;IACpE,MAAM,EACF,IAAI,GAAG,MAAM,EACb,IAAI,GAAG,EAAE,EACT,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO;gBACH,IAAI;gBACJ,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC;AA7CD,gEA6CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exists.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/exists.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,mBAAmB,CAC/B,MAAM,EAAE,YAAY,CAAC,YAAY,EACjC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"exists.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/exists.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,mBAAmB,CAC/B,MAAM,EAAE,YAAY,CAAC,YAAY,EACjC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;EAiCnC"}
|
|
@@ -6,8 +6,9 @@ function convertExistsParams(params, distributionMeta) {
|
|
|
6
6
|
const { majorVersion, distribution, version } = distributionMeta;
|
|
7
7
|
const { type = '_doc', ...parsedParams } = params;
|
|
8
8
|
if (distribution === types_1.ElasticsearchDistribution.elasticsearch) {
|
|
9
|
-
if (majorVersion === 8 || majorVersion === 7)
|
|
9
|
+
if (majorVersion === 8 || majorVersion === 7) {
|
|
10
10
|
return parsedParams;
|
|
11
|
+
}
|
|
11
12
|
if (majorVersion === 6) {
|
|
12
13
|
return {
|
|
13
14
|
type,
|
|
@@ -16,8 +17,9 @@ function convertExistsParams(params, distributionMeta) {
|
|
|
16
17
|
}
|
|
17
18
|
}
|
|
18
19
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
19
|
-
if (majorVersion === 1)
|
|
20
|
+
if (majorVersion === 1 || majorVersion === 2) {
|
|
20
21
|
return parsedParams;
|
|
22
|
+
}
|
|
21
23
|
}
|
|
22
24
|
throw new Error(`Unsupported ${distribution} version ${version}`);
|
|
23
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exists.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/exists.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,IAAI,GAAG,MAAM,EACb,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"exists.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/exists.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,IAAI,GAAG,MAAM,EACb,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,YAAY,CAAC;SACvB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,YAAY,CAAC;SACvB;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAnCD,kDAmCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,YAAY,CAAC,YAAY,EACjC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,YAAY,CAAC,YAAY,EACjC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;EAiCnC"}
|
|
@@ -6,8 +6,9 @@ function convertGetParams(params, distributionMeta) {
|
|
|
6
6
|
const { majorVersion, distribution, version } = distributionMeta;
|
|
7
7
|
const { type = '_doc', ...parsedParams } = params;
|
|
8
8
|
if (distribution === types_1.ElasticsearchDistribution.elasticsearch) {
|
|
9
|
-
if (majorVersion === 8 || majorVersion === 7)
|
|
9
|
+
if (majorVersion === 8 || majorVersion === 7) {
|
|
10
10
|
return parsedParams;
|
|
11
|
+
}
|
|
11
12
|
if (majorVersion === 6) {
|
|
12
13
|
return {
|
|
13
14
|
type,
|
|
@@ -16,7 +17,7 @@ function convertGetParams(params, distributionMeta) {
|
|
|
16
17
|
}
|
|
17
18
|
}
|
|
18
19
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
19
|
-
if (majorVersion === 1) {
|
|
20
|
+
if (majorVersion === 1 || majorVersion === 2) {
|
|
20
21
|
return parsedParams;
|
|
21
22
|
}
|
|
22
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/get.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,gBAAgB,CAC5B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,IAAI,GAAG,MAAM,EACb,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/get.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,gBAAgB,CAC5B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,IAAI,GAAG,MAAM,EACb,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,YAAY,CAAC;SACvB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,OAAO,YAAY,CAAC;SACvB;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAnCD,4CAmCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper-utils.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/helper-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEtF,wBAAgB,oBAAoB,CAChC,gBAAgB,EAAE,cAAc,QAWnC;
|
|
1
|
+
{"version":3,"file":"helper-utils.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/helper-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEtF,wBAAgB,oBAAoB,CAChC,gBAAgB,EAAE,cAAc,QAWnC;AAgBD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS;;cAQ9E;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,uBAAuB,GAAG,SAAS,+CAQpF"}
|
|
@@ -11,9 +11,11 @@ function validateDistribution(distributionMeta) {
|
|
|
11
11
|
exports.validateDistribution = validateDistribution;
|
|
12
12
|
function validDistributionAndVersion(distribution, majorVersion) {
|
|
13
13
|
const supportedEsVersions = [6, 7, 8];
|
|
14
|
+
const supportedOpenVersions = [1, 2];
|
|
14
15
|
return (distribution === types_1.ElasticsearchDistribution.elasticsearch
|
|
15
16
|
&& supportedEsVersions.includes(majorVersion))
|
|
16
|
-
|| (distribution === types_1.ElasticsearchDistribution.opensearch
|
|
17
|
+
|| (distribution === types_1.ElasticsearchDistribution.opensearch
|
|
18
|
+
&& supportedOpenVersions.includes(majorVersion));
|
|
17
19
|
}
|
|
18
20
|
function ensureNoTypeInMapping(mappings) {
|
|
19
21
|
if (mappings != null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper-utils.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/helper-utils.ts"],"names":[],"mappings":";;;AAAA,4CAAsF;AAEtF,SAAgB,oBAAoB,CAChC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,CAAC,2BAA2B,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE;QAC1D,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;KACtE;AACL,CAAC;AAZD,oDAYC;AAED,SAAS,2BAA2B,CAChC,YAAuC,EACvC,YAAoB;IAEpB,MAAM,mBAAmB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"helper-utils.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/helper-utils.ts"],"names":[],"mappings":";;;AAAA,4CAAsF;AAEtF,SAAgB,oBAAoB,CAChC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,CAAC,2BAA2B,CAAC,YAAY,EAAE,YAAY,CAAC,EAAE;QAC1D,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;KACtE;AACL,CAAC;AAZD,oDAYC;AAED,SAAS,2BAA2B,CAChC,YAAuC,EACvC,YAAoB;IAEpB,MAAM,mBAAmB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACtC,MAAM,qBAAqB,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAErC,OAAO,CAAC,YAAY,KAAK,iCAAyB,CAAC,aAAa;WACzD,mBAAmB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;WAC3C,CAAC,YAAY,KAAK,iCAAyB,CAAC,UAAU;eACrD,qBAAqB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAC/C,CAAC;AACV,CAAC;AAED,SAAgB,qBAAqB,CAAC,QAAyC;IAC3E,IAAI,QAAQ,IAAI,IAAI,EAAE;QAClB,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC3C,IAAI,CAAC,KAAK,YAAY;gBAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;YAE1C,IAAI,CAAC,CAAC,UAAU;gBAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;SACzD;KACJ;AACL,CAAC;AARD,sDAQC;AAED,SAAgB,mBAAmB,CAAC,IAAiD;;IACjF,IAAI,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,0CAAE,UAAU,EAAE;QAC5B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;QAErC,IAAI,CAAC,QAAQ,GAAG,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC;KAC5C;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AARD,kDAQC"}
|
|
@@ -27,7 +27,7 @@ function convertIndexParams(params, distributionMeta) {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
30
|
-
if (majorVersion === 1) {
|
|
30
|
+
if (majorVersion === 1 || majorVersion === 2) {
|
|
31
31
|
const { type, ...parsedParams } = params;
|
|
32
32
|
return parsedParams;
|
|
33
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-method.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/index-method.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,kBAAkB,CAC9B,MAAgC,EAChC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,2BAA2B;YAC3B,MAAM,EACF,IAAI,EAAE,IAAI,EAAE,GAAG,YAAY,EAC9B,GAAG,MAAM,CAAC;YACX,yBAAyB;YACzB,OAAO;gBACH,QAAQ,EAAE,IAAI;gBACd,GAAG,YAAY;aAClB,CAAC;SACL;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,GAAG,MAAM,EAAE,GAAG,YAAY,EACjC,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"index-method.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/index-method.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,kBAAkB,CAC9B,MAAgC,EAChC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,2BAA2B;YAC3B,MAAM,EACF,IAAI,EAAE,IAAI,EAAE,GAAG,YAAY,EAC9B,GAAG,MAAM,CAAC;YACX,yBAAyB;YACzB,OAAO;gBACH,QAAQ,EAAE,IAAI;gBACd,GAAG,YAAY;aAClB,CAAC;SACL;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,GAAG,MAAM,EAAE,GAAG,YAAY,EACjC,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,IAAI;gBACJ,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;YAC1C,MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,OAAO,YAAY,CAAC;SACvB;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAtDD,gDAsDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indicesCreate.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/indicesCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAO3F,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,YAAY,CAAC,mBAAmB,EACxC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"indicesCreate.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/indicesCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAO3F,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,YAAY,CAAC,mBAAmB,EACxC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;EAuEnC"}
|
|
@@ -32,6 +32,18 @@ function convertIndicesCreateParams(params, distributionMeta) {
|
|
|
32
32
|
if (majorVersion === 1) {
|
|
33
33
|
return params;
|
|
34
34
|
}
|
|
35
|
+
if (majorVersion === 2) {
|
|
36
|
+
const { include_type_name, master_timeout, body, ...parsedParams } = params;
|
|
37
|
+
const newBody = {
|
|
38
|
+
...body,
|
|
39
|
+
mappings: (0, helper_utils_1.ensureNoTypeInMapping)(body === null || body === void 0 ? void 0 : body.mappings),
|
|
40
|
+
};
|
|
41
|
+
return {
|
|
42
|
+
...parsedParams,
|
|
43
|
+
body: newBody,
|
|
44
|
+
...(master_timeout !== undefined && { cluster_manager_timeout: master_timeout }),
|
|
45
|
+
};
|
|
46
|
+
}
|
|
35
47
|
}
|
|
36
48
|
throw new Error(`unsupported ${distribution} version: ${version}`);
|
|
37
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indicesCreate.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/indicesCreate.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,iDAGwB;AAExB,SAAgB,0BAA0B,CACtC,MAAwC,EACxC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,iBAAiB,EACjB,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO;gBACtB,4BAA4B;gBAC5B,QAAQ,EAAE,IAAA,oCAAqB,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC;gBAC/C,QAAQ,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ;gBACxB,GAAG,YAAY;aAClB,CAAC;SACL;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EACJ,iBAAiB,EACjB,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,iBAAiB,EAAE,IAAI;gBACvB,IAAI,EAAE,IAAA,kCAAmB,EAAC,IAAI,CAAC;gBAC/B,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC;
|
|
1
|
+
{"version":3,"file":"indicesCreate.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/indicesCreate.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,iDAGwB;AAExB,SAAgB,0BAA0B,CACtC,MAAwC,EACxC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,iBAAiB,EACjB,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO;gBACtB,4BAA4B;gBAC5B,QAAQ,EAAE,IAAA,oCAAqB,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC;gBAC/C,QAAQ,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ;gBACxB,GAAG,YAAY;aAClB,CAAC;SACL;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,IAAI,EACJ,iBAAiB,EACjB,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,iBAAiB,EAAE,IAAI;gBACvB,IAAI,EAAE,IAAA,kCAAmB,EAAC,IAAI,CAAC;gBAC/B,GAAG,YAAY;aAClB,CAAC;SACL;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EACF,iBAAiB,EACjB,cAAc,EACd,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,MAAM,OAAO,GAAG;gBACZ,GAAG,IAAI;gBACP,QAAQ,EAAE,IAAA,oCAAqB,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC;aAClD,CAAC;YAEF,OAAO;gBACH,GAAG,YAAY;gBACf,IAAI,EAAE,OAAO;gBACb,GAAG,CAAC,cAAc,KAAK,SAAS,IAAI,EAAE,uBAAuB,EAAE,cAAc,EAAE,CAAC;aACnF,CAAC;SACL;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC;AAzED,gEAyEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indicesDelete.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/indicesDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,YAAY,CAAC,mBAAmB,EACxC,gBAAgB,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"indicesDelete.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/indicesDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,0BAA0B,CACtC,MAAM,EAAE,YAAY,CAAC,mBAAmB,EACxC,gBAAgB,EAAE,cAAc,oCA8BnC"}
|
|
@@ -5,13 +5,21 @@ const types_1 = require("@terascope/types");
|
|
|
5
5
|
function convertIndicesDeleteParams(params, distributionMeta) {
|
|
6
6
|
const { majorVersion, distribution, version } = distributionMeta;
|
|
7
7
|
if (distribution === types_1.ElasticsearchDistribution.elasticsearch) {
|
|
8
|
-
if ([6, 7, 8].includes(majorVersion))
|
|
8
|
+
if ([6, 7, 8].includes(majorVersion)) {
|
|
9
9
|
return params;
|
|
10
|
+
}
|
|
10
11
|
}
|
|
11
12
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
12
13
|
if (majorVersion === 1) {
|
|
13
14
|
return params;
|
|
14
15
|
}
|
|
16
|
+
if (majorVersion === 2) {
|
|
17
|
+
const { master_timeout, ...parsedParams } = params;
|
|
18
|
+
return {
|
|
19
|
+
...parsedParams,
|
|
20
|
+
...(master_timeout !== undefined && { cluster_manager_timeout: master_timeout }),
|
|
21
|
+
};
|
|
22
|
+
}
|
|
15
23
|
}
|
|
16
24
|
throw new Error(`unsupported ${distribution} version: ${version}`);
|
|
17
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indicesDelete.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/indicesDelete.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,0BAA0B,CACtC,MAAwC,EACxC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"indicesDelete.js","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/indicesDelete.ts"],"names":[],"mappings":";;;AAAA,4CAA2F;AAE3F,SAAgB,0BAA0B,CACtC,MAAwC,EACxC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,iCAAyB,CAAC,aAAa,EAAE;QAC1D,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YAClC,OAAO,MAAM,CAAC;SACjB;KACJ;IAED,IAAI,YAAY,KAAK,iCAAyB,CAAC,UAAU,EAAE;QACvD,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,YAAY,KAAK,CAAC,EAAE;YACpB,MAAM,EAAE,cAAc,EAAE,GAAG,YAAY,EAAE,GAAG,MAAM,CAAC;YAEnD,OAAO;gBACH,GAAG,YAAY;gBACf,GAAG,CAAC,cAAc,KAAK,SAAS,IAAI,EAAE,uBAAuB,EAAE,cAAc,EAAE,CAAC;aACnF,CAAC;SACL;KACJ;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC;AAhCD,gEAgCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indicesDeleteTemplate.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/indicesDeleteTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,kCAAkC,CAC9C,MAAM,EAAE,YAAY,CAAC,2BAA2B,EAChD,gBAAgB,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"indicesDeleteTemplate.d.ts","sourceRoot":"","sources":["../../../../src/elasticsearch-client/method-helpers/indicesDeleteTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,kCAAkC,CAC9C,MAAM,EAAE,YAAY,CAAC,2BAA2B,EAChD,gBAAgB,EAAE,cAAc,4CA8BnC"}
|
|
@@ -5,13 +5,21 @@ const types_1 = require("@terascope/types");
|
|
|
5
5
|
function convertIndicesDeleteTemplateParams(params, distributionMeta) {
|
|
6
6
|
const { majorVersion, distribution, version } = distributionMeta;
|
|
7
7
|
if (distribution === types_1.ElasticsearchDistribution.elasticsearch) {
|
|
8
|
-
if ([6, 7, 8].includes(majorVersion))
|
|
8
|
+
if ([6, 7, 8].includes(majorVersion)) {
|
|
9
9
|
return params;
|
|
10
|
+
}
|
|
10
11
|
}
|
|
11
12
|
if (distribution === types_1.ElasticsearchDistribution.opensearch) {
|
|
12
13
|
if (majorVersion === 1) {
|
|
13
14
|
return params;
|
|
14
15
|
}
|
|
16
|
+
if (majorVersion === 2) {
|
|
17
|
+
const { master_timeout, ...parsedParams } = params;
|
|
18
|
+
return {
|
|
19
|
+
...parsedParams,
|
|
20
|
+
...(master_timeout !== undefined && { cluster_manager_timeout: master_timeout }),
|
|
21
|
+
};
|
|
22
|
+
}
|
|
15
23
|
}
|
|
16
24
|
throw new Error(`unsupported ${distribution} version: ${version}`);
|
|
17
25
|
}
|