[ML] Functional tests - directory names cleanup (#67312)

This PR renames some ML and Transform functional test directories in order to make them consistent with other parts of the code.

x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts

@@ -6,8 +6,8 @@
 
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');

x-pack/test/api_integration/apis/ml/data_frame_analytics/get.ts

@@ -6,8 +6,8 @@
 
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 import { DataFrameAnalyticsConfig } from '../../../../../plugins/ml/public/application/data_frame_analytics/common';
 import { DeepPartial } from '../../../../../plugins/ml/common/types/common';
 

x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts

@@ -5,8 +5,8 @@
  */
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts

@@ -5,8 +5,8 @@
  */
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/apis/ml/job_validation/validate.ts

@@ -5,8 +5,8 @@
  */
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 import pkg from '../../../../../../package.json';
 
 // eslint-disable-next-line import/no-default-export

x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 const start = 1554463535770;
 const end = 1574316073914;

x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { USER } from '../../../../functional/services/ml/security_common';
 import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { MULTI_METRIC_JOB_CONFIG, SINGLE_METRIC_JOB_CONFIG, DATAFEED_CONFIG } from './common_jobs';
 

x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { USER } from '../../../../functional/services/ml/security_common';
 import { MULTI_METRIC_JOB_CONFIG, SINGLE_METRIC_JOB_CONFIG } from './common_jobs';
 
 // eslint-disable-next-line import/no-default-export

x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
+import { USER } from '../../../../functional/services/ml/security_common';
 import { MULTI_METRIC_JOB_CONFIG, SINGLE_METRIC_JOB_CONFIG } from './common_jobs';
 
 // eslint-disable-next-line import/no-default-export

x-pack/test/api_integration/apis/ml/modules/get_module.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 const moduleIds = [
   'apache_ecs',

x-pack/test/api_integration/apis/ml/modules/recognize_module.ts

@@ -7,8 +7,8 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/apis/ml/modules/setup_module.ts

@@ -10,8 +10,8 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 import { JOB_STATE, DATAFEED_STATE } from '../../../../../plugins/ml/common/constants/states';
 import { Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts

@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import expect from '@kbn/expect';
-import { USER } from '../../../../functional/services/machine_learning/security_common';
+import { USER } from '../../../../functional/services/ml/security_common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs';
-import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/machine_learning/common';
+import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {

x-pack/test/api_integration/services/ml.ts

@@ -6,11 +6,9 @@
 
 import { FtrProviderContext } from '../../functional/ftr_provider_context';
 
-import {
-  MachineLearningAPIProvider,
-  MachineLearningSecurityCommonProvider,
-  MachineLearningTestResourcesProvider,
-} from '../../functional/services/machine_learning';
+import { MachineLearningAPIProvider } from '../../functional/services/ml/api';
+import { MachineLearningSecurityCommonProvider } from '../../functional/services/ml/security_common';
+import { MachineLearningTestResourcesProvider } from '../../functional/services/ml/test_resources';
 
 export function MachineLearningProvider(context: FtrProviderContext) {
   const api = MachineLearningAPIProvider(context);

x-pack/test/functional/config.ie.js

@@ -25,7 +25,7 @@ export default async function ({ readConfigFile }) {
     //   require.resolve(__dirname, './apps/logstash'),
     //   require.resolve(__dirname, './apps/grok_debugger'),
     //   require.resolve(__dirname, './apps/infra'),
-    //   require.resolve(__dirname, './apps/machine_learning'),
+    //   require.resolve(__dirname, './apps/ml'),
     //   require.resolve(__dirname, './apps/rollup_job'),
     //   require.resolve(__dirname, './apps/maps'),
     //   require.resolve(__dirname, './apps/status_page'),

x-pack/test/functional/config.js

@@ -38,7 +38,7 @@ export default async function ({ readConfigFile }) {
       resolve(__dirname, './apps/logstash'),
       resolve(__dirname, './apps/grok_debugger'),
       resolve(__dirname, './apps/infra'),
-      resolve(__dirname, './apps/machine_learning'),
+      resolve(__dirname, './apps/ml'),
       resolve(__dirname, './apps/rollup_job'),
       resolve(__dirname, './apps/maps'),
       resolve(__dirname, './apps/status_page'),

x-pack/test/functional/services/machine_learning/index.ts

@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-
-export { MachineLearningAnomaliesTableProvider } from './anomalies_table';
-export { MachineLearningAnomalyExplorerProvider } from './anomaly_explorer';
-export { MachineLearningAPIProvider } from './api';
-export { MachineLearningCommonProvider } from './common';
-export { MachineLearningCustomUrlsProvider } from './custom_urls';
-export { MachineLearningDataFrameAnalyticsProvider } from './data_frame_analytics';
-export { MachineLearningDataFrameAnalyticsCreationProvider } from './data_frame_analytics_creation';
-export { MachineLearningDataFrameAnalyticsTableProvider } from './data_frame_analytics_table';
-export { MachineLearningDataVisualizerProvider } from './data_visualizer';
-export { MachineLearningDataVisualizerFileBasedProvider } from './data_visualizer_file_based';
-export { MachineLearningDataVisualizerIndexBasedProvider } from './data_visualizer_index_based';
-export { MachineLearningJobManagementProvider } from './job_management';
-export { MachineLearningJobSelectionProvider } from './job_selection';
-export { MachineLearningJobSourceSelectionProvider } from './job_source_selection';
-export { MachineLearningJobTableProvider } from './job_table';
-export { MachineLearningJobTypeSelectionProvider } from './job_type_selection';
-export { MachineLearningJobWizardAdvancedProvider } from './job_wizard_advanced';
-export { MachineLearningJobWizardCommonProvider } from './job_wizard_common';
-export { MachineLearningJobWizardCategorizationProvider } from './job_wizard_categorization';
-export { MachineLearningJobWizardMultiMetricProvider } from './job_wizard_multi_metric';
-export { MachineLearningJobWizardPopulationProvider } from './job_wizard_population';
-export { MachineLearningNavigationProvider } from './navigation';
-export { MachineLearningSecurityCommonProvider } from './security_common';
-export { MachineLearningSecurityUIProvider } from './security_ui';
-export { MachineLearningSettingsProvider } from './settings';
-export { MachineLearningSingleMetricViewerProvider } from './single_metric_viewer';
-export { MachineLearningTestResourcesProvider } from './test_resources';

x-pack/test/functional/services/ml/index.ts

@@ -4,37 +4,35 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-import {
-  MachineLearningAnomaliesTableProvider,
-  MachineLearningAnomalyExplorerProvider,
-  MachineLearningAPIProvider,
-  MachineLearningCommonProvider,
-  MachineLearningCustomUrlsProvider,
-  MachineLearningDataFrameAnalyticsProvider,
-  MachineLearningDataFrameAnalyticsCreationProvider,
-  MachineLearningDataFrameAnalyticsTableProvider,
-  MachineLearningDataVisualizerProvider,
-  MachineLearningDataVisualizerFileBasedProvider,
-  MachineLearningDataVisualizerIndexBasedProvider,
-  MachineLearningJobManagementProvider,
-  MachineLearningJobSelectionProvider,
-  MachineLearningJobSourceSelectionProvider,
-  MachineLearningJobTableProvider,
-  MachineLearningJobTypeSelectionProvider,
-  MachineLearningJobWizardAdvancedProvider,
-  MachineLearningJobWizardCategorizationProvider,
-  MachineLearningJobWizardCommonProvider,
-  MachineLearningJobWizardMultiMetricProvider,
-  MachineLearningJobWizardPopulationProvider,
-  MachineLearningNavigationProvider,
-  MachineLearningSecurityCommonProvider,
-  MachineLearningSecurityUIProvider,
-  MachineLearningSettingsProvider,
-  MachineLearningSingleMetricViewerProvider,
-  MachineLearningTestResourcesProvider,
-} from './machine_learning';
+import { MachineLearningAnomaliesTableProvider } from './anomalies_table';
+import { MachineLearningAnomalyExplorerProvider } from './anomaly_explorer';
+import { MachineLearningAPIProvider } from './api';
+import { MachineLearningCommonProvider } from './common';
+import { MachineLearningCustomUrlsProvider } from './custom_urls';
+import { MachineLearningDataFrameAnalyticsProvider } from './data_frame_analytics';
+import { MachineLearningDataFrameAnalyticsCreationProvider } from './data_frame_analytics_creation';
+import { MachineLearningDataFrameAnalyticsTableProvider } from './data_frame_analytics_table';
+import { MachineLearningDataVisualizerProvider } from './data_visualizer';
+import { MachineLearningDataVisualizerFileBasedProvider } from './data_visualizer_file_based';
+import { MachineLearningDataVisualizerIndexBasedProvider } from './data_visualizer_index_based';
+import { MachineLearningJobManagementProvider } from './job_management';
+import { MachineLearningJobSelectionProvider } from './job_selection';
+import { MachineLearningJobSourceSelectionProvider } from './job_source_selection';
+import { MachineLearningJobTableProvider } from './job_table';
+import { MachineLearningJobTypeSelectionProvider } from './job_type_selection';
+import { MachineLearningJobWizardAdvancedProvider } from './job_wizard_advanced';
+import { MachineLearningJobWizardCommonProvider } from './job_wizard_common';
+import { MachineLearningJobWizardCategorizationProvider } from './job_wizard_categorization';
+import { MachineLearningJobWizardMultiMetricProvider } from './job_wizard_multi_metric';
+import { MachineLearningJobWizardPopulationProvider } from './job_wizard_population';
+import { MachineLearningNavigationProvider } from './navigation';
+import { MachineLearningSecurityCommonProvider } from './security_common';
+import { MachineLearningSecurityUIProvider } from './security_ui';
+import { MachineLearningSettingsProvider } from './settings';
+import { MachineLearningSingleMetricViewerProvider } from './single_metric_viewer';
+import { MachineLearningTestResourcesProvider } from './test_resources';
 
 export function MachineLearningProvider(context: FtrProviderContext) {
   const common = MachineLearningCommonProvider(context);

x-pack/test/functional/services/transform/index.ts

@@ -4,20 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrProviderContext } from '../../ftr_provider_context';
 
-import {
-  TransformAPIProvider,
-  TransformManagementProvider,
-  TransformNavigationProvider,
-  TransformSecurityCommonProvider,
-  TransformSecurityUIProvider,
-  TransformSourceSelectionProvider,
-  TransformTableProvider,
-  TransformWizardProvider,
-} from './transform_ui';
+import { TransformAPIProvider } from './api';
+import { TransformManagementProvider } from './management';
+import { TransformNavigationProvider } from './navigation';
+import { TransformSecurityCommonProvider } from './security_common';
+import { TransformSecurityUIProvider } from './security_ui';
+import { TransformSourceSelectionProvider } from './source_selection';
+import { TransformTableProvider } from './transform_table';
+import { TransformWizardProvider } from './wizard';
 
-import { MachineLearningTestResourcesProvider } from './machine_learning';
+import { MachineLearningTestResourcesProvider } from '../ml/test_resources';
 
 export function TransformProvider(context: FtrProviderContext) {
   const api = TransformAPIProvider(context);

x-pack/test/functional/services/transform_ui/index.ts

@@ -1,14 +0,0 @@
-/*
- * 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.
- */
-
-export { TransformAPIProvider } from './api';
-export { TransformManagementProvider } from './management';
-export { TransformNavigationProvider } from './navigation';
-export { TransformSecurityCommonProvider } from './security_common';
-export { TransformSecurityUIProvider } from './security_ui';
-export { TransformSourceSelectionProvider } from './source_selection';
-export { TransformTableProvider } from './transform_table';
-export { TransformWizardProvider } from './wizard';