From 9f6e55543e094b9cd4cd8164646c75cfe31ae117 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alison.goryachev@elastic.co>
Date: Mon, 25 Jan 2021 14:14:30 -0500
Subject: [PATCH] [Search Profiler] Migrate server to new es-js client (#88725)
 (#89175)

---
 .../searchprofiler/server/routes/profile.ts   | 20 +++----
 x-pack/test/api_integration/apis/index.ts     |  1 +
 .../apis/searchprofiler/index.ts              | 13 +++++
 .../apis/searchprofiler/searchprofiler.ts     | 56 +++++++++++++++++++
 4 files changed, 80 insertions(+), 10 deletions(-)
 create mode 100644 x-pack/test/api_integration/apis/searchprofiler/index.ts
 create mode 100644 x-pack/test/api_integration/apis/searchprofiler/searchprofiler.ts

diff --git a/x-pack/plugins/searchprofiler/server/routes/profile.ts b/x-pack/plugins/searchprofiler/server/routes/profile.ts
index 914c688a080f..87f2ec1df1c9 100644
--- a/x-pack/plugins/searchprofiler/server/routes/profile.ts
+++ b/x-pack/plugins/searchprofiler/server/routes/profile.ts
@@ -27,10 +27,6 @@ export const register = ({ router, getLicenseStatus, log }: RouteDependencies) =
         });
       }
 
-      const {
-        core: { elasticsearch },
-      } = ctx;
-
       const {
         body: { query, index },
       } = request;
@@ -46,21 +42,25 @@ export const register = ({ router, getLicenseStatus, log }: RouteDependencies) =
         body: JSON.stringify(parsed, null, 2),
       };
       try {
-        const resp = await elasticsearch.legacy.client.callAsCurrentUser('search', body);
+        const client = ctx.core.elasticsearch.client.asCurrentUser;
+        const resp = await client.search(body);
+
         return response.ok({
           body: {
             ok: true,
-            resp,
+            resp: resp.body,
           },
         });
       } catch (err) {
         log.error(err);
+        const { statusCode, body: errorBody } = err;
+
         return response.customError({
-          statusCode: err.status || 500,
-          body: err.body
+          statusCode: statusCode || 500,
+          body: errorBody
             ? {
-                message: err.message,
-                attributes: err.body,
+                message: errorBody.error?.reason,
+                attributes: errorBody,
               }
             : err,
         });
diff --git a/x-pack/test/api_integration/apis/index.ts b/x-pack/test/api_integration/apis/index.ts
index 6b6326df017a..2cd2654cffe3 100644
--- a/x-pack/test/api_integration/apis/index.ts
+++ b/x-pack/test/api_integration/apis/index.ts
@@ -33,5 +33,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./transform'));
     loadTestFile(require.resolve('./lists'));
     loadTestFile(require.resolve('./upgrade_assistant'));
+    loadTestFile(require.resolve('./searchprofiler'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/searchprofiler/index.ts b/x-pack/test/api_integration/apis/searchprofiler/index.ts
new file mode 100644
index 000000000000..36794feb00d1
--- /dev/null
+++ b/x-pack/test/api_integration/apis/searchprofiler/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('Search Profiler', () => {
+    loadTestFile(require.resolve('./searchprofiler'));
+  });
+}
diff --git a/x-pack/test/api_integration/apis/searchprofiler/searchprofiler.ts b/x-pack/test/api_integration/apis/searchprofiler/searchprofiler.ts
new file mode 100644
index 000000000000..041cfb82520b
--- /dev/null
+++ b/x-pack/test/api_integration/apis/searchprofiler/searchprofiler.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+const API_BASE_PATH = '/api/searchprofiler';
+
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('Profile', () => {
+    it('should return profile results for a valid index', async () => {
+      const payload = {
+        index: '_all',
+        query: {
+          query: {
+            match_all: {},
+          },
+        },
+      };
+
+      const { body } = await supertest
+        .post(`${API_BASE_PATH}/profile`)
+        .set('kbn-xsrf', 'xxx')
+        .set('Content-Type', 'application/json;charset=UTF-8')
+        .send(payload)
+        .expect(200);
+
+      expect(body.ok).to.eql(true);
+    });
+
+    it('should return error for invalid index', async () => {
+      const payloadWithInvalidIndex = {
+        index: 'index_does_not_exist',
+        query: {
+          query: {
+            match_all: {},
+          },
+        },
+      };
+
+      const { body } = await supertest
+        .post(`${API_BASE_PATH}/execute`)
+        .set('kbn-xsrf', 'xxx')
+        .set('Content-Type', 'application/json;charset=UTF-8')
+        .send(payloadWithInvalidIndex)
+        .expect(404);
+
+      expect(body.error).to.eql('Not Found');
+    });
+  });
+}