Skip to content

Commit 486005e

Browse files
committed
fix: Obtaining API version from Elastic Client instance
1 parent 57cd282 commit 486005e

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

src/ElasticApiParser.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ export default class ElasticApiParser {
8282
// in file /node_modules/elasticsearch/src/lib/apis/index.js
8383
this.apiVersion = opts.apiVersion ||
8484
(opts.elasticClient &&
85-
opts.elasticClient.config &&
86-
opts.elasticClient.config.apiVersion) ||
85+
opts.elasticClient.transport &&
86+
opts.elasticClient.transport._config &&
87+
opts.elasticClient.transport._config.apiVersion) ||
8788
'_default';
8889
const apiFilePath = path.resolve(
8990
opts.elasticApiFilePath ||

src/elasticApiFieldConfig.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@ export function elasticApiFieldConfig(
1818
}
1919

2020
if (isElasticClient(esClientOrOpts)) {
21-
return staticElasticClient(esClientOrOpts);
21+
return instanceElasticClient(esClientOrOpts);
2222
} else {
2323
return contextElasticClient(esClientOrOpts);
2424
}
2525
}
2626

27-
function staticElasticClient(elasticClient: Object): GraphQLFieldConfig<*, *> {
28-
const apiVersion = elasticClient.config.apiVersion ||
27+
function instanceElasticClient(
28+
elasticClient: Object
29+
): GraphQLFieldConfig<*, *> {
30+
const apiVersion = elasticClient.transport._config.apiVersion ||
2931
DEFAULT_ELASTIC_API_VERSION;
3032
const prefix = `ElasticAPI${apiVersion.replace('.', '')}`;
3133

@@ -87,7 +89,12 @@ function isElasticClient(obj) {
8789
return true;
8890
}
8991

90-
if (obj && obj.config && obj.config.__reused) {
92+
if (
93+
obj &&
94+
obj.transport &&
95+
obj.transport._config &&
96+
obj.transport._config.__reused
97+
) {
9198
return true;
9299
}
93100

0 commit comments

Comments
 (0)