[Fleet] Migrate ES client

x-pack/plugins/fleet/server/routes/epm/handlers.ts

@@ -225,6 +225,7 @@ export const installPackageFromRegistryHandler: RequestHandler<
 > = async (context, request, response) => {
   const savedObjectsClient = context.core.savedObjects.client;
   const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
+  const esClient = context.core.elasticsearch.client.asCurrentUser;
   const { pkgkey } = request.params;
   const { pkgName, pkgVersion } = splitPkgKey(pkgkey);
   const installedPkg = await getInstallationObject({ savedObjectsClient, pkgName });
@@ -234,6 +235,7 @@ export const installPackageFromRegistryHandler: RequestHandler<
       savedObjectsClient,
       pkgkey,
       callCluster,
+      esClient,
       force: request.body?.force,
     });
     const body: InstallPackageResponse = {
@@ -249,6 +251,7 @@ export const installPackageFromRegistryHandler: RequestHandler<
       pkgVersion,
       installedPkg,
       callCluster,
+      esClient,
     });
 
     return defaultResult;
@@ -277,9 +280,11 @@ export const bulkInstallPackagesFromRegistryHandler: RequestHandler<
 > = async (context, request, response) => {
   const savedObjectsClient = context.core.savedObjects.client;
   const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
+  const esClient = context.core.elasticsearch.client.asCurrentUser;
   const bulkInstalledResponses = await bulkInstallPackages({
     savedObjectsClient,
     callCluster,
+    esClient,
     packagesToUpgrade: request.body.packages,
   });
   const payload = bulkInstalledResponses.map(bulkInstallServiceResponseToHttpEntry);
@@ -302,13 +307,15 @@ export const installPackageByUploadHandler: RequestHandler<
   }
   const savedObjectsClient = context.core.savedObjects.client;
   const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
+  const esClient = context.core.elasticsearch.client.asCurrentUser;
   const contentType = request.headers['content-type'] as string; // from types it could also be string[] or undefined but this is checked later
   const archiveBuffer = Buffer.from(request.body);
   try {
     const res = await installPackage({
       installSource: 'upload',
       savedObjectsClient,
       callCluster,
+      esClient,
       archiveBuffer,
       contentType,
     });
@@ -327,8 +334,8 @@ export const deletePackageHandler: RequestHandler<
   try {
     const { pkgkey } = request.params;
     const savedObjectsClient = context.core.savedObjects.client;
-    const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
-    const res = await removeInstallation({ savedObjectsClient, pkgkey, callCluster });
+    const esClient = context.core.elasticsearch.client.asCurrentUser;
+    const res = await removeInstallation({ savedObjectsClient, pkgkey, esClient });
     const body: DeletePackageResponse = {
       response: res,
     };

x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
 import {
   ElasticsearchAssetType,
   EsAssetReference,
@@ -32,6 +32,7 @@ export const installIlmForDataStream = async (
   registryPackage: InstallablePackage,
   paths: string[],
   callCluster: CallESAsCurrentUser,
+  esClient: ElasticsearchClient,
   savedObjectsClient: SavedObjectsClientContract
 ) => {
   const installation = await getInstallation({ savedObjectsClient, pkgName: registryPackage.name });
@@ -44,7 +45,7 @@ export const installIlmForDataStream = async (
 
   // delete all previous ilm
   await deleteIlms(
-    callCluster,
+    esClient,
     previousInstalledIlmEsAssets.map((asset) => asset.id)
   );
   // install the latest dataset

x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts

@@ -5,18 +5,22 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
-import { CallESAsCurrentUser, ElasticsearchAssetType, EsAssetReference } from '../../../../types';
+import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
+import { ElasticsearchAssetType, EsAssetReference } from '../../../../types';
 import { PACKAGES_SAVED_OBJECT_TYPE } from '../../../../../common/constants';
 
-export const deleteIlms = async (callCluster: CallESAsCurrentUser, ilmPolicyIds: string[]) => {
+export const deleteIlms = async (esClient: ElasticsearchClient, ilmPolicyIds: string[]) => {
   await Promise.all(
     ilmPolicyIds.map(async (ilmPolicyId) => {
-      await callCluster('transport.request', {
-        method: 'DELETE',
-        path: `_ilm/policy/${ilmPolicyId}`,
-        ignore: [404, 400],
-      });
+      await esClient.transport.request(
+        {
+          method: 'DELETE',
+          path: `_ilm/policy/${ilmPolicyId}`,
+        },
+        {
+          ignore: [404, 400],
+        }
+      );
     })
   );
 };

x-pack/plugins/fleet/server/services/epm/elasticsearch/ilm/install.ts

@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import { CallESAsCurrentUser, ElasticsearchAssetType } from '../../../../types';
+import { ElasticsearchClient } from 'kibana/server';
+import { ElasticsearchAssetType } from '../../../../types';
 import { getAsset, getPathParts } from '../../archive';
 
-export async function installILMPolicy(paths: string[], callCluster: CallESAsCurrentUser) {
+export async function installILMPolicy(paths: string[], esClient: ElasticsearchClient) {
   const ilmPaths = paths.filter((path) => isILMPolicy(path));
   if (!ilmPaths.length) return;
   await Promise.all(
@@ -17,7 +18,7 @@ export async function installILMPolicy(paths: string[], callCluster: CallESAsCur
       const { file } = getPathParts(path);
       const name = file.substr(0, file.lastIndexOf('.'));
       try {
-        await callCluster('transport.request', {
+        await esClient.transport.request({
           method: 'PUT',
           path: '/_ilm/policy/' + name,
           body,
@@ -28,19 +29,8 @@ export async function installILMPolicy(paths: string[], callCluster: CallESAsCur
     })
   );
 }
+
 const isILMPolicy = (path: string) => {
   const pathParts = getPathParts(path);
   return pathParts.type === ElasticsearchAssetType.ilmPolicy;
 };
-export async function policyExists(
-  name: string,
-  callCluster: CallESAsCurrentUser
-): Promise<boolean> {
-  const response = await callCluster('transport.request', {
-    method: 'GET',
-    path: '/_ilm/policy/?filter_path=' + name,
-  });
-
-  // If the response contains a key, it means the policy exists
-  return Object.keys(response).length > 0;
-}

x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/remove.ts

@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'src/core/server';
+import { ElasticsearchClient, SavedObjectsClientContract } from 'src/core/server';
 import { appContextService } from '../../../';
-import { CallESAsCurrentUser, ElasticsearchAssetType } from '../../../../types';
+import { ElasticsearchAssetType } from '../../../../types';
 import { IngestManagerError } from '../../../../errors';
 import { getInstallation } from '../../packages/get';
 import { PACKAGES_SAVED_OBJECT_TYPE, EsAssetReference } from '../../../../../common';
 
 export const deletePreviousPipelines = async (
-  callCluster: CallESAsCurrentUser,
+  esClient: ElasticsearchClient,
   savedObjectsClient: SavedObjectsClientContract,
   pkgName: string,
   previousPkgVersion: string
@@ -27,7 +27,7 @@ export const deletePreviousPipelines = async (
       type === ElasticsearchAssetType.ingestPipeline && id.includes(previousPkgVersion)
   );
   const deletePipelinePromises = installedPipelines.map(({ type, id }) => {
-    return deletePipeline(callCluster, id);
+    return deletePipeline(esClient, id);
   });
   try {
     await Promise.all(deletePipelinePromises);
@@ -56,11 +56,11 @@ export const deletePipelineRefs = async (
     installed_es: filteredAssets,
   });
 };
-export async function deletePipeline(callCluster: CallESAsCurrentUser, id: string): Promise<void> {
+export async function deletePipeline(esClient: ElasticsearchClient, id: string): Promise<void> {
   // '*' shouldn't ever appear here, but it still would delete all ingest pipelines
   if (id && id !== '*') {
     try {
-      await callCluster('ingest.deletePipeline', { id });
+      await esClient.ingest.deletePipeline({ id });
     } catch (err) {
       // Only throw if error is not a 404 error. Sometimes the pipeline is already deleted, but we have
       // duplicate references to them, see https://github.com/elastic/kibana/issues/91192

x-pack/plugins/fleet/server/services/epm/elasticsearch/template/install.test.ts

@@ -12,15 +12,16 @@ import { elasticsearchServiceMock } from 'src/core/server/mocks';
 import { installTemplate } from './install';
 
 test('tests installPackage to use correct priority and index_patterns for data stream with dataset_is_prefix not set', async () => {
-  const callCluster = elasticsearchServiceMock.createLegacyScopedClusterClient().callAsCurrentUser;
-  callCluster.mockImplementation(async (_, params) => {
+  const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
+  esClient.transport.request.mockImplementation((params) => {
     if (
       params &&
       params.method === 'GET' &&
       params.path === '/_index_template/metrics-package.dataset'
     ) {
-      return { index_templates: [] };
+      return elasticsearchServiceMock.createSuccessTransportRequestPromise({ index_templates: [] });
     }
+    return elasticsearchServiceMock.createSuccessTransportRequestPromise({});
   });
 
   const fields: Field[] = [];
@@ -40,7 +41,7 @@ test('tests installPackage to use correct priority and index_patterns for data s
   const templateIndexPatternDatasetIsPrefixUnset = 'metrics-package.dataset-*';
   const templatePriorityDatasetIsPrefixUnset = 200;
   await installTemplate({
-    callCluster,
+    esClient,
     fields,
     dataStream: dataStreamDatasetIsPrefixUnset,
     packageVersion: pkg.version,
@@ -54,15 +55,16 @@ test('tests installPackage to use correct priority and index_patterns for data s
 });
 
 test('tests installPackage to use correct priority and index_patterns for data stream with dataset_is_prefix set to false', async () => {
-  const callCluster = elasticsearchServiceMock.createLegacyScopedClusterClient().callAsCurrentUser;
-  callCluster.mockImplementation(async (_, params) => {
+  const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
+  esClient.transport.request.mockImplementation((params) => {
     if (
       params &&
       params.method === 'GET' &&
       params.path === '/_index_template/metrics-package.dataset'
     ) {
-      return { index_templates: [] };
+      return elasticsearchServiceMock.createSuccessTransportRequestPromise({ index_templates: [] });
     }
+    return elasticsearchServiceMock.createSuccessTransportRequestPromise({});
   });
 
   const fields: Field[] = [];
@@ -83,7 +85,7 @@ test('tests installPackage to use correct priority and index_patterns for data s
   const templateIndexPatternDatasetIsPrefixFalse = 'metrics-package.dataset-*';
   const templatePriorityDatasetIsPrefixFalse = 200;
   await installTemplate({
-    callCluster,
+    esClient,
     fields,
     dataStream: dataStreamDatasetIsPrefixFalse,
     packageVersion: pkg.version,
@@ -97,15 +99,16 @@ test('tests installPackage to use correct priority and index_patterns for data s
 });
 
 test('tests installPackage to use correct priority and index_patterns for data stream with dataset_is_prefix set to true', async () => {
-  const callCluster = elasticsearchServiceMock.createLegacyScopedClusterClient().callAsCurrentUser;
-  callCluster.mockImplementation(async (_, params) => {
+  const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
+  esClient.transport.request.mockImplementation((params) => {
     if (
       params &&
       params.method === 'GET' &&
       params.path === '/_index_template/metrics-package.dataset'
     ) {
-      return { index_templates: [] };
+      return elasticsearchServiceMock.createSuccessTransportRequestPromise({ index_templates: [] });
     }
+    return elasticsearchServiceMock.createSuccessTransportRequestPromise({});
   });
 
   const fields: Field[] = [];
@@ -126,7 +129,7 @@ test('tests installPackage to use correct priority and index_patterns for data s
   const templateIndexPatternDatasetIsPrefixTrue = 'metrics-package.dataset.*-*';
   const templatePriorityDatasetIsPrefixTrue = 150;
   await installTemplate({
-    callCluster,
+    esClient,
     fields,
     dataStream: dataStreamDatasetIsPrefixTrue,
     packageVersion: pkg.version,
@@ -140,14 +143,14 @@ test('tests installPackage to use correct priority and index_patterns for data s
 });
 
 test('tests installPackage remove the aliases property if the property existed', async () => {
-  const callCluster = elasticsearchServiceMock.createLegacyScopedClusterClient().callAsCurrentUser;
-  callCluster.mockImplementation(async (_, params) => {
+  const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
+  esClient.transport.request.mockImplementation((params) => {
     if (
       params &&
       params.method === 'GET' &&
       params.path === '/_index_template/metrics-package.dataset'
     ) {
-      return {
+      return elasticsearchServiceMock.createSuccessTransportRequestPromise({
         index_templates: [
           {
             name: 'metrics-package.dataset',
@@ -157,8 +160,9 @@ test('tests installPackage remove the aliases property if the property existed',
             },
           },
         ],
-      };
+      });
     }
+    return elasticsearchServiceMock.createSuccessTransportRequestPromise({});
   });
 
   const fields: Field[] = [];
@@ -178,7 +182,7 @@ test('tests installPackage remove the aliases property if the property existed',
   const templateIndexPatternDatasetIsPrefixUnset = 'metrics-package.dataset-*';
   const templatePriorityDatasetIsPrefixUnset = 200;
   await installTemplate({
-    callCluster,
+    esClient,
     fields,
     dataStream: dataStreamDatasetIsPrefixUnset,
     packageVersion: pkg.version,