[Search profiler] Add serverless api tests (elastic#172157)

jpdjere · Dec 4, 2023 · 142a34b · 142a34b
1 parent d541cfc
commit 142a34b
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 3 deletions.
diff --git a/x-pack/test/api_integration/apis/searchprofiler/searchprofiler.ts b/x-pack/test/api_integration/apis/searchprofiler/searchprofiler.ts
@@ -10,11 +10,10 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 const API_BASE_PATH = '/api/searchprofiler';
 
-// Flaky https://github.com/elastic/kibana/issues/97954
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
-  describe.skip('Profile', () => {
+  describe('Profile', () => {
     it('should return profile results for a valid index', async () => {
       const payload = {
         index: '_all',
@@ -46,7 +45,7 @@ export default function ({ getService }: FtrProviderContext) {
       };
 
       const { body } = await supertest
-        .post(`${API_BASE_PATH}/execute`)
+        .post(`${API_BASE_PATH}/profile`)
         .set('kbn-xsrf', 'xxx')
         .set('Content-Type', 'application/json;charset=UTF-8')
         .send(payloadWithInvalidIndex)

diff --git a/x-pack/test_serverless/api_integration/test_suites/common/search_profiler/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/search_profiler/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('Search profiler APIs', function () {
+    this.tags(['esGate']);
+
+    loadTestFile(require.resolve('./search_profiler'));
+  });
+}
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/search_profiler/search_profiler.ts b/x-pack/test_serverless/api_integration/test_suites/common/search_profiler/search_profiler.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+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');
+  const svlCommonApi = getService('svlCommonApi');
+
+  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(svlCommonApi.getInternalRequestHeader())
+        .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}/profile`)
+        .set(svlCommonApi.getInternalRequestHeader())
+        .set('Content-Type', 'application/json;charset=UTF-8')
+        .send(payloadWithInvalidIndex)
+        .expect(404);
+
+      expect(body.error).to.eql('Not Found');
+    });
+  });
+}
diff --git a/...test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts b/...test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts
@@ -23,6 +23,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/platform_security'),
       require.resolve('../../common/scripts_tests'),
       require.resolve('../../common/search_oss'),
+      require.resolve('../../common/search_profiler'),
       require.resolve('../../common/search_xpack'),
       require.resolve('../../common/core'),
       require.resolve('../../common/reporting'),

diff --git a/x-pack/test_serverless/api_integration/test_suites/search/common_configs/config.group1.ts b/x-pack/test_serverless/api_integration/test_suites/search/common_configs/config.group1.ts
@@ -23,6 +23,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/platform_security'),
       require.resolve('../../common/scripts_tests'),
       require.resolve('../../common/search_oss'),
+      require.resolve('../../common/search_profiler'),
       require.resolve('../../common/search_xpack'),
       require.resolve('../../common/core'),
       require.resolve('../../common/reporting'),

diff --git a/x-pack/test_serverless/api_integration/test_suites/security/common_configs/config.group1.ts b/x-pack/test_serverless/api_integration/test_suites/security/common_configs/config.group1.ts
@@ -23,6 +23,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/platform_security'),
       require.resolve('../../common/scripts_tests'),
       require.resolve('../../common/search_oss'),
+      require.resolve('../../common/search_profiler'),
       require.resolve('../../common/search_xpack'),
       require.resolve('../../common/core'),
       require.resolve('../../common/reporting'),