elastic · afgomez · Mar 9, 2021 · Mar 8, 2021
diff --git a/api_docs/fleet.json b/api_docs/fleet.json
@@ -2453,7 +2453,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/fleet/server/services/package_policy.ts",
-          "lineNumber": 594
+          "lineNumber": 592
         },
         "signature": [
           "PackagePolicyService"

diff --git a/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts b/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts
@@ -104,7 +104,6 @@ export const createAgentPolicyHandler: RequestHandler<
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const esClient = context.core.elasticsearch.client.asCurrentUser;
-  const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
   const user = (await appContextService.getSecurity()?.authc.getCurrentUser(request)) || undefined;
   const withSysMonitoring = request.query.sys_monitoring ?? false;
   try {
@@ -130,7 +129,7 @@ export const createAgentPolicyHandler: RequestHandler<
     if (withSysMonitoring && newSysPackagePolicy !== undefined && agentPolicy !== undefined) {
       newSysPackagePolicy.policy_id = agentPolicy.id;
       newSysPackagePolicy.namespace = agentPolicy.namespace;
-      await packagePolicyService.create(soClient, esClient, callCluster, newSysPackagePolicy, {
+      await packagePolicyService.create(soClient, esClient, newSysPackagePolicy, {
         user,
         bumpRevision: false,
       });

diff --git a/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts b/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
@@ -16,63 +16,59 @@ import { defaultIngestErrorHandler } from '../../errors';
 
 const DATA_STREAM_INDEX_PATTERN = 'logs-*-*,metrics-*-*,traces-*-*';
 
-interface ESDataStreamInfoResponse {
-  data_streams: Array<{
+interface ESDataStreamInfo {
+  name: string;
+  timestamp_field: {
     name: string;
-    timestamp_field: {
+  };
+  indices: Array<{ index_name: string; index_uuid: string }>;
+  generation: number;
+  _meta?: {
+    package?: {
       name: string;
     };
-    indices: Array<{ index_name: string; index_uuid: string }>;
-    generation: number;
-    _meta?: {
-      package?: {
-        name: string;
-      };
-      managed_by?: string;
-      managed?: boolean;
-      [key: string]: any;
-    };
-    status: string;
-    template: string;
-    ilm_policy: string;
-    hidden: boolean;
-  }>;
+    managed_by?: string;
+    managed?: boolean;
+    [key: string]: any;
+  };
+  status: string;
+  template: string;
+  ilm_policy: string;
+  hidden: boolean;
 }
 
-interface ESDataStreamStatsResponse {
-  data_streams: Array<{
-    data_stream: string;
-    backing_indices: number;
-    store_size_bytes: number;
-    maximum_timestamp: number;
-  }>;
+interface ESDataStreamStats {
+  data_stream: string;
+  backing_indices: number;
+  store_size_bytes: number;
+  maximum_timestamp: number;
 }
 
 export const getListHandler: RequestHandler = async (context, request, response) => {
-  const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
+  const esClient = context.core.elasticsearch.client.asCurrentUser;
+
   const body: GetDataStreamsResponse = {
     data_streams: [],
   };
 
   try {
     // Get matching data streams, their stats, and package SOs
     const [
-      { data_streams: dataStreamsInfo },
-      { data_streams: dataStreamStats },
+      {
+        body: { data_streams: dataStreamsInfo },
+      },
+      {
+        body: { data_streams: dataStreamStats },
+      },
       packageSavedObjects,
     ] = await Promise.all([
-      callCluster('transport.request', {
-        method: 'GET',
-        path: `/_data_stream/${DATA_STREAM_INDEX_PATTERN}`,
-      }) as Promise<ESDataStreamInfoResponse>,
-      callCluster('transport.request', {
-        method: 'GET',
-        path: `/_data_stream/${DATA_STREAM_INDEX_PATTERN}/_stats`,
-      }) as Promise<ESDataStreamStatsResponse>,
+      esClient.indices.getDataStream({ name: DATA_STREAM_INDEX_PATTERN }),
+      esClient.indices.dataStreamsStats({ name: DATA_STREAM_INDEX_PATTERN }),
       getPackageSavedObjects(context.core.savedObjects.client),
     ]);
-    const dataStreamsInfoByName = keyBy(dataStreamsInfo, 'name');
-    const dataStreamsStatsByName = keyBy(dataStreamStats, 'data_stream');
+
+    const dataStreamsInfoByName = keyBy<ESDataStreamInfo>(dataStreamsInfo, 'name');
+    const dataStreamsStatsByName = keyBy<ESDataStreamStats>(dataStreamStats, 'data_stream');
 
     // Combine data stream info
     const dataStreams = merge(dataStreamsInfoByName, dataStreamsStatsByName);
@@ -99,8 +95,10 @@ export const getListHandler: RequestHandler = async (context, request, response)
 
       // Query backing indices to extract data stream dataset, namespace, and type values
       const {
-        aggregations: { dataset, namespace, type },
-      } = await callCluster('search', {
+        body: {
+          aggregations: { dataset, namespace, type },
+        },
+      } = await esClient.search({
         index: dataStream.indices.map((index) => index.index_name),
         body: {
           size: 0,

diff --git a/x-pack/plugins/fleet/server/routes/epm/handlers.ts b/x-pack/plugins/fleet/server/routes/epm/handlers.ts
@@ -226,7 +226,7 @@ export const installPackageFromRegistryHandler: RequestHandler<
   TypeOf<typeof InstallPackageFromRegistryRequestSchema.body>
 > = 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 });
@@ -235,7 +235,7 @@ export const installPackageFromRegistryHandler: RequestHandler<
       installSource: 'registry',
       savedObjectsClient,
       pkgkey,
-      callCluster,
+      esClient,
       force: request.body?.force,
     });
     const body: InstallPackageResponse = {
@@ -250,7 +250,7 @@ export const installPackageFromRegistryHandler: RequestHandler<
       pkgName,
       pkgVersion,
       installedPkg,
-      callCluster,
+      esClient,
     });
 
     return defaultResult;
@@ -278,10 +278,10 @@ export const bulkInstallPackagesFromRegistryHandler: RequestHandler<
   TypeOf<typeof BulkUpgradePackagesFromRegistryRequestSchema.body>
 > = 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);
@@ -303,14 +303,14 @@ 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,
     });
@@ -329,8 +329,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,
     };

diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
@@ -27,7 +27,7 @@ jest.mock('../../services/package_policy', (): {
       compilePackagePolicyInputs: jest.fn((packageInfo, dataInputs) => Promise.resolve(dataInputs)),
       buildPackagePolicyFromPackage: jest.fn(),
       bulkCreate: jest.fn(),
-      create: jest.fn((soClient, esClient, callCluster, newData) =>
+      create: jest.fn((soClient, esClient, newData) =>
         Promise.resolve({
           ...newData,
           inputs: newData.inputs.map((input) => ({
@@ -204,7 +204,8 @@ describe('When calling package policy', () => {
         );
         await routeHandler(context, request, response);
         expect(response.ok).toHaveBeenCalled();
-        expect(packagePolicyServiceMock.create.mock.calls[0][3]).toEqual({
+
+        expect(packagePolicyServiceMock.create.mock.calls[0][2]).toEqual({
           policy_id: 'a5ca00c0-b30c-11ea-9732-1bb05811278c',
           description: '',
           enabled: true,

diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
@@ -79,7 +79,6 @@ export const createPackagePolicyHandler: RequestHandler<
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const esClient = context.core.elasticsearch.client.asCurrentUser;
-  const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
   const user = (await appContextService.getSecurity()?.authc.getCurrentUser(request)) || undefined;
   try {
     const newData = await packagePolicyService.runExternalCallbacks(
@@ -90,15 +89,9 @@ export const createPackagePolicyHandler: RequestHandler<
     );
 
     // Create package policy
-    const packagePolicy = await packagePolicyService.create(
-      soClient,
-      esClient,
-      callCluster,
-      newData,
-      {
-        user,
-      }
-    );
+    const packagePolicy = await packagePolicyService.create(soClient, esClient, newData, {
+      user,
+    });
     const body: CreatePackagePolicyResponse = { item: packagePolicy };
     return response.ok({
       body,

diff --git a/x-pack/plugins/fleet/server/routes/setup/handlers.ts b/x-pack/plugins/fleet/server/routes/setup/handlers.ts
@@ -63,9 +63,8 @@ export const createFleetSetupHandler: RequestHandler<
   try {
     const soClient = context.core.savedObjects.client;
     const esClient = context.core.elasticsearch.client.asCurrentUser;
-    const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
-    await setupIngestManager(soClient, esClient, callCluster);
-    await setupFleet(soClient, esClient, callCluster, {
+    await setupIngestManager(soClient, esClient);
+    await setupFleet(soClient, esClient, {
       forceRecreate: request.body?.forceRecreate ?? false,
     });
 
@@ -80,11 +79,10 @@ export const createFleetSetupHandler: RequestHandler<
 export const FleetSetupHandler: RequestHandler = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
   const esClient = context.core.elasticsearch.client.asCurrentUser;
-  const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
 
   try {
     const body: PostIngestSetupResponse = { isInitialized: true };
-    await setupIngestManager(soClient, esClient, callCluster);
+    await setupIngestManager(soClient, esClient);
     return response.ok({
       body,
     });

diff --git a/x-pack/plugins/fleet/server/services/api_keys/security.ts b/x-pack/plugins/fleet/server/services/api_keys/security.ts
@@ -10,7 +10,6 @@ import type { Request } from '@hapi/hapi';
 import { KibanaRequest } from '../../../../../../src/core/server';
 import type { SavedObjectsClientContract } from '../../../../../../src/core/server';
 import { FleetAdminUserInvalidError, isESClientError } from '../../errors';
-import type { CallESAsCurrentUser } from '../../types';
 import { appContextService } from '../app_context';
 import { outputService } from '../output';
 
@@ -56,16 +55,6 @@ export async function createAPIKey(
     throw err;
   }
 }
-export async function authenticate(callCluster: CallESAsCurrentUser) {
-  try {
-    await callCluster('transport.request', {
-      path: '/_security/_authenticate',
-      method: 'GET',
-    });
-  } catch (e) {
-    throw new Error('ApiKey is not valid: impossible to authenticate user');
-  }
-}
 
 export async function invalidateAPIKeys(soClient: SavedObjectsClientContract, ids: string[]) {
   const adminUser = await outputService.getAdminUser(soClient);

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/install.ts
@@ -5,15 +5,14 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
 
 import { ElasticsearchAssetType } from '../../../../../common/types/models';
 import type {
   EsAssetReference,
   InstallablePackage,
   RegistryDataStream,
 } from '../../../../../common/types/models';
-import type { CallESAsCurrentUser } from '../../../../types';
 import { getInstallation } from '../../packages';
 import { saveInstalledEsRefs } from '../../packages/install';
 import { getAsset } from '../transform/common';
@@ -33,7 +32,7 @@ interface IlmPathDataset {
 export const installIlmForDataStream = async (
   registryPackage: InstallablePackage,
   paths: string[],
-  callCluster: CallESAsCurrentUser,
+  esClient: ElasticsearchClient,
   savedObjectsClient: SavedObjectsClientContract
 ) => {
   const installation = await getInstallation({ savedObjectsClient, pkgName: registryPackage.name });
@@ -46,7 +45,7 @@ export const installIlmForDataStream = async (
 
   // delete all previous ilm
   await deleteIlms(
-    callCluster,
+    esClient,
     previousInstalledIlmEsAssets.map((asset) => asset.id)
   );
   // install the latest dataset
@@ -86,7 +85,7 @@ export const installIlmForDataStream = async (
     );
 
     const installationPromises = ilmInstallations.map(async (ilmInstallation) => {
-      return handleIlmInstall({ callCluster, ilmInstallation });
+      return handleIlmInstall({ esClient, ilmInstallation });
     });
 
     installedIlms = await Promise.all(installationPromises).then((results) => results.flat());
@@ -111,13 +110,13 @@ export const installIlmForDataStream = async (
 };
 
 async function handleIlmInstall({
-  callCluster,
+  esClient,
   ilmInstallation,
 }: {
-  callCluster: CallESAsCurrentUser;
+  esClient: ElasticsearchClient;
   ilmInstallation: IlmInstallation;
 }): Promise<EsAssetReference> {
-  await callCluster('transport.request', {
+  await esClient.transport.request({
     method: 'PUT',
     path: `/_ilm/policy/${ilmInstallation.installationName}`,
     body: ilmInstallation.content,

diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/datastream_ilm/remove.ts
@@ -5,20 +5,24 @@
  * 2.0.
  */
 
-import type { SavedObjectsClientContract } from 'kibana/server';
+import type { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server';
 
 import { ElasticsearchAssetType } from '../../../../types';
-import type { CallESAsCurrentUser, EsAssetReference } from '../../../../types';
+import type { 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],
+        }
+      );
     })
   );
 };