From 26dd76cb62c913451a42752968eb272ebe7228b8 Mon Sep 17 00:00:00 2001 From: restrry Date: Thu, 29 Jul 2021 11:50:20 +0300 Subject: [PATCH] migrate integration tests to the new es client --- .../apis/metrics_ui/metrics_alerting.ts | 10 +++++----- .../apis/monitoring/common/mappings_exist.js | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts b/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts index 6f9c0f5fc708f0..ae14e8e62e6f89 100644 --- a/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts +++ b/x-pack/test/api_integration/apis/metrics_ui/metrics_alerting.ts @@ -12,7 +12,7 @@ import { MetricExpressionParams } from '../../../../plugins/infra/server/lib/ale import { FtrProviderContext } from '../../ftr_provider_context'; export default function ({ getService }: FtrProviderContext) { - const client = getService('legacyEs'); + const client = getService('es'); const index = 'test-index'; const getSearchParams = (aggType: string) => ({ @@ -42,7 +42,7 @@ export default function ({ getService }: FtrProviderContext) { '@timestamp', timeframe ); - const result = await client.search({ + const { body: result } = await client.search({ index, body: searchBody, }); @@ -63,7 +63,7 @@ export default function ({ getService }: FtrProviderContext) { undefined, '{"bool":{"should":[{"match_phrase":{"agent.hostname":"foo"}}],"minimum_should_match":1}}' ); - const result = await client.search({ + const { body: result } = await client.search({ index, body: searchBody, }); @@ -85,7 +85,7 @@ export default function ({ getService }: FtrProviderContext) { timeframe, 'agent.id' ); - const result = await client.search({ + const { body: result } = await client.search({ index, body: searchBody, }); @@ -106,7 +106,7 @@ export default function ({ getService }: FtrProviderContext) { 'agent.id', '{"bool":{"should":[{"match_phrase":{"agent.hostname":"foo"}}],"minimum_should_match":1}}' ); - const result = await client.search({ + const { body: result } = await client.search({ index, body: searchBody, }); diff --git a/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js b/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js index 1f1151010cefbc..f193e0dbe091a7 100644 --- a/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js +++ b/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js @@ -14,7 +14,7 @@ import * as beatsMetrics from '../../../../../plugins/monitoring/server/lib/metr import * as apmMetrics from '../../../../../plugins/monitoring/server/lib/metrics/apm/metrics'; export default function ({ getService }) { - const es = getService('legacyEs'); + const es = getService('es'); const metricSets = [ { @@ -49,7 +49,7 @@ export default function ({ getService }) { let mappings; before('load mappings', async () => { - const template = await es.indices.getTemplate({ name: indexTemplate }); + const { body: template } = await es.indices.getTemplate({ name: indexTemplate }); mappings = get(template, [indexTemplate, 'mappings', 'properties']); });