[Reporting/Tests] consolidate functional test configs (elastic#52671)

* [Reporting/Tests] consolidate functional test configs

* remove console.log

* trash

* Update

* add more to the comment

* restore historic archive for wip ui functional tests

x-pack/test/functional/page_objects/reporting_page.js

@@ -7,6 +7,13 @@
 import { parse } from 'url';
 import http from 'http';
 
+/*
+ * NOTE: Reporting is a service, not an app. The page objects that are
+ * important for generating reports belong to the apps that integrate with the
+ * Reporting service. Eventually, this file should be dissolved across the
+ * apps that need it for testing their integration.
+ * Issue: https://github.com/elastic/kibana/issues/52927
+ */
 export function ReportingPageProvider({ getService, getPageObjects }) {
   const retry = getService('retry');
   const log = getService('log');
@@ -22,7 +29,7 @@ export function ReportingPageProvider({ getService, getPageObjects }) {
       log.debug('ReportingPage:initTests');
       await PageObjects.settings.navigateTo();
       await esArchiver.loadIfNeeded('../../functional/es_archives/logstash_functional');
-      await esArchiver.load('historic');
+      await esArchiver.load('reporting/historic');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'logstash-*',
       });

x-pack/test/reporting/api/bwc_existing_indexes.js

@@ -27,7 +27,7 @@ export default function({ getService }) {
     describe('existing 6_2 index', () => {
       before('load data and add index alias', async () => {
         await reportingAPI.deleteAllReportingIndexes();
-        await esArchiver.load('bwc/6_2');
+        await esArchiver.load('reporting/bwc/6_2');
 
         // The index name in the 6_2 archive.
         const ARCHIVED_REPORTING_INDEX = '.reporting-2018.03.11';
@@ -37,6 +37,8 @@ export default function({ getService }) {
 
         const stats = await usageAPI.getUsageStats();
         expectedCompletedReportCount = await reportingAPI.getCompletedReportCount(stats);
+
+        await esArchiver.unload('reporting/bwc/6_2');
       });
 
       after('remove index alias', async () => {

x-pack/test/reporting/api/usage.js

@@ -46,7 +46,7 @@ export default function({ getService }) {
 
     describe('from archive data', () => {
       it('generated from 6.2', async () => {
-        await esArchiver.load('bwc/6_2');
+        await esArchiver.load('reporting/bwc/6_2');
         const usage = await usageAPI.getUsageStats();
 
         reportingAPI.expectRecentJobTypeTotalStats(usage, 'csv', 0);
@@ -64,10 +64,12 @@ export default function({ getService }) {
         reportingAPI.expectAllTimePdfAppStats(usage, 'dashboard', 0);
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'preserve_layout', 0);
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'print', 0);
+
+        await esArchiver.unload('reporting/bwc/6_2');
       });
 
       it('generated from 6.3', async () => {
-        await esArchiver.load('bwc/6_3');
+        await esArchiver.load('reporting/bwc/6_3');
         const usage = await usageAPI.getUsageStats();
 
         reportingAPI.expectRecentJobTypeTotalStats(usage, 'csv', 0);
@@ -83,6 +85,8 @@ export default function({ getService }) {
         reportingAPI.expectAllTimePdfAppStats(usage, 'dashboard', 3);
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'preserve_layout', 3);
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'print', 3);
+
+        await esArchiver.unload('reporting/bwc/6_3');
       });
     });
 

x-pack/test/reporting/configs/chromium_api.js

@@ -4,25 +4,35 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getReportingApiConfig } from './api';
+import { ReportingAPIProvider } from '../services';
 
 export default async function({ readConfigFile }) {
-  const reportingApiConfig = await getReportingApiConfig({ readConfigFile });
+  const apiConfig = await readConfigFile(require.resolve('../../api_integration/config.js'));
+  const functionalConfig = await readConfigFile(require.resolve('../../functional/config.js'));
 
   return {
-    ...reportingApiConfig,
-    junit: {
-      reportName: 'X-Pack Chromium API Reporting Tests',
-    },
+    servers: apiConfig.get('servers'),
+    junit: { reportName: 'X-Pack Chromium API Reporting Tests' },
     testFiles: [require.resolve('../api/chromium_tests')],
+    services: {
+      ...apiConfig.get('services'),
+      reportingAPI: ReportingAPIProvider,
+    },
     kbnTestServer: {
-      ...reportingApiConfig.kbnTestServer,
+      ...apiConfig.get('kbnTestServer'),
       serverArgs: [
-        ...reportingApiConfig.kbnTestServer.serverArgs,
+        // Reporting API tests use functionalConfig instead of apiConfig because they needs a fully working UI. By default, the API config
+        // does not have optimize setting enabled, and Kibana would not have a working UI.
+        ...functionalConfig.get('kbnTestServer.serverArgs'),
+        '--logging.events.log',
+        '["info","warning","error","fatal","optimize","reporting"]',
+        '--xpack.endpoint.enabled=true',
         '--xpack.reporting.csv.enablePanelActionDownload=true',
-        `--xpack.reporting.capture.browser.type=chromium`,
-        `--xpack.spaces.enabled=false`,
+        '--xpack.security.session.idleTimeout=3600000',
+        '--xpack.spaces.enabled=false',
       ],
     },
+    esArchiver: apiConfig.get('esArchiver'),
+    esTestCluster: apiConfig.get('esTestCluster'),
   };
 }

x-pack/test/reporting/configs/chromium_functional.js

@@ -4,24 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getFunctionalConfig } from './functional';
-
 export default async function({ readConfigFile }) {
-  const functionalConfig = await getFunctionalConfig({ readConfigFile });
+  const functionalConfig = await readConfigFile(require.resolve('../../functional/config.js'));
 
   return {
-    ...functionalConfig,
+    services: functionalConfig.get('services'),
+    pageObjects: functionalConfig.get('pageObjects'),
+    servers: functionalConfig.get('servers'),
+    apps: functionalConfig.get('apps'),
+    screenshots: functionalConfig.get('screenshots'),
     junit: {
       reportName: 'X-Pack Chromium Functional Reporting Tests',
     },
     testFiles: [require.resolve('../functional')],
     kbnTestServer: {
-      ...functionalConfig.kbnTestServer,
+      ...functionalConfig.get('kbnTestServer'),
       serverArgs: [
-        ...functionalConfig.kbnTestServer.serverArgs,
+        ...functionalConfig.get('kbnTestServer.serverArgs'),
+        '--logging.events.log',
+        '["info","warning","error","fatal","optimize","reporting"]',
+        '--xpack.endpoint.enabled=true',
         '--xpack.reporting.csv.enablePanelActionDownload=true',
-        `--xpack.reporting.capture.browser.type=chromium`,
+        '--xpack.security.session.idleTimeout=3600000',
+        '--xpack.spaces.enabled=false',
       ],
     },
+    esArchiver: functionalConfig.get('esArchiver'),
+    esTestCluster: functionalConfig.get('esTestCluster'),
   };
 }

x-pack/test/reporting/configs/generate_api.js

@@ -6,44 +6,38 @@
 
 import { esTestConfig, kbnTestConfig, kibanaServerTestUser } from '@kbn/test';
 import { format as formatUrl } from 'url';
-import { getApiIntegrationConfig } from '../../api_integration/config';
-import { getReportingApiConfig } from './api';
+import { ReportingAPIProvider } from '../services';
 
 export default async function({ readConfigFile }) {
-  const servers = {
-    kibana: kbnTestConfig.getUrlParts(),
-    elasticsearch: esTestConfig.getUrlParts(),
-  };
-
-  const apiTestConfig = await getApiIntegrationConfig({ readConfigFile });
-  const reportingApiConfig = await getReportingApiConfig({ readConfigFile });
-  const xPackFunctionalTestsConfig = await readConfigFile(
-    require.resolve('../../functional/config.js')
-  );
+  const apiConfig = await readConfigFile(require.resolve('../../api_integration/config.js'));
 
   return {
-    ...reportingApiConfig,
+    servers: apiConfig.get('servers'),
     junit: { reportName: 'X-Pack Reporting Generate API Integration Tests' },
     testFiles: [require.resolve('../api/generate')],
     services: {
-      ...apiTestConfig.services,
-      ...reportingApiConfig.services,
+      ...apiConfig.get('services'),
+      reportingAPI: ReportingAPIProvider,
     },
     kbnTestServer: {
-      ...xPackFunctionalTestsConfig.get('kbnTestServer'),
+      ...apiConfig.get('kbnTestServer'),
       serverArgs: [
-        `--optimize.enabled=false`,
+        '--logging.events.log',
+        '["info","warning","error","fatal","optimize","reporting"]',
+        `--elasticsearch.hosts=${formatUrl(esTestConfig.getUrlParts())}`,
+        `--elasticsearch.password=${kibanaServerTestUser.password}`,
+        `--elasticsearch.username=${kibanaServerTestUser.username}`,
         `--logging.json=false`,
+        `--optimize.enabled=false`,
         `--server.maxPayloadBytes=1679958`,
         `--server.port=${kbnTestConfig.getPort()}`,
-        `--elasticsearch.hosts=${formatUrl(servers.elasticsearch)}`,
-        `--elasticsearch.username=${kibanaServerTestUser.username}`,
-        `--elasticsearch.password=${kibanaServerTestUser.password}`,
         `--xpack.reporting.csv.enablePanelActionDownload=true`,
         `--xpack.reporting.csv.maxSizeBytes=2850`,
         `--xpack.reporting.queue.pollInterval=3000`,
+        `--xpack.spaces.enabled=false`,
       ],
     },
-    esArchiver: apiTestConfig.esArchiver,
+    esArchiver: apiConfig.get('esArchiver'),
+    esTestCluster: apiConfig.get('esTestCluster'),
   };
 }