@terascope/opensearch-client 2.1.0 → 2.2.1

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.
Files changed (152) hide show
  1. package/dist/src/client/create-client.d.ts +1 -3
  2. package/dist/src/client/create-client.d.ts.map +1 -1
  3. package/dist/src/client/create-client.js +6 -24
  4. package/dist/src/client/create-client.js.map +1 -1
  5. package/dist/src/client/method-helpers/bulk.d.ts +1 -12
  6. package/dist/src/client/method-helpers/bulk.d.ts.map +1 -1
  7. package/dist/src/client/method-helpers/bulk.js +0 -12
  8. package/dist/src/client/method-helpers/bulk.js.map +1 -1
  9. package/dist/src/client/method-helpers/catIndices.d.ts +15 -1
  10. package/dist/src/client/method-helpers/catIndices.d.ts.map +1 -1
  11. package/dist/src/client/method-helpers/catIndices.js +0 -5
  12. package/dist/src/client/method-helpers/catIndices.js.map +1 -1
  13. package/dist/src/client/method-helpers/clusterGetSettings.d.ts.map +1 -1
  14. package/dist/src/client/method-helpers/clusterGetSettings.js +0 -5
  15. package/dist/src/client/method-helpers/clusterGetSettings.js.map +1 -1
  16. package/dist/src/client/method-helpers/clusterHealth.d.ts +13 -1
  17. package/dist/src/client/method-helpers/clusterHealth.d.ts.map +1 -1
  18. package/dist/src/client/method-helpers/clusterHealth.js +0 -6
  19. package/dist/src/client/method-helpers/clusterHealth.js.map +1 -1
  20. package/dist/src/client/method-helpers/count.d.ts.map +1 -1
  21. package/dist/src/client/method-helpers/count.js +0 -5
  22. package/dist/src/client/method-helpers/count.js.map +1 -1
  23. package/dist/src/client/method-helpers/create.d.ts +1 -11
  24. package/dist/src/client/method-helpers/create.d.ts.map +1 -1
  25. package/dist/src/client/method-helpers/create.js +0 -12
  26. package/dist/src/client/method-helpers/create.js.map +1 -1
  27. package/dist/src/client/method-helpers/delete.d.ts.map +1 -1
  28. package/dist/src/client/method-helpers/delete.js +0 -5
  29. package/dist/src/client/method-helpers/delete.js.map +1 -1
  30. package/dist/src/client/method-helpers/deleteByQuery.d.ts.map +1 -1
  31. package/dist/src/client/method-helpers/deleteByQuery.js +0 -8
  32. package/dist/src/client/method-helpers/deleteByQuery.js.map +1 -1
  33. package/dist/src/client/method-helpers/exists.d.ts.map +1 -1
  34. package/dist/src/client/method-helpers/exists.js +0 -5
  35. package/dist/src/client/method-helpers/exists.js.map +1 -1
  36. package/dist/src/client/method-helpers/get.d.ts.map +1 -1
  37. package/dist/src/client/method-helpers/get.js +0 -5
  38. package/dist/src/client/method-helpers/get.js.map +1 -1
  39. package/dist/src/client/method-helpers/helper-utils.js +2 -5
  40. package/dist/src/client/method-helpers/helper-utils.js.map +1 -1
  41. package/dist/src/client/method-helpers/index-method.d.ts +1 -14
  42. package/dist/src/client/method-helpers/index-method.d.ts.map +1 -1
  43. package/dist/src/client/method-helpers/index-method.js +0 -14
  44. package/dist/src/client/method-helpers/index-method.js.map +1 -1
  45. package/dist/src/client/method-helpers/indicesCreate.d.ts +1 -11
  46. package/dist/src/client/method-helpers/indicesCreate.d.ts.map +1 -1
  47. package/dist/src/client/method-helpers/indicesCreate.js +0 -15
  48. package/dist/src/client/method-helpers/indicesCreate.js.map +1 -1
  49. package/dist/src/client/method-helpers/indicesDelete.d.ts.map +1 -1
  50. package/dist/src/client/method-helpers/indicesDelete.js +0 -5
  51. package/dist/src/client/method-helpers/indicesDelete.js.map +1 -1
  52. package/dist/src/client/method-helpers/indicesDeleteTemplate.d.ts.map +1 -1
  53. package/dist/src/client/method-helpers/indicesDeleteTemplate.js +0 -5
  54. package/dist/src/client/method-helpers/indicesDeleteTemplate.js.map +1 -1
  55. package/dist/src/client/method-helpers/indicesExists.d.ts.map +1 -1
  56. package/dist/src/client/method-helpers/indicesExists.js +0 -5
  57. package/dist/src/client/method-helpers/indicesExists.js.map +1 -1
  58. package/dist/src/client/method-helpers/indicesExistsTemplate.d.ts.map +1 -1
  59. package/dist/src/client/method-helpers/indicesExistsTemplate.js +0 -4
  60. package/dist/src/client/method-helpers/indicesExistsTemplate.js.map +1 -1
  61. package/dist/src/client/method-helpers/indicesGet.d.ts.map +1 -1
  62. package/dist/src/client/method-helpers/indicesGet.js +0 -5
  63. package/dist/src/client/method-helpers/indicesGet.js.map +1 -1
  64. package/dist/src/client/method-helpers/indicesGetFieldMapping.d.ts.map +1 -1
  65. package/dist/src/client/method-helpers/indicesGetFieldMapping.js +0 -5
  66. package/dist/src/client/method-helpers/indicesGetFieldMapping.js.map +1 -1
  67. package/dist/src/client/method-helpers/indicesGetIndexTemplate.d.ts.map +1 -1
  68. package/dist/src/client/method-helpers/indicesGetIndexTemplate.js +0 -5
  69. package/dist/src/client/method-helpers/indicesGetIndexTemplate.js.map +1 -1
  70. package/dist/src/client/method-helpers/indicesGetMapping.d.ts +8 -1
  71. package/dist/src/client/method-helpers/indicesGetMapping.d.ts.map +1 -1
  72. package/dist/src/client/method-helpers/indicesGetMapping.js +0 -5
  73. package/dist/src/client/method-helpers/indicesGetMapping.js.map +1 -1
  74. package/dist/src/client/method-helpers/indicesGetSettings.d.ts +11 -1
  75. package/dist/src/client/method-helpers/indicesGetSettings.d.ts.map +1 -1
  76. package/dist/src/client/method-helpers/indicesGetSettings.js +0 -5
  77. package/dist/src/client/method-helpers/indicesGetSettings.js.map +1 -1
  78. package/dist/src/client/method-helpers/indicesGetTemplate.d.ts.map +1 -1
  79. package/dist/src/client/method-helpers/indicesGetTemplate.js +0 -5
  80. package/dist/src/client/method-helpers/indicesGetTemplate.js.map +1 -1
  81. package/dist/src/client/method-helpers/indicesPutMapping.d.ts +25 -1
  82. package/dist/src/client/method-helpers/indicesPutMapping.d.ts.map +1 -1
  83. package/dist/src/client/method-helpers/indicesPutMapping.js +0 -5
  84. package/dist/src/client/method-helpers/indicesPutMapping.js.map +1 -1
  85. package/dist/src/client/method-helpers/indicesPutSettings.d.ts +3 -4
  86. package/dist/src/client/method-helpers/indicesPutSettings.d.ts.map +1 -1
  87. package/dist/src/client/method-helpers/indicesPutSettings.js +0 -12
  88. package/dist/src/client/method-helpers/indicesPutSettings.js.map +1 -1
  89. package/dist/src/client/method-helpers/indicesPutTemplate.d.ts +1 -13
  90. package/dist/src/client/method-helpers/indicesPutTemplate.d.ts.map +1 -1
  91. package/dist/src/client/method-helpers/indicesPutTemplate.js +0 -18
  92. package/dist/src/client/method-helpers/indicesPutTemplate.js.map +1 -1
  93. package/dist/src/client/method-helpers/indicesRecovery.d.ts.map +1 -1
  94. package/dist/src/client/method-helpers/indicesRecovery.js +0 -5
  95. package/dist/src/client/method-helpers/indicesRecovery.js.map +1 -1
  96. package/dist/src/client/method-helpers/indicesRefresh.d.ts.map +1 -1
  97. package/dist/src/client/method-helpers/indicesRefresh.js +0 -5
  98. package/dist/src/client/method-helpers/indicesRefresh.js.map +1 -1
  99. package/dist/src/client/method-helpers/indicesStats.d.ts.map +1 -1
  100. package/dist/src/client/method-helpers/indicesStats.js +0 -4
  101. package/dist/src/client/method-helpers/indicesStats.js.map +1 -1
  102. package/dist/src/client/method-helpers/indicesValidateQuery.d.ts.map +1 -1
  103. package/dist/src/client/method-helpers/indicesValidateQuery.js +0 -5
  104. package/dist/src/client/method-helpers/indicesValidateQuery.js.map +1 -1
  105. package/dist/src/client/method-helpers/mget.d.ts +1 -1
  106. package/dist/src/client/method-helpers/mget.d.ts.map +1 -1
  107. package/dist/src/client/method-helpers/mget.js +0 -21
  108. package/dist/src/client/method-helpers/mget.js.map +1 -1
  109. package/dist/src/client/method-helpers/msearch.d.ts +1 -1
  110. package/dist/src/client/method-helpers/msearch.d.ts.map +1 -1
  111. package/dist/src/client/method-helpers/msearch.js +0 -19
  112. package/dist/src/client/method-helpers/msearch.js.map +1 -1
  113. package/dist/src/client/method-helpers/nodesInfo.d.ts +7 -1
  114. package/dist/src/client/method-helpers/nodesInfo.d.ts.map +1 -1
  115. package/dist/src/client/method-helpers/nodesInfo.js +0 -5
  116. package/dist/src/client/method-helpers/nodesInfo.js.map +1 -1
  117. package/dist/src/client/method-helpers/nodesStats.d.ts +14 -1
  118. package/dist/src/client/method-helpers/nodesStats.d.ts.map +1 -1
  119. package/dist/src/client/method-helpers/nodesStats.js +0 -5
  120. package/dist/src/client/method-helpers/nodesStats.js.map +1 -1
  121. package/dist/src/client/method-helpers/reindex.d.ts +1 -27
  122. package/dist/src/client/method-helpers/reindex.d.ts.map +1 -1
  123. package/dist/src/client/method-helpers/reindex.js +0 -13
  124. package/dist/src/client/method-helpers/reindex.js.map +1 -1
  125. package/dist/src/client/method-helpers/search.d.ts.map +1 -1
  126. package/dist/src/client/method-helpers/search.js +0 -8
  127. package/dist/src/client/method-helpers/search.js.map +1 -1
  128. package/dist/src/client/method-helpers/tasksCancel.d.ts.map +1 -1
  129. package/dist/src/client/method-helpers/tasksCancel.js +0 -5
  130. package/dist/src/client/method-helpers/tasksCancel.js.map +1 -1
  131. package/dist/src/client/method-helpers/tasksGet.d.ts.map +1 -1
  132. package/dist/src/client/method-helpers/tasksGet.js +0 -5
  133. package/dist/src/client/method-helpers/tasksGet.js.map +1 -1
  134. package/dist/src/client/method-helpers/tasksList.d.ts.map +1 -1
  135. package/dist/src/client/method-helpers/tasksList.js +0 -5
  136. package/dist/src/client/method-helpers/tasksList.js.map +1 -1
  137. package/dist/src/client/method-helpers/update.d.ts +1 -24
  138. package/dist/src/client/method-helpers/update.d.ts.map +1 -1
  139. package/dist/src/client/method-helpers/update.js +0 -12
  140. package/dist/src/client/method-helpers/update.js.map +1 -1
  141. package/dist/src/test-helpers/config.d.ts +2 -2
  142. package/dist/src/test-helpers/config.d.ts.map +1 -1
  143. package/dist/src/test-helpers/config.js +0 -8
  144. package/dist/src/test-helpers/config.js.map +1 -1
  145. package/dist/src/test-helpers/elasticsearch.d.ts.map +1 -1
  146. package/dist/src/test-helpers/elasticsearch.js +3 -11
  147. package/dist/src/test-helpers/elasticsearch.js.map +1 -1
  148. package/dist/src/utils/elasticsearch.d.ts +0 -1
  149. package/dist/src/utils/elasticsearch.d.ts.map +1 -1
  150. package/dist/src/utils/elasticsearch.js +6 -14
  151. package/dist/src/utils/elasticsearch.js.map +1 -1
  152. package/package.json +6 -10
@@ -2,27 +2,6 @@ import { ElasticsearchDistribution } from '@terascope/types';
2
2
  import { has } from '@terascope/core-utils';
3
3
  export function convertMGetParams(params, distributionMeta) {
4
4
  const { majorVersion, distribution, version } = distributionMeta;
5
- if (distribution === ElasticsearchDistribution.elasticsearch) {
6
- if (majorVersion === 8) {
7
- const { body, ...parsedParams } = params;
8
- const returnParams = {
9
- ...parsedParams
10
- };
11
- if (body?.docs) {
12
- returnParams.docs = body.docs.map((doc) => {
13
- delete doc._type;
14
- return doc;
15
- });
16
- }
17
- if (body?.ids) {
18
- returnParams.ids = params.body.ids;
19
- }
20
- return returnParams;
21
- }
22
- if (majorVersion === 7) {
23
- return params;
24
- }
25
- }
26
5
  if (distribution === ElasticsearchDistribution.opensearch) {
27
6
  if (majorVersion === 1) {
28
7
  return params;
@@ -1 +1 @@
1
- {"version":3,"file":"mget.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/mget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,MAAM,UAAU,iBAAiB,CAC7B,MAA+B,EAC/B,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,EACF,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,MAAM,YAAY,GAAwB;gBACtC,GAAG,YAAY;aAClB,CAAC;YAEF,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;gBACb,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBACtC,OAAO,GAAG,CAAC,KAAK,CAAC;oBACjB,OAAO,GAAG,CAAC;gBACf,CAAC,CAAC,CAAC;YACP,CAAC;YAED,IAAI,IAAI,EAAE,GAAG,EAAE,CAAC;gBACZ,YAAY,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YACvC,CAAC;YAED,OAAO,YAAY,CAAC;QACxB,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YAC3C,IAAI,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC;gBACpC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC;gBACvC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;gBAE3B,OAAO;oBACH,GAAG,UAAU;oBACb,IAAI,EAAE;wBACF,GAAG,CAAC,GAAG,KAAK,SAAS,IAAI,EAAE,GAAG,EAAE,CAAC;wBACjC,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI;4BACtB,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gCACnB,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,GAAG,GAAG,CAAC;gCAElC,OAAO;oCACH,GAAG,OAAO;iCACb,CAAC;4BACN,CAAC,CAAC;yBACL,CAAC;qBACL;iBACJ,CAAC;YACN,CAAC;YAED,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"mget.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/mget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,MAAM,UAAU,iBAAiB,CAC7B,MAA+B,EAC/B,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YAC3C,IAAI,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAAE,CAAC;gBACpC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC;gBACvC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;gBAE3B,OAAO;oBACH,GAAG,UAAU;oBACb,IAAI,EAAE;wBACF,GAAG,CAAC,GAAG,KAAK,SAAS,IAAI,EAAE,GAAG,EAAE,CAAC;wBACjC,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI;4BACtB,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gCACnB,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,GAAG,GAAG,CAAC;gCAElC,OAAO;oCACH,GAAG,OAAO;iCACb,CAAC;4BACN,CAAC,CAAC;yBACL,CAAC;qBACL;iBACJ,CAAC;YACN,CAAC;YAED,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
@@ -1,3 +1,3 @@
1
1
  import { ClientParams, ClientMetadata } from '@terascope/types';
2
- export declare function convertMSearchParams(params: ClientParams.MSearchParams, distributionMeta: ClientMetadata): Record<string, any> | ClientParams.MSearchParams;
2
+ export declare function convertMSearchParams(params: ClientParams.MSearchParams, distributionMeta: ClientMetadata): ClientParams.MSearchParams;
3
3
  //# sourceMappingURL=msearch.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"msearch.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/msearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,YAAY,CAAC,aAAa,EAClC,gBAAgB,EAAE,cAAc,oDAyCnC"}
1
+ {"version":3,"file":"msearch.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/msearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,YAAY,CAAC,aAAa,EAClC,gBAAgB,EAAE,cAAc,8BAenC"}
@@ -1,25 +1,6 @@
1
1
  import { ElasticsearchDistribution } from '@terascope/types';
2
2
  export function convertMSearchParams(params, distributionMeta) {
3
3
  const { majorVersion, distribution, version } = distributionMeta;
4
- if (distribution === ElasticsearchDistribution.elasticsearch) {
5
- if (majorVersion === 8) {
6
- const { body, ...parsedParams } = params;
7
- const returnParams = {
8
- ...parsedParams
9
- };
10
- if (body) {
11
- returnParams.searches = body.map((doc) => {
12
- if ('type' in doc)
13
- delete doc.type;
14
- return doc;
15
- });
16
- }
17
- return returnParams;
18
- }
19
- if (majorVersion === 7) {
20
- return params;
21
- }
22
- }
23
4
  if (distribution === ElasticsearchDistribution.opensearch) {
24
5
  if ([1, 2, 3].includes(majorVersion)) {
25
6
  return params;
@@ -1 +1 @@
1
- {"version":3,"file":"msearch.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/msearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,oBAAoB,CAChC,MAAkC,EAClC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,EACF,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,MAAM,YAAY,GAAwB;gBACtC,GAAG,YAAY;aAClB,CAAC;YAEF,IAAI,IAAI,EAAE,CAAC;gBACP,YAAY,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBACrC,IAAI,MAAM,IAAI,GAAG;wBAAE,OAAO,GAAG,CAAC,IAAI,CAAC;oBACnC,OAAO,GAAG,CAAC;gBACf,CAAC,CAAC,CAAC;YACP,CAAC;YAED,OAAO,YAAY,CAAC;QACxB,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"msearch.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/msearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,oBAAoB,CAChC,MAAkC,EAClC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
@@ -1,3 +1,9 @@
1
1
  import { ClientParams, ClientMetadata } from '@terascope/types';
2
- export declare function convertNodeInfoParams(params: ClientParams.NodesInfoParams, distributionMeta: ClientMetadata): ClientParams.NodesInfoParams;
2
+ export declare function convertNodeInfoParams(params: ClientParams.NodesInfoParams, distributionMeta: ClientMetadata): {
3
+ cluster_manager_timeout?: string | number | undefined;
4
+ node_id?: string;
5
+ metric?: string | string[];
6
+ flat_settings?: boolean;
7
+ timeout?: string | number;
8
+ };
3
9
  //# sourceMappingURL=nodesInfo.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"nodesInfo.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/nodesInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,YAAY,CAAC,eAAe,EACpC,gBAAgB,EAAE,cAAc,gCA8BnC"}
1
+ {"version":3,"file":"nodesInfo.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/nodesInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,YAAY,CAAC,eAAe,EACpC,gBAAgB,EAAE,cAAc;;;;;;EAwBnC"}
@@ -1,11 +1,6 @@
1
1
  import { ElasticsearchDistribution } from '@terascope/types';
2
2
  export function convertNodeInfoParams(params, distributionMeta) {
3
3
  const { majorVersion, distribution, version } = distributionMeta;
4
- if (distribution === ElasticsearchDistribution.elasticsearch) {
5
- if (majorVersion === 7 || majorVersion === 8) {
6
- return params;
7
- }
8
- }
9
4
  if (distribution === ElasticsearchDistribution.opensearch) {
10
5
  if ([1, 2, 3].includes(majorVersion)) {
11
6
  const { master_timeout, ...parsedParams } = params;
@@ -1 +1 @@
1
- {"version":3,"file":"nodesInfo.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/nodesInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,qBAAqB,CACjC,MAAoC,EACpC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,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;QACN,CAAC;QACD,mFAAmF;IACvF,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"nodesInfo.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/nodesInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,qBAAqB,CACjC,MAAoC,EACpC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,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;QACN,CAAC;QACD,mFAAmF;IACvF,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
@@ -1,3 +1,16 @@
1
1
  import { ClientParams, ClientMetadata } from '@terascope/types';
2
- export declare function convertNodesStatsParams(params: ClientParams.NodesStatsParams, distributionMeta: ClientMetadata): ClientParams.NodesStatsParams;
2
+ export declare function convertNodesStatsParams(params: ClientParams.NodesStatsParams, distributionMeta: ClientMetadata): {
3
+ cluster_manager_timeout?: string | number | undefined;
4
+ node_id?: string | string[];
5
+ metric?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").Metrics;
6
+ index_metric?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").Metrics;
7
+ completion_fields?: string | string[];
8
+ fielddata_fields?: string | string[];
9
+ fields?: string | string[];
10
+ groups?: boolean;
11
+ include_segment_file_sizes?: boolean;
12
+ level?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").Level;
13
+ timeout?: number | string;
14
+ include_unloaded_segments?: boolean;
15
+ };
3
16
  //# sourceMappingURL=nodesStats.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"nodesStats.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/nodesStats.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,iCA8BnC"}
1
+ {"version":3,"file":"nodesStats.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/nodesStats.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;;;;;;;;;;;;;EAwBnC"}
@@ -1,11 +1,6 @@
1
1
  import { ElasticsearchDistribution } from '@terascope/types';
2
2
  export function convertNodesStatsParams(params, distributionMeta) {
3
3
  const { majorVersion, distribution, version } = distributionMeta;
4
- if (distribution === ElasticsearchDistribution.elasticsearch) {
5
- if (majorVersion === 7 || majorVersion === 8) {
6
- return params;
7
- }
8
- }
9
4
  if (distribution === ElasticsearchDistribution.opensearch) {
10
5
  if ([1, 2, 3].includes(majorVersion)) {
11
6
  const { master_timeout, ...parsedParams } = params;
@@ -1 +1 @@
1
- {"version":3,"file":"nodesStats.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/nodesStats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,uBAAuB,CACnC,MAAqC,EACrC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,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;QACN,CAAC;QACD,mFAAmF;IACvF,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"nodesStats.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/nodesStats.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,uBAAuB,CACnC,MAAqC,EACrC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,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;QACN,CAAC;QACD,mFAAmF;IACvF,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
@@ -1,29 +1,3 @@
1
1
  import { ClientParams, ClientMetadata } from '@terascope/types';
2
- export declare function convertReIndexParams(params: ClientParams.ReindexParams, distributionMeta: ClientMetadata): ClientParams.ReindexParams | {
3
- refresh?: boolean;
4
- timeout?: string;
5
- wait_for_active_shards?: "all" | number;
6
- wait_for_completion?: boolean;
7
- requests_per_second?: number;
8
- scroll?: string;
9
- slices?: number | string;
10
- max_docs?: number;
11
- source: {
12
- index: string;
13
- query?: Record<string, any>;
14
- remote?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").Remote;
15
- size?: number;
16
- slice?: {
17
- id?: number;
18
- max?: number;
19
- };
20
- _source?: boolean | string | string[];
21
- };
22
- dest: {
23
- index: string;
24
- version_type?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").VersionType;
25
- op_type?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").OpType;
26
- type?: string;
27
- };
28
- };
2
+ export declare function convertReIndexParams(params: ClientParams.ReindexParams, distributionMeta: ClientMetadata): ClientParams.ReindexParams;
29
3
  //# sourceMappingURL=reindex.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"reindex.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/reindex.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,YAAY,CAAC,aAAa,EAClC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;cAmC4mtD,CAAC;eAAyB,CAAC;;;;;;;;;;EAD1qtD"}
1
+ {"version":3,"file":"reindex.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/reindex.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,YAAY,CAAC,aAAa,EAClC,gBAAgB,EAAE,cAAc,8BAenC"}
@@ -1,19 +1,6 @@
1
1
  import { ElasticsearchDistribution } from '@terascope/types';
2
2
  export function convertReIndexParams(params, distributionMeta) {
3
3
  const { majorVersion, distribution, version } = distributionMeta;
4
- if (distribution === ElasticsearchDistribution.elasticsearch) {
5
- if (majorVersion === 8) {
6
- const { body, ...parsedParams } = params;
7
- return {
8
- source: body?.source,
9
- dest: body?.dest,
10
- ...parsedParams
11
- };
12
- }
13
- if (majorVersion === 7) {
14
- return params;
15
- }
16
- }
17
4
  if (distribution === ElasticsearchDistribution.opensearch) {
18
5
  if ([1, 2, 3].includes(majorVersion)) {
19
6
  return params;
@@ -1 +1 @@
1
- {"version":3,"file":"reindex.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/reindex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,oBAAoB,CAChC,MAAkC,EAClC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,EACF,IAAI,EACJ,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,MAAM,EAAE,IAAI,EAAE,MAAM;gBACpB,IAAI,EAAE,IAAI,EAAE,IAAI;gBAChB,GAAG,YAAY;aAClB,CAAC;QACN,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"reindex.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/reindex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,oBAAoB,CAChC,MAAkC,EAClC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG3F,wBAAgB,mBAAmB,CAC/B,MAAM,EAAE,YAAY,CAAC,YAAY,EACjC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwCnC"}
1
+ {"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG3F,wBAAgB,mBAAmB,CAC/B,MAAM,EAAE,YAAY,CAAC,YAAY,EACjC,gBAAgB,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+BnC"}
@@ -9,14 +9,6 @@ export function convertSearchParams(params, distributionMeta) {
9
9
  if (!hasTotalConfig) {
10
10
  trackTotal = true;
11
11
  }
12
- if (distribution === ElasticsearchDistribution.elasticsearch) {
13
- if (majorVersion === 8 || majorVersion === 7) {
14
- return {
15
- ...parsedParams,
16
- track_total_hits: trackTotal,
17
- };
18
- }
19
- }
20
12
  if (distribution === ElasticsearchDistribution.opensearch) {
21
13
  if ([1, 2, 3].includes(majorVersion)) {
22
14
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,MAAM,UAAU,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,gBAAgB,EAChB,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,qBAAqB,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAClD,IAAI,UAAU,GAAG,gBAAgB,CAAC;IAElC,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,UAAU,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO;gBACH,GAAG,YAAY;gBACf,gBAAgB,EAAE,UAAU;aAC/B,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO;gBACH,GAAG,YAAY;gBACf,gBAAgB,EAAE,UAAU;aAC/B,CAAC;QACN,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAiC;IAC5D,MAAM,SAAS,GAA2C;QACtD,UAAU;QACV,kBAAkB;QAClB,kBAAkB;QAClB,IAAI;QACJ,SAAS;KACZ,CAAC;IAEF,MAAM,mBAAmB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;IAE/E,IAAI,mBAAmB,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC9E,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"search.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,MAAM,UAAU,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,MAAM,EACF,gBAAgB,EAChB,GAAG,YAAY,EAClB,GAAG,MAAM,CAAC;IAEX,qBAAqB,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAClD,IAAI,UAAU,GAAG,gBAAgB,CAAC;IAElC,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,UAAU,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO;gBACH,GAAG,YAAY;gBACf,gBAAgB,EAAE,UAAU;aAC/B,CAAC;QACN,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAiC;IAC5D,MAAM,SAAS,GAA2C;QACtD,UAAU;QACV,kBAAkB;QAClB,kBAAkB;QAClB,IAAI;QACJ,SAAS;KACZ,CAAC;IAEF,MAAM,mBAAmB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;IAE/E,IAAI,mBAAmB,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC9E,CAAC;AACL,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"tasksCancel.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksCancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,wBAAwB,CACpC,MAAM,EAAE,YAAY,CAAC,iBAAiB,EACtC,gBAAgB,EAAE,cAAc,kCAqBnC"}
1
+ {"version":3,"file":"tasksCancel.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksCancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,wBAAwB,CACpC,MAAM,EAAE,YAAY,CAAC,iBAAiB,EACtC,gBAAgB,EAAE,cAAc,kCAenC"}
@@ -1,11 +1,6 @@
1
1
  import { ElasticsearchDistribution } from '@terascope/types';
2
2
  export function convertTasksCancelParams(params, distributionMeta) {
3
3
  const { majorVersion, distribution, version } = distributionMeta;
4
- if (distribution === ElasticsearchDistribution.elasticsearch) {
5
- if ([7, 8].includes(majorVersion)) {
6
- return params;
7
- }
8
- }
9
4
  if (distribution === ElasticsearchDistribution.opensearch) {
10
5
  if ([1, 2, 3].includes(majorVersion)) {
11
6
  return params;
@@ -1 +1 @@
1
- {"version":3,"file":"tasksCancel.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksCancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,wBAAwB,CACpC,MAAsC,EACtC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}
1
+ {"version":3,"file":"tasksCancel.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksCancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,wBAAwB,CACpC,MAAsC,EACtC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"tasksGet.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,YAAY,CAAC,cAAc,EACnC,gBAAgB,EAAE,cAAc,+BAqBnC"}
1
+ {"version":3,"file":"tasksGet.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,YAAY,CAAC,cAAc,EACnC,gBAAgB,EAAE,cAAc,+BAenC"}
@@ -1,11 +1,6 @@
1
1
  import { ElasticsearchDistribution } from '@terascope/types';
2
2
  export function convertTasksGetParams(params, distributionMeta) {
3
3
  const { majorVersion, distribution, version } = distributionMeta;
4
- if (distribution === ElasticsearchDistribution.elasticsearch) {
5
- if ([7, 8].includes(majorVersion)) {
6
- return params;
7
- }
8
- }
9
4
  if (distribution === ElasticsearchDistribution.opensearch) {
10
5
  if ([1, 2, 3].includes(majorVersion)) {
11
6
  return params;
@@ -1 +1 @@
1
- {"version":3,"file":"tasksGet.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,qBAAqB,CACjC,MAAmC,EACnC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}
1
+ {"version":3,"file":"tasksGet.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,qBAAqB,CACjC,MAAmC,EACnC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"tasksList.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksList.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,YAAY,CAAC,eAAe,EACpC,gBAAgB,EAAE,cAAc,gCAqBnC"}
1
+ {"version":3,"file":"tasksList.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksList.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,YAAY,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3F,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,YAAY,CAAC,eAAe,EACpC,gBAAgB,EAAE,cAAc,gCAenC"}
@@ -1,11 +1,6 @@
1
1
  import { ElasticsearchDistribution } from '@terascope/types';
2
2
  export function convertTasksListParams(params, distributionMeta) {
3
3
  const { majorVersion, distribution, version } = distributionMeta;
4
- if (distribution === ElasticsearchDistribution.elasticsearch) {
5
- if ([7, 8].includes(majorVersion)) {
6
- return params;
7
- }
8
- }
9
4
  if (distribution === ElasticsearchDistribution.opensearch) {
10
5
  if ([1, 2, 3].includes(majorVersion)) {
11
6
  return params;
@@ -1 +1 @@
1
- {"version":3,"file":"tasksList.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,sBAAsB,CAClC,MAAoC,EACpC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}
1
+ {"version":3,"file":"tasksList.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/tasksList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,sBAAsB,CAClC,MAAoC,EACpC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,aAAa,OAAO,EAAE,CAAC,CAAC;AACvE,CAAC"}
@@ -1,26 +1,3 @@
1
1
  import { ClientParams, ClientMetadata } from '@terascope/types';
2
- export declare function convertUpdateParams(params: ClientParams.UpdateParams, distributionMeta: ClientMetadata): ClientParams.UpdateParams<unknown, unknown> | {
3
- id: string;
4
- index: string;
5
- lang?: string;
6
- refresh?: boolean;
7
- require_alias?: boolean;
8
- retry_on_conflict?: number;
9
- routing?: string;
10
- source_enabled?: boolean;
11
- timeout?: string | number;
12
- wait_for_active_shards?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").WaitForActiveShards;
13
- _source?: string | boolean | string[] | import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").SearchSourceFilter | undefined;
14
- _source_excludes?: string | string[];
15
- _source_includes?: string | string[];
16
- if_seq_no?: number;
17
- if_primary_term?: number;
18
- version?: number;
19
- detect_noop?: boolean;
20
- doc?: unknown;
21
- doc_as_upsert?: boolean;
22
- script?: import("packages/types/dist/src/elasticsearch-client/elasticsearch-types").Script;
23
- scripted_upsert?: boolean;
24
- upsert?: unknown;
25
- };
2
+ export declare function convertUpdateParams(params: ClientParams.UpdateParams, distributionMeta: ClientMetadata): ClientParams.UpdateParams<unknown, unknown>;
26
3
  //# sourceMappingURL=update.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/update.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;;;;;;;;;;;;;;;;;;;;;;;EAgCnC"}
1
+ {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/client/method-helpers/update.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,+CAenC"}
@@ -1,18 +1,6 @@
1
1
  import { ElasticsearchDistribution } from '@terascope/types';
2
2
  export function convertUpdateParams(params, distributionMeta) {
3
3
  const { majorVersion, distribution, version } = distributionMeta;
4
- if (distribution === ElasticsearchDistribution.elasticsearch) {
5
- if (majorVersion === 8) {
6
- const { body, ...parsedParams } = params;
7
- return {
8
- ...body,
9
- ...parsedParams
10
- };
11
- }
12
- if (majorVersion === 7) {
13
- return params;
14
- }
15
- }
16
4
  if (distribution === ElasticsearchDistribution.opensearch) {
17
5
  if ([1, 2, 3].includes(majorVersion)) {
18
6
  return params;
@@ -1 +1 @@
1
- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,aAAa,EAAE,CAAC;QAC3D,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,EACF,IAAI,EAAE,GAAG,YAAY,EACxB,GAAG,MAAM,CAAC;YAEX,OAAO;gBACH,GAAG,IAAI;gBACP,GAAG,YAAY;aAClB,CAAC;QACN,CAAC;QAED,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/client/method-helpers/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAgC,MAAM,kBAAkB,CAAC;AAE3F,MAAM,UAAU,mBAAmB,CAC/B,MAAiC,EACjC,gBAAgC;IAEhC,MAAM,EACF,YAAY,EACZ,YAAY,EACZ,OAAO,EACV,GAAG,gBAAgB,CAAC;IAErB,IAAI,YAAY,KAAK,yBAAyB,CAAC,UAAU,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,eAAe,YAAY,YAAY,OAAO,EAAE,CAAC,CAAC;AACtE,CAAC"}
@@ -1,4 +1,4 @@
1
- import { ElasticsearchTestEnv, OpenSearchTestEnv } from '@terascope/types';
2
- declare const envConfig: OpenSearchTestEnv | ElasticsearchTestEnv;
1
+ import { OpenSearchTestEnv } from '@terascope/types';
2
+ declare const envConfig: OpenSearchTestEnv;
3
3
  export { envConfig };
4
4
  //# sourceMappingURL=config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/test-helpers/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAkB,MAAM,kBAAkB,CAAC;AAmD3F,QAAA,MAAM,SAAS,0CAAkC,CAAC;AAElD,OAAO,EACH,SAAS,EACZ,CAAC"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/test-helpers/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAkB,MAAM,kBAAkB,CAAC;AA2CrE,QAAA,MAAM,SAAS,mBAAkC,CAAC;AAElD,OAAO,EACH,SAAS,EACZ,CAAC"}
@@ -1,13 +1,5 @@
1
1
  import { SchemaValidator } from '@terascope/core-utils';
2
2
  const opensearchEnvSchema = {
3
- ELASTICSEARCH_HOST: {
4
- default: null,
5
- format: 'optional_string',
6
- },
7
- ELASTICSEARCH_VERSION: {
8
- default: null,
9
- format: 'optional_string',
10
- },
11
3
  OPENSEARCH_HOST: {
12
4
  default: null,
13
5
  format: 'optional_string',
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/test-helpers/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,mBAAmB,GAA+B;IACpD,kBAAkB,EAAE;QAChB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,qBAAqB,EAAE;QACnB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,eAAe,EAAE;QACb,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,mBAAmB,EAAE;QACjB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,mBAAmB,EAAE;QACjB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,eAAe,EAAE;QACb,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,kBAAkB,EAAE;QAChB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,0BAA0B,EAAE;QACxB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,gBAAgB,EAAE;QACd,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;KACjB;IACD,iBAAiB,EAAE;QACf,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;KACjB;CACJ,CAAC;AAEF,MAAM,SAAS,GAAG,IAAI,eAAe,CACjC,mBAAmB,EACnB,qBAAqB,EACrB,SAAS,EACT,OAAO,CACV,CAAC;AACF,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAElD,OAAO,EACH,SAAS,EACZ,CAAC"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/test-helpers/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,mBAAmB,GAA+B;IACpD,eAAe,EAAE;QACb,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,mBAAmB,EAAE;QACjB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,mBAAmB,EAAE;QACjB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,eAAe,EAAE;QACb,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,kBAAkB,EAAE;QAChB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,0BAA0B,EAAE;QACxB,OAAO,EAAE,IAAI;QACb,MAAM,EAAE,iBAAiB;KAC5B;IACD,gBAAgB,EAAE;QACd,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;KACjB;IACD,iBAAiB,EAAE;QACf,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,MAAM;KACjB;CACJ,CAAC;AAEF,MAAM,SAAS,GAAG,IAAI,eAAe,CACjC,mBAAmB,EACnB,qBAAqB,EACrB,SAAS,EACT,OAAO,CACV,CAAC;AACF,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAElD,OAAO,EACH,SAAS,EACZ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"elasticsearch.d.ts","sourceRoot":"","sources":["../../../src/test-helpers/elasticsearch.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAiD,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAgB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAS1D,wBAAsB,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoCrE;AAED,wBAAsB,YAAY,CAC9B,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAC9C,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;;GAIG;AACH,wBAAsB,MAAM,CACxB,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GACzC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAS9B;AAED,wBAAgB,yBAAyB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,SAAS,KAAK,OAMjB;AAED,wBAAsB,aAAa,CAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,GAAG,EAAE,GACf,OAAO,CAAC,IAAI,CAAC,CAkCf;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC5B,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,gBAAgB,UAAQ,GACrD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAmBvB;AAED,yDAAyD;AACzD,wBAAsB,WAAW,CAC7B,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,SAAO,GAC1D,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACrD,IAAI,EAAE,MAAM,CAAC;CAChB;AAYD,wBAAgB,oBAAoB,IAAI,iBAAiB,CAqCxD;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;;;EAMnF"}
1
+ {"version":3,"file":"elasticsearch.d.ts","sourceRoot":"","sources":["../../../src/test-helpers/elasticsearch.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAiD,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAgB,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAQ1D,wBAAsB,UAAU,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoCrE;AAED,wBAAsB,YAAY,CAC9B,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAC9C,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;;GAIG;AACH,wBAAsB,MAAM,CACxB,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GACzC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAS9B;AAED,wBAAgB,yBAAyB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,SAAS,KAAK,OAMjB;AAED,wBAAsB,aAAa,CAC/B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,GAAG,EAAE,GACf,OAAO,CAAC,IAAI,CAAC,CAkCf;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC5B,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,gBAAgB,UAAQ,GACrD,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAmBvB;AAED,yDAAyD;AACzD,wBAAsB,WAAW,CAC7B,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,SAAO,GAC1D,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACrD,IAAI,EAAE,MAAM,CAAC;CAChB;AAYD,wBAAgB,oBAAoB,IAAI,iBAAiB,CA4BxD;AAED,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;;;EAMnF"}
@@ -4,7 +4,7 @@ import { ElasticsearchDistribution } from '@terascope/types';
4
4
  import { createClient } from '../client/index.js';
5
5
  import { getClientMetadata, fixMappingRequest } from '../utils/index.js';
6
6
  import { envConfig } from './config.js';
7
- const { ELASTICSEARCH_HOST, ELASTICSEARCH_VERSION, OPENSEARCH_HOST, OPENSEARCH_PASSWORD, OPENSEARCH_SSL_HOST, OPENSEARCH_USER, OPENSEARCH_VERSION, RESTRAINED_OPENSEARCH_HOST } = envConfig;
7
+ const { OPENSEARCH_HOST, OPENSEARCH_PASSWORD, OPENSEARCH_SSL_HOST, OPENSEARCH_USER, OPENSEARCH_VERSION, RESTRAINED_OPENSEARCH_HOST } = envConfig;
8
8
  export async function makeClient(rootCaPath) {
9
9
  let host;
10
10
  let esConfig = {};
@@ -16,7 +16,7 @@ export async function makeClient(rootCaPath) {
16
16
  host = process.env.ENCRYPT_OPENSEARCH ? OPENSEARCH_SSL_HOST : OPENSEARCH_HOST;
17
17
  }
18
18
  else {
19
- host = ELASTICSEARCH_HOST;
19
+ throw new Error('No TEST_OPENSEARCH or TEST_RESTRAINED_OPENSEARCH env var set');
20
20
  }
21
21
  // Add SSL settings if encryption is enabled
22
22
  if (process.env.TEST_OPENSEARCH && process.env.ENCRYPT_OPENSEARCH) {
@@ -188,15 +188,7 @@ export function getTestENVClientInfo() {
188
188
  minorVersion
189
189
  };
190
190
  }
191
- const version = ELASTICSEARCH_VERSION;
192
- const [majorVersion, minorVersion] = parseVersion(version);
193
- return {
194
- host: ELASTICSEARCH_HOST,
195
- distribution: ElasticsearchDistribution.elasticsearch,
196
- version,
197
- majorVersion,
198
- minorVersion
199
- };
191
+ throw new Error('Incorrect test environment variables, no TEST_OPENSEARCH or TEST_RESTRAINED_OPENSEARCH env var set');
200
192
  }
201
193
  export function getTotalFormat(distribution, majorVersion, n) {
202
194
  if (distribution === 'opensearch' || (distribution === 'elasticsearch' && majorVersion >= 7)) {
@@ -1 +1 @@
1
- {"version":3,"file":"elasticsearch.js","sourceRoot":"","sources":["../../../src/test-helpers/elasticsearch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"elasticsearch.js","sourceRoot":"","sources":["../../../src/test-helpers/elasticsearch.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,6 @@ import { ESFieldType, ESTypeMapping, ClientMetadata, ESMapping } from '@terascop
2
2
  import type { Client } from '../client/index.js';
3
3
  export declare function getClientVersion(client: Client): number;
4
4
  export declare function getClientMetadata(client: Client): ClientMetadata;
5
- export declare function isElasticsearch8(client: Client): boolean;
6
5
  export declare function isOpensearch(client: Client): boolean;
7
6
  export declare function isOpensearch1(client: Client): boolean;
8
7
  export declare function isOpensearch2(client: Client): boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"elasticsearch.d.ts","sourceRoot":"","sources":["../../../src/utils/elasticsearch.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,WAAW,EAAE,aAAa,EAAE,cAAc,EACf,SAAS,EACvC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAUvD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAahE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKxD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAGpD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AACD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AAGD,wBAAgB,iBAAiB,CAC7B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,UAAU,EAAE,OAAO,GACjG,GAAG,CAqDL;AAED;;EAEE;AACF,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAEpF;;;EAGE;AACF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB,CA6BlF"}
1
+ {"version":3,"file":"elasticsearch.d.ts","sourceRoot":"","sources":["../../../src/utils/elasticsearch.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,WAAW,EAAE,aAAa,EAAE,cAAc,EACf,SAAS,EACvC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CASvD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAWhE;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAGpD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AACD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKrD;AAGD,wBAAgB,iBAAiB,CAC7B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,UAAU,EAAE,OAAO,GACjG,GAAG,CAqDL;AAED;;EAEE;AACF,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAEpF;;;EAGE;AACF,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,aAAa,GAAG,iBAAiB,CA6BlF"}
@@ -1,20 +1,17 @@
1
1
  import { get, isString, toNumber, cloneDeep, castArray, isEmpty, sortKeys } from '@terascope/core-utils';
2
2
  import { ElasticsearchDistribution } from '@terascope/types';
3
3
  export function getClientVersion(client) {
4
- const newClientVersion = get(client, '__meta.version');
5
- const version = newClientVersion || get(client, 'transport._config.apiVersion', '6.5');
4
+ const version = get(client, '__meta.version');
6
5
  if (version && isString(version)) {
7
6
  const [majorVersion] = version.split('.', 1);
8
7
  return toNumber(majorVersion);
9
8
  }
10
- return 6;
9
+ return 2;
11
10
  }
12
11
  export function getClientMetadata(client) {
13
- const newClientVersion = get(client, '__meta.version');
14
- const version = newClientVersion || get(client, 'transport._config.apiVersion', '6.5');
15
- const distribution = get(client, '__meta.distribution', ElasticsearchDistribution.elasticsearch);
16
- // lowest Elasticsearch we run is 6.8.6
17
- const [majorVersion = 6, minorVersion = 8] = version.split('.').map(toNumber);
12
+ const version = get(client, '__meta.version');
13
+ const distribution = get(client, '__meta.distribution', ElasticsearchDistribution.opensearch);
14
+ const [majorVersion = 2, minorVersion = 15] = version.split('.').map(toNumber);
18
15
  return {
19
16
  distribution,
20
17
  version,
@@ -22,11 +19,6 @@ export function getClientMetadata(client) {
22
19
  minorVersion
23
20
  };
24
21
  }
25
- export function isElasticsearch8(client) {
26
- const { distribution, version: esVersion } = getClientMetadata(client);
27
- const parsedVersion = toNumber(esVersion.split('.', 1)[0]);
28
- return distribution === ElasticsearchDistribution.elasticsearch && parsedVersion === 8;
29
- }
30
22
  export function isOpensearch(client) {
31
23
  const { distribution } = getClientMetadata(client);
32
24
  return distribution === ElasticsearchDistribution.opensearch;
@@ -80,7 +72,7 @@ export function fixMappingRequest(client, _params, isTemplate) {
80
72
  }
81
73
  }
82
74
  // _all deprecated in esV6, esV8 & osV2 seems to strip automatically but esV7/osV1 don't
83
- if (version === 7 || version === 1) {
75
+ if (version === 1) {
84
76
  if (mappings.include_type_name) {
85
77
  Object.values(mappings).forEach((typeMapping) => {
86
78
  if (typeMapping && typeMapping._all) {