[7.x] [FTR] expose new es client service (#51066) (#51173)

* [FTR] expose new es client service (#51066)

* always extend all common config and expose new es client service

* replace `es` service with `legacyEs`

* fix one refernce that's unique to 7.x

test/api_integration/apis/home/sample_data.js

@@ -22,7 +22,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const MILLISECOND_IN_WEEK = 1000 * 60 * 60 * 24 * 7;
 

test/api_integration/apis/index_patterns/es_errors/errors.js

@@ -34,7 +34,7 @@ import {
 } from './lib';
 
 export default function ({ getService }) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   describe('index_patterns/* error handler', () => {

test/api_integration/apis/kql_telemetry/kql_telemetry.js

@@ -24,7 +24,7 @@ import { get } from 'lodash';
 export default function ({ getService }) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   describe('telemetry API', () => {
     before(() => esArchiver.load('saved_objects/basic'));

test/api_integration/apis/management/saved_objects/find.js

@@ -20,7 +20,7 @@
 import expect from '@kbn/expect';
 
 export default function ({ getService }) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 

test/api_integration/apis/saved_objects/bulk_create.js

@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   const BULK_REQUESTS = [

test/api_integration/apis/saved_objects/bulk_get.js

@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   const BULK_REQUESTS = [

test/api_integration/apis/saved_objects/bulk_update.js

@@ -22,7 +22,7 @@ import _ from 'lodash';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
 

test/api_integration/apis/saved_objects/create.js

@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   describe('create', () => {

test/api_integration/apis/saved_objects/delete.js

@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   describe('delete', () => {

test/api_integration/apis/saved_objects/export.js

@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   describe('export', () => {

test/api_integration/apis/saved_objects/find.js

@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   describe('find', () => {

test/api_integration/apis/saved_objects/get.js

@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   describe('get', () => {

test/api_integration/apis/saved_objects/migrations.js

@@ -31,7 +31,7 @@ import { SavedObjectsSerializer } from '../../../../src/core/server/saved_object
 import { SavedObjectsSchema } from '../../../../src/core/server/saved_objects/schema';
 
 export default ({ getService }) => {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const callCluster = (path, ...args) => _.get(es, path).call(es, ...args);
 
   describe('Kibana index migration', () => {

test/api_integration/apis/saved_objects/update.js

@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   describe('update', () => {

test/api_integration/apis/ui_metric/ui_metric.js

@@ -22,7 +22,7 @@ import { ReportManager, METRIC_TYPE } from '@kbn/analytics';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const createStatsMetric = (eventName) => ({
     key: ReportManager.createMetricKey({ appName: 'myApp', type: METRIC_TYPE.CLICK, eventName }),

test/api_integration/services/index.ts

@@ -23,10 +23,7 @@ import { services as commonServices } from '../../common/services';
 import { KibanaSupertestProvider, ElasticsearchSupertestProvider } from './supertest';
 
 export const services = {
-  es: commonServices.es,
-  esArchiver: commonServices.esArchiver,
-  retry: commonServices.retry,
+  ...commonServices,
   supertest: KibanaSupertestProvider,
   esSupertest: ElasticsearchSupertestProvider,
-  randomness: commonServices.randomness,
 };

test/common/services/elasticsearch.ts

@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { format as formatUrl } from 'url';
+
+import { Client } from '@elastic/elasticsearch';
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function ElasticsearchProvider({ getService }: FtrProviderContext) {
+  const config = getService('config');
+
+  return new Client({
+    nodes: [formatUrl(config.get('servers.elasticsearch'))],
+    requestTimeout: config.get('timeouts.esRequestTimeout'),
+  });
+}

test/common/services/es_archiver.ts

@@ -26,7 +26,7 @@ import * as KibanaServer from './kibana_server';
 
 export function EsArchiverProvider({ getService, hasService }: FtrProviderContext): EsArchiver {
   const config = getService('config');
-  const client = getService('es');
+  const client = getService('legacyEs');
   const log = getService('log');
 
   if (!config.get('esArchiver')) {

test/common/services/index.ts

@@ -18,13 +18,15 @@
  */
 
 import { LegacyEsProvider } from './legacy_es';
+import { ElasticsearchProvider } from './elasticsearch';
 import { EsArchiverProvider } from './es_archiver';
 import { KibanaServerProvider } from './kibana_server';
 import { RetryProvider } from './retry';
 import { RandomnessProvider } from './randomness';
 
 export const services = {
-  es: LegacyEsProvider,
+  legacyEs: LegacyEsProvider,
+  es: ElasticsearchProvider,
   esArchiver: EsArchiverProvider,
   kibanaServer: KibanaServerProvider,
   retry: RetryProvider,

test/functional/apps/management/_handle_alias.js

@@ -21,7 +21,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService, getPageObjects }) {
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const retry = getService('retry');
   const PageObjects = getPageObjects(['common', 'home', 'settings', 'discover', 'timePicker']);
 

test/functional/apps/management/_handle_version_conflict.js

@@ -32,7 +32,7 @@ import expect from '@kbn/expect';
 export default function ({ getService, getPageObjects }) {
   const esArchiver = getService('esArchiver');
   const browser = getService('browser');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const retry = getService('retry');
   const scriptedFiledName = 'versionConflictScript';
   const PageObjects = getPageObjects(['common', 'home', 'settings', 'discover', 'header']);

test/server_integration/config.js

@@ -29,9 +29,7 @@ export default async function ({ readConfigFile }) {
 
   return {
     services: {
-      es: commonConfig.get('services.es'),
-      esArchiver: commonConfig.get('services.esArchiver'),
-      retry: commonConfig.get('services.retry'),
+      ...commonConfig.get('services'),
       supertest: KibanaSupertestProvider,
       supertestWithoutAuth: KibanaSupertestWithoutAuthProvider,
       esSupertest: ElasticsearchSupertestProvider,

x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/es_index.ts

@@ -12,7 +12,7 @@ const ES_TEST_INDEX_NAME = 'functional-test-actions-index';
 
 // eslint-disable-next-line import/no-default-export
 export default function indexTest({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 

x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts

@@ -18,7 +18,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const retry = getService('retry');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 

x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/alerts.ts

@@ -20,7 +20,7 @@ import {
 // eslint-disable-next-line import/no-default-export
 export default function alertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const retry = getService('retry');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esTestIndexTool = new ESTestIndexTool(es, retry);

x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts

@@ -12,7 +12,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function createAlertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('create', () => {

x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/delete.ts

@@ -12,7 +12,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function createDeleteTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('delete', () => {

x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/disable.ts

@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function createDisableAlertTests({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 

x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/enable.ts

@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function createEnableAlertTests({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 

x-pack/test/alerting_api_integration/spaces_only/tests/actions/builtin_action_types/es_index.ts

@@ -12,7 +12,7 @@ const ES_TEST_INDEX_NAME = 'functional-test-actions-index';
 
 // eslint-disable-next-line import/no-default-export
 export default function indexTest({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
 

x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts

@@ -17,7 +17,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const retry = getService('retry');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 

x-pack/test/alerting_api_integration/spaces_only/tests/alerting/alerts.ts

@@ -19,7 +19,7 @@ import {
 // eslint-disable-next-line import/no-default-export
 export default function alertTests({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const retry = getService('retry');
   const esTestIndexTool = new ESTestIndexTool(es, retry);
 

x-pack/test/alerting_api_integration/spaces_only/tests/alerting/create.ts

@@ -12,7 +12,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function createAlertTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   describe('create', () => {
     const objectRemover = new ObjectRemover(supertest);

x-pack/test/alerting_api_integration/spaces_only/tests/alerting/delete.ts

@@ -12,7 +12,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function createDeleteTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   describe('delete', () => {
     const objectRemover = new ObjectRemover(supertest);

x-pack/test/alerting_api_integration/spaces_only/tests/alerting/disable.ts

@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function createDisableAlertTests({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('disable', () => {

x-pack/test/alerting_api_integration/spaces_only/tests/alerting/enable.ts

@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function createEnableAlertTests({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('enable', () => {

x-pack/test/api_integration/apis/beats/assign_tags_to_beats.js

@@ -10,7 +10,7 @@ import { ES_INDEX_NAME } from './constants';
 export default function ({ getService }) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const randomness = getService('randomness');
 
   describe('assign_tags_to_beats', () => {

x-pack/test/api_integration/apis/beats/create_enrollment_tokens.js

@@ -10,7 +10,7 @@ import { ES_INDEX_NAME } from './constants';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   describe('create_enrollment_token', () => {
     it('should create one token by default', async () => {

x-pack/test/api_integration/apis/beats/enroll_beat.js

@@ -12,7 +12,7 @@ import { ES_INDEX_NAME } from './constants';
 export default function ({ getService }) {
   const supertest = getService('supertest');
   const randomness = getService('randomness');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   describe('enroll_beat', () => {
     let validEnrollmentToken;

x-pack/test/api_integration/apis/beats/get_beat.js

@@ -10,7 +10,7 @@ import { ES_INDEX_NAME } from './constants';
 export default function ({ getService }) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   describe('get_beat_configuration', () => {
     const archive = 'beats/list';

x-pack/test/api_integration/apis/beats/index.js

@@ -7,7 +7,7 @@
 import { ES_INDEX_NAME } from './constants';
 
 export default function ({ getService, loadTestFile }) {
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   describe('beats', () => {
     const cleanup = () =>

x-pack/test/api_integration/apis/beats/remove_tags_from_beats.js

@@ -10,7 +10,7 @@ import { ES_INDEX_NAME } from './constants';
 export default function ({ getService }) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const randomness = getService('randomness');
 
   describe('remove_tags_from_beats', () => {

x-pack/test/api_integration/apis/beats/set_config.js

@@ -9,7 +9,7 @@ import { ES_INDEX_NAME } from './constants';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   describe('set_config', () => {

x-pack/test/api_integration/apis/beats/set_tag.js

@@ -9,7 +9,7 @@ import { ES_INDEX_NAME } from './constants';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   describe('set_tag', () => {
     it('should create a tag', async () => {

x-pack/test/api_integration/apis/beats/update_beat.js

@@ -11,7 +11,7 @@ import moment from 'moment';
 export default function ({ getService }) {
   const supertest = getService('supertest');
   const randomness = getService('randomness');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   describe('update_beat', () => {

x-pack/test/api_integration/apis/es/has_privileges.js

@@ -11,7 +11,7 @@ export default function ({ getService }) {
 
   describe('has_privileges', () => {
     before(async () => {
-      const es = getService('es');
+      const es = getService('legacyEs');
 
       await es.shield.postPrivileges({
         body: {
@@ -104,7 +104,7 @@ export default function ({ getService }) {
         });
 
       // Create privilege
-      const es = getService('es');
+      const es = getService('legacyEs');
       await es.shield.postPrivileges({
         body: {
           [application]: {

x-pack/test/api_integration/apis/es/post_privileges.js

@@ -9,7 +9,7 @@ export default function ({ getService }) {
 
   describe('post_privileges', () => {
     it('should allow privileges to be updated', async () => {
-      const es = getService('es');
+      const es = getService('legacyEs');
       const application = 'foo';
       const response = await es.shield.postPrivileges({
         body: {

x-pack/test/api_integration/apis/lens/telemetry.ts

@@ -22,7 +22,7 @@ const COMMON_HEADERS = {
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
-  const es: Client = getService('es');
+  const es: Client = getService('legacyEs');
   const callCluster: CallCluster = (((path: 'search', searchParams: SearchParams) => {
     return es[path].call(es, searchParams);
   }) as unknown) as CallCluster;

x-pack/test/api_integration/apis/logstash/cluster/load.js

@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   describe('load', () => {
     it('should return the ES cluster info', async () => {

x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.js

@@ -14,7 +14,7 @@ import { registerHelpers as registerFollowerIndicesnHelpers } from './follower_i
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const { addCluster, deleteAllClusters } = registerRemoteClustersHelpers(supertest);
   const {

x-pack/test/api_integration/apis/management/index_lifecycle_management/indices.js

@@ -13,7 +13,7 @@ import { getPolicyPayload } from './fixtures';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     getIndex,

x-pack/test/api_integration/apis/management/index_lifecycle_management/nodes.js

@@ -13,7 +13,7 @@ import { initElasticsearchHelpers } from './lib';
 export default function ({ getService }) {
   const supertest = getService('supertest');
 
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const { getNodesStats } = initElasticsearchHelpers(es);
   const { loadNodes, getNodeDetails } = registerHelpers({ supertest });

x-pack/test/api_integration/apis/management/index_lifecycle_management/policies.js

@@ -15,7 +15,7 @@ import { DEFAULT_POLICY_NAME } from './constants';
 export default function ({ getService }) {
   const supertest = getService('supertest');
 
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     createIndex,

x-pack/test/api_integration/apis/management/index_lifecycle_management/templates.js

@@ -12,7 +12,7 @@ import { registerHelpers as registerPoliciesHelpers } from './policies.helpers';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const { createIndexTemplate, cleanUp: cleanUpEsResources } = initElasticsearchHelpers(es);
 

x-pack/test/api_integration/apis/management/index_management/indices.js

@@ -11,7 +11,7 @@ import { registerHelpers } from './indices.helpers';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     createIndex,

x-pack/test/api_integration/apis/management/index_management/mapping.js

@@ -11,7 +11,7 @@ import { registerHelpers } from './mapping.helpers';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     createIndex,

x-pack/test/api_integration/apis/management/index_management/settings.js

@@ -11,7 +11,7 @@ import { registerHelpers } from './settings.helpers';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     createIndex,

x-pack/test/api_integration/apis/management/index_management/stats.js

@@ -11,7 +11,7 @@ import { registerHelpers } from './stats.helpers';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     createIndex,

x-pack/test/api_integration/apis/management/index_management/templates.js

@@ -11,7 +11,7 @@ import { registerHelpers } from './templates.helpers';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     cleanUp: cleanUpEsResources,

x-pack/test/api_integration/apis/management/rollup/index_patterns_extensions.js

@@ -13,7 +13,7 @@ import { getRandomString } from './lib';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     createIndexWithMappings,

x-pack/test/api_integration/apis/management/rollup/rollup.js

@@ -11,7 +11,7 @@ import { registerHelpers } from './rollup.test_helpers';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     createIndexWithMappings,

x-pack/test/api_integration/apis/management/rollup/rollup_search.js

@@ -12,7 +12,7 @@ import { getRandomString } from './lib';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     createIndexWithMappings,

x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js

@@ -13,7 +13,7 @@ import * as beatsMetrics from '../../../../../legacy/plugins/monitoring/server/l
 import * as apmMetrics from '../../../../../legacy/plugins/monitoring/server/lib/metrics/apm/metrics';
 
 export default function ({ getService }) {
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const metricSets = [
     {

x-pack/test/api_integration/apis/security/roles.js

@@ -7,7 +7,7 @@
 import expect from '@kbn/expect';
 
 export default function ({ getService }) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertest = getService('supertest');
   const config = getService('config');
   const basic = config.get('esTestCluster.license') === 'basic';

x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts

@@ -10,7 +10,7 @@ import { TelemetrySavedObjectAttributes } from '../../../../../src/legacy/core_p
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function optInTest({ getService }: FtrProviderContext) {
-  const client: Client = getService('es');
+  const client: Client = getService('legacyEs');
   const supertest = getService('supertest');
 
   describe('/api/telemetry/v2/optIn API Telemetry User has seen OptIn Notice', () => {

x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts

@@ -106,7 +106,7 @@ export default function({ getService }: FtrProviderContext) {
         before(async () => {
           const index = 'heartbeat-8.0.0';
 
-          const es = getService('es');
+          const es = getService('legacyEs');
           dateRangeStart = new Date().toISOString();
           checks = await makeChecks(es, index, testMonitorId, 1, numIps, {}, d => {
             if (d.summary) {

x-pack/test/api_integration/apis/uptime/index.js

@@ -5,7 +5,7 @@
  */
 
 export default function ({ getService, loadTestFile }) {
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   describe('uptime', () => {
     before(() =>

x-pack/test/api_integration/services/index.ts

@@ -30,7 +30,7 @@ export const services = {
   esSupertest: kibanaApiIntegrationServices.esSupertest,
   supertest: kibanaApiIntegrationServices.supertest,
 
-  es: LegacyEsProvider,
+  legacyEs: LegacyEsProvider,
   esSupertestWithoutAuth: EsSupertestWithoutAuthProvider,
   infraOpsGraphQLClient: InfraOpsGraphQLClientProvider,
   infraOpsGraphQLClientFactory: InfraOpsGraphQLClientFactoryProvider,

x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js

@@ -11,7 +11,7 @@ import mockRolledUpData, { mockIndices } from './hybrid_index_helper';
 
 export default function ({ getService, getPageObjects }) {
 
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
   const retry = getService('retry');
   const PageObjects = getPageObjects(['common', 'settings']);

x-pack/test/functional/apps/rollup_job/rollup_jobs.js

@@ -11,7 +11,7 @@ import { mockIndices } from './hybrid_index_helper';
 
 export default function ({ getService, getPageObjects }) {
 
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
   const PageObjects = getPageObjects(['rollup', 'common']);
 

x-pack/test/functional/services/machine_learning/api.ts

@@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 import { JOB_STATE, DATAFEED_STATE } from '../../../../legacy/plugins/ml/common/constants/states';
 
 export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const log = getService('log');
   const retry = getService('retry');
   const esSupertest = getService('esSupertest');

x-pack/test/functional/services/transform_ui/api.ts

@@ -8,7 +8,7 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export function TransformAPIProvider({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const log = getService('log');
   const retry = getService('retry');
 

x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts

@@ -362,7 +362,7 @@ export default function({ getService }: FtrProviderContext) {
         // Let's delete tokens from `.security-tokens` index directly to simulate the case when
         // Elasticsearch automatically removes access/refresh token document from the index after
         // some period of time.
-        const esResponse = await getService('es').deleteByQuery({
+        const esResponse = await getService('legacyEs').deleteByQuery({
           index: '.security-tokens',
           q: 'doc_type:token',
           refresh: true,

x-pack/test/kerberos_api_integration/services.ts

@@ -7,7 +7,7 @@
 import { services as apiIntegrationServices } from '../api_integration/services';
 
 export const services = {
-  es: apiIntegrationServices.es,
+  legacyEs: apiIntegrationServices.legacyEs,
   esSupertest: apiIntegrationServices.esSupertest,
   supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth,
 };

x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.js

@@ -482,7 +482,7 @@ export default function ({ getService }) {
         // Let's delete tokens from `.security-tokens` index directly to simulate the case when
         // Elasticsearch automatically removes access/refresh token document from the index
         // after some period of time.
-        const esResponse = await getService('es').deleteByQuery({
+        const esResponse = await getService('legacyEs').deleteByQuery({
           index: '.security-tokens',
           q: 'doc_type:token',
           refresh: true,

x-pack/test/oidc_api_integration/services.ts

@@ -7,6 +7,6 @@
 import { services as apiIntegrationServices } from '../api_integration/services';
 
 export const services = {
-  es: apiIntegrationServices.es,
+  legacyEs: apiIntegrationServices.legacyEs,
   supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth,
 };

x-pack/test/plugin_api_integration/test_suites/encrypted_saved_objects/encrypted_saved_objects_api.ts

@@ -9,7 +9,7 @@ import { SavedObject } from 'src/core/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function({ getService }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const randomness = getService('randomness');
   const supertest = getService('supertest');
 

x-pack/test/plugin_api_integration/test_suites/task_manager/task_manager_integration.js

@@ -12,7 +12,7 @@ import supertestAsPromised from 'supertest-as-promised';
 const { task: { properties: taskManagerIndexMapping } } = require('../../../../legacy/plugins/task_manager/mappings.json');
 
 export default function ({ getService }) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const log = getService('log');
   const retry = getService('retry');
   const config = getService('config');

x-pack/test/saml_api_integration/apis/security/saml_login.ts

@@ -622,7 +622,7 @@ export default function({ getService }: FtrProviderContext) {
         // Let's delete tokens from `.security` index directly to simulate the case when
         // Elasticsearch automatically removes access/refresh token document from the index
         // after some period of time.
-        const esResponse = await getService('es').deleteByQuery({
+        const esResponse = await getService('legacyEs').deleteByQuery({
           index: '.security-tokens',
           q: 'doc_type:token',
           refresh: true,

x-pack/test/saml_api_integration/config.ts

@@ -21,7 +21,7 @@ export default async function({ readConfigFile }: FtrConfigProviderContext) {
     servers: xPackAPITestsConfig.get('servers'),
     services: {
       randomness: kibanaAPITestsConfig.get('services.randomness'),
-      es: kibanaAPITestsConfig.get('services.es'),
+      legacyEs: kibanaAPITestsConfig.get('services.legacyEs'),
       supertestWithoutAuth: xPackAPITestsConfig.get('services.supertestWithoutAuth'),
     },
     junit: {

x-pack/test/saml_api_integration/services.ts

@@ -8,6 +8,6 @@ import { services as apiIntegrationServices } from '../api_integration/services'
 
 export const services = {
   randomness: apiIntegrationServices.randomness,
-  es: apiIntegrationServices.es,
+  legacyEs: apiIntegrationServices.legacyEs,
   supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth,
 };

x-pack/test/saved_object_api_integration/common/services/index.ts

@@ -12,7 +12,7 @@ import { services as kibanaApiIntegrationServices } from '../../../../../test/ap
 import { services as kibanaFunctionalServices } from '../../../../../test/functional/services';
 
 export const services = {
-  es: LegacyEsProvider,
+  legacyEs: LegacyEsProvider,
   esSupertestWithoutAuth: apiIntegrationServices.esSupertestWithoutAuth,
   supertest: kibanaApiIntegrationServices.supertest,
   supertestWithoutAuth: apiIntegrationServices.supertestWithoutAuth,

x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts

@@ -12,7 +12,7 @@ import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create';
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     bulkCreateTest,

x-pack/test/saved_object_api_integration/security_and_spaces/apis/create.ts

@@ -11,7 +11,7 @@ import { createTestSuiteFactory } from '../../common/suites/create';
 
 export default function({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   const {

x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts

@@ -12,7 +12,7 @@ import { importTestSuiteFactory } from '../../common/suites/import';
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     importTest,

x-pack/test/saved_object_api_integration/security_and_spaces/apis/index.ts

@@ -8,7 +8,7 @@ import { createUsersAndRoles } from '../../common/lib/create_users_and_roles';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function({ getService, loadTestFile }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertest = getService('supertest');
 
   describe('saved objects security and spaces enabled', function() {

x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts

@@ -12,7 +12,7 @@ import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     resolveImportErrorsTest,

x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts

@@ -11,7 +11,7 @@ import { bulkCreateTestSuiteFactory } from '../../common/suites/bulk_create';
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     bulkCreateTest,

x-pack/test/saved_object_api_integration/security_only/apis/create.ts

@@ -10,7 +10,7 @@ import { createTestSuiteFactory } from '../../common/suites/create';
 
 export default function({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   const {

x-pack/test/saved_object_api_integration/security_only/apis/import.ts

@@ -11,7 +11,7 @@ import { importTestSuiteFactory } from '../../common/suites/import';
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     importTest,

x-pack/test/saved_object_api_integration/security_only/apis/index.ts

@@ -8,7 +8,7 @@ import { createUsersAndRoles } from '../../common/lib/create_users_and_roles';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
 export default function({ getService, loadTestFile }: FtrProviderContext) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertest = getService('supertest');
 
   describe('saved objects security only enabled', function() {

x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts

@@ -11,7 +11,7 @@ import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     resolveImportErrorsTest,

x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts

@@ -25,7 +25,7 @@ const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => {
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     bulkCreateTest,

x-pack/test/saved_object_api_integration/spaces_only/apis/create.ts

@@ -23,7 +23,7 @@ const expectNamespaceSpecifiedBadRequest = (resp: { [key: string]: any }) => {
 
 export default function({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const es = getService('es');
+  const es = getService('legacyEs');
   const esArchiver = getService('esArchiver');
 
   const {

x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts

@@ -11,7 +11,7 @@ import { importTestSuiteFactory } from '../../common/suites/import';
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     importTest,

x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts

@@ -11,7 +11,7 @@ import { resolveImportErrorsTestSuiteFactory } from '../../common/suites/resolve
 export default function({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     resolveImportErrorsTest,

x-pack/test/spaces_api_integration/common/config.ts

@@ -34,7 +34,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
       testFiles: [require.resolve(`../${name}/apis/`)],
       servers: config.xpack.api.get('servers'),
       services: {
-        es: LegacyEsProvider,
+        legacyEs: LegacyEsProvider,
         esSupertestWithoutAuth: config.xpack.api.get('services.esSupertestWithoutAuth'),
         supertest: config.kibana.api.get('services.supertest'),
         supertestWithoutAuth: config.xpack.api.get('services.supertestWithoutAuth'),

x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space.ts

@@ -13,7 +13,7 @@ import { copyToSpaceTestSuiteFactory } from '../../common/suites/copy_to_space';
 export default function copyToSpaceSpacesAndSecuritySuite({ getService }: TestInvoker) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     copyToSpaceTest,

x-pack/test/spaces_api_integration/security_and_spaces/apis/delete.ts

@@ -13,7 +13,7 @@ import { deleteTestSuiteFactory } from '../../common/suites/delete';
 export default function deleteSpaceTestSuite({ getService }: TestInvoker) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esArchiver = getService('esArchiver');
-  const es = getService('es');
+  const es = getService('legacyEs');
 
   const {
     deleteTest,

x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts

@@ -9,7 +9,7 @@ import { TestInvoker } from '../../common/lib/types';
 
 // eslint-disable-next-line import/no-default-export
 export default function({ loadTestFile, getService }: TestInvoker) {
-  const es = getService('es');
+  const es = getService('legacyEs');
   const supertest = getService('supertest');
 
   describe('spaces api with security', function() {