[Alerting] Add scoped cluster client to alerts and actions services

x-pack/plugins/actions/server/mocks.ts

@@ -45,6 +45,7 @@ const createServicesMock = () => {
  callCluster: elasticsearchServiceMock.createLegacyScopedClusterClient().callAsCurrentUser,
  getLegacyScopedClusterClient: jest.fn(),
  savedObjectsClient: savedObjectsClientMock.create(),
+ scopedClusterClient: elasticsearchServiceMock.createScopedClusterClient().asCurrentUser,
  };
  return mock;
 };

x-pack/plugins/actions/server/plugin.ts

@@ -426,6 +426,7 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
  return (request) => ({
  callCluster: elasticsearch.legacy.client.asScoped(request).callAsCurrentUser,
  savedObjectsClient: getScopedClient(request),
+ scopedClusterClient: elasticsearch.client.asScoped(request).asCurrentUser,
  getLegacyScopedClusterClient(clusterClient: ILegacyClusterClient) {
  return clusterClient.asScoped(request);
  },

x-pack/plugins/actions/server/types.ts

@@ -14,6 +14,7 @@ import {
  KibanaRequest,
  SavedObjectsClientContract,
  SavedObjectAttributes,
+ ElasticsearchClient,
 } from '../../../../src/core/server';
 import { ActionTypeExecutorResult } from '../common';
 export { ActionTypeExecutorResult } from '../common';
@@ -30,6 +31,7 @@ export type ActionTypeParams = Record<string, unknown>;
 export interface Services {
  callCluster: ILegacyScopedClusterClient['callAsCurrentUser'];
  savedObjectsClient: SavedObjectsClientContract;
+ scopedClusterClient: ElasticsearchClient;
  getLegacyScopedClusterClient(clusterClient: ILegacyClusterClient): ILegacyScopedClusterClient;
 }
 

x-pack/plugins/alerts/server/mocks.ts

@@ -61,6 +61,7 @@ const createAlertServicesMock = () => {
  callCluster: elasticsearchServiceMock.createLegacyScopedClusterClient().callAsCurrentUser,
  getLegacyScopedClusterClient: jest.fn(),
  savedObjectsClient: savedObjectsClientMock.create(),
+ scopedClusterClient: elasticsearchServiceMock.createScopedClusterClient().asCurrentUser,
  };
 };
 export type AlertServicesMock = ReturnType<typeof createAlertServicesMock>;

x-pack/plugins/alerts/server/plugin.ts

@@ -302,6 +302,7 @@ export class AlertingPlugin {
  return (request) => ({
  callCluster: elasticsearch.legacy.client.asScoped(request).callAsCurrentUser,
  savedObjectsClient: this.getScopedClientWithAlertSavedObjectType(savedObjects, request),
+ scopedClusterClient: elasticsearch.client.asScoped(request).asCurrentUser,
  getLegacyScopedClusterClient(clusterClient: ILegacyClusterClient) {
  return clusterClient.asScoped(request);
  },

x-pack/plugins/alerts/server/types.ts

@@ -10,6 +10,7 @@ import { PluginSetupContract, PluginStartContract } from './plugin';
 import { AlertsClient } from './alerts_client';
 export * from '../common';
 import {
+ ElasticsearchClient,
  ILegacyClusterClient,
  ILegacyScopedClusterClient,
  KibanaRequest,
@@ -45,6 +46,7 @@ declare module 'src/core/server' {
 export interface Services {
  callCluster: ILegacyScopedClusterClient['callAsCurrentUser'];
  savedObjectsClient: SavedObjectsClientContract;
+ scopedClusterClient: ElasticsearchClient;
  getLegacyScopedClusterClient(clusterClient: ILegacyClusterClient): ILegacyScopedClusterClient;
 }
 

x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/server/alert_types.ts

@@ -76,7 +76,7 @@ function getAlwaysFiringAlertType() {
  instanceContextValue: true,
  });
  }
- await services.callCluster('index', {
+ await services.scopedClusterClient.index({
  index: params.index,
  refresh: 'wait_for',
  body: {