Use NP elasticsearchclient

Author: jloleysens

x-pack/legacy/plugins/watcher/server/np_ready/lib/call_with_internal_user_factory.ts

@@ -4,19 +4,23 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElasticsearchServiceSetup } from 'src/core/server';
 import { once } from 'lodash';
 import { elasticsearchJsPlugin } from './elasticsearch_js_plugin';
 import { ServerShim } from '../types';
 
-const callWithRequest = once((server: any) => {
+const callWithRequest = once((elasticsearchService: ElasticsearchServiceSetup) => {
   const config = { plugins: [elasticsearchJsPlugin] };
-  const cluster = server.plugins.elasticsearch.createCluster('watcher', config);
-
-  return cluster.callWithRequest;
+  return elasticsearchService.createClient('watcher', config);
 });
 
-export const callWithRequestFactory = (server: ServerShim, request: any) => {
+export const callWithRequestFactory = (
+  elasticsearchService: ElasticsearchServiceSetup,
+  request: any
+) => {
   return (...args: any[]) => {
-    return callWithRequest(server)(request, ...args);
+    return callWithRequest(elasticsearchService)
+      .asScoped(request)
+      .callAsCurrentUser(...args);
   };
 };

x-pack/legacy/plugins/watcher/server/np_ready/lib/call_with_request_factory.ts

@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { first } from 'rxjs/operators';
 import { Plugin, CoreSetup } from 'src/core/server';
 import { i18n } from '@kbn/i18n';
 import { PLUGIN } from '../../common/constants';
@@ -18,9 +19,15 @@ import { registerListFieldsRoute } from './routes/api/register_list_fields_route
 import { registerLoadHistoryRoute } from './routes/api/register_load_history_route';
 
 export class WatcherServerPlugin implements Plugin<void, void, any, any> {
-  async setup({ http }: CoreSetup, { __LEGACY: serverShim }: { __LEGACY: ServerShim }) {
+  async setup(
+    { http, elasticsearch: elasticsearchService }: CoreSetup,
+    { __LEGACY: serverShim }: { __LEGACY: ServerShim }
+  ) {
+    const elasticsearch = await elasticsearchService.adminClient$.pipe(first()).toPromise();
     const router = http.createRouter();
     const routeDependencies: RouteDependencies = {
+      elasticsearch,
+      elasticsearchService,
       router,
     };
     // Register license checker

x-pack/legacy/plugins/watcher/server/np_ready/plugin.ts

@@ -63,7 +63,7 @@ function getIndices(callWithRequest: any, pattern: string, limit = 10) {
 export function registerGetRoute(deps: RouteDependencies, legacy: ServerShim) {
   const isEsError = isEsErrorFactory(legacy);
   const handler: RequestHandler<any, any, any> = async (ctx, request, response) => {
-    const callWithRequest = callWithRequestFactory(legacy, request);
+    const callWithRequest = callWithRequestFactory(deps.elasticsearchService, request);
     const { pattern } = request.body;
 
     try {

x-pack/legacy/plugins/watcher/server/np_ready/routes/api/indices/register_get_route.ts

@@ -28,7 +28,7 @@ export function registerListFieldsRoute(deps: RouteDependencies, legacy: ServerS
   const isEsError = isEsErrorFactory(legacy);
 
   const handler: RequestHandler<any, any, any> = async (ctx, request, response) => {
-    const callWithRequest = callWithRequestFactory(legacy, request);
+    const callWithRequest = callWithRequestFactory(deps.elasticsearchService, request);
     const { indexes } = request.body;
 
     try {

x-pack/legacy/plugins/watcher/server/np_ready/routes/api/register_list_fields_route.ts

@@ -31,7 +31,7 @@ function fetchHistoryItem(callWithRequest: any, watchHistoryItemId: string) {
 export function registerLoadHistoryRoute(deps: RouteDependencies, legacy: ServerShim) {
   const isEsError = isEsErrorFactory(legacy);
   const handler: RequestHandler<any, any, any> = async (ctx, request, response) => {
-    const callWithRequest = callWithRequestFactory(legacy, request);
+    const callWithRequest = callWithRequestFactory(deps.elasticsearchService, request);
     const id = request.params.id;
 
     try {

x-pack/legacy/plugins/watcher/server/np_ready/routes/api/register_load_history_route.ts

@@ -4,16 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RequestHandler } from 'src/core/server';
-import { callWithInternalUserFactory } from '../../../lib/call_with_internal_user_factory';
+import { IClusterClient, RequestHandler } from 'src/core/server';
 import { isEsErrorFactory } from '../../../lib/is_es_error_factory';
 import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 // @ts-ignore
 import { Settings } from '../../../models/settings';
 import { RouteDependencies, ServerShim } from '../../../types';
 
-function fetchClusterSettings(callWithInternalUser: any) {
-  return callWithInternalUser('cluster.getSettings', {
+function fetchClusterSettings(client: IClusterClient) {
+  return client.callAsInternalUser('cluster.getSettings', {
     includeDefaults: true,
     filterPath: '**.xpack.notification',
   });
@@ -23,7 +22,7 @@ export function registerLoadRoute(deps: RouteDependencies, legacy: ServerShim) {
   const isEsError = isEsErrorFactory(legacy);
   const handler: RequestHandler<any, any, any> = async (ctx, request, response) => {
     try {
-      const settings = await fetchClusterSettings(callWithInternalUser);
+      const settings = await fetchClusterSettings(deps.elasticsearch);
       return response.ok({ body: Settings.fromUpstreamJson(settings).downstreamJson });
     } catch (e) {
       // Case: Error from Elasticsearch JS client
@@ -35,8 +34,6 @@ export function registerLoadRoute(deps: RouteDependencies, legacy: ServerShim) {
       return response.internalError({ body: e });
     }
   };
-  const callWithInternalUser = callWithInternalUserFactory(legacy);
-
   deps.router.get(
     {
       path: '/api/watcher/settings',

x-pack/legacy/plugins/watcher/server/np_ready/routes/api/settings/register_load_route.ts

@@ -24,7 +24,7 @@ function acknowledgeAction(callWithRequest: any, watchId: string, actionId: stri
 export function registerAcknowledgeRoute(deps: RouteDependencies, legacy: ServerShim) {
   const isEsError = isEsErrorFactory(legacy);
   const handler: RequestHandler<any, any, any> = async (ctx, request, response) => {
-    const callWithRequest = callWithRequestFactory(legacy, request);
+    const callWithRequest = callWithRequestFactory(deps.elasticsearchService, request);
     const { watchId, actionId } = request.params;
 
     try {

x-pack/legacy/plugins/watcher/server/np_ready/routes/api/watch/action/register_acknowledge_route.ts

@@ -23,7 +23,7 @@ function activateWatch(callWithRequest: any, watchId: string) {
 export function registerActivateRoute(deps: RouteDependencies, legacy: ServerShim) {
   const isEsError = isEsErrorFactory(legacy);
   const handler: RequestHandler<any, any, any> = async (ctx, request, response) => {
-    const callWithRequest = callWithRequestFactory(legacy, request);
+    const callWithRequest = callWithRequestFactory(deps.elasticsearchService, request);
 
     const { watchId } = request.params;
 

x-pack/legacy/plugins/watcher/server/np_ready/routes/api/watch/register_activate_route.ts

@@ -22,7 +22,7 @@ function deactivateWatch(callWithRequest: any, watchId: string) {
 export function registerDeactivateRoute(deps: RouteDependencies, legacy: ServerShim) {
   const isEsError = isEsErrorFactory(legacy);
   const handler: RequestHandler<any, any, any> = async (ctx, request, response) => {
-    const callWithRequest = callWithRequestFactory(legacy, request);
+    const callWithRequest = callWithRequestFactory(deps.elasticsearchService, request);
 
     const { watchId } = request.params;