cleaning up calls to cleanMLSavedObjects

elastic · Jul 17, 2023 · 1dbb273 · 1dbb273
1 parent 47a0174
commit 1dbb273
Show file tree

Hide file tree

Showing 28 changed files with 39 additions and 30 deletions.
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create_with_spaces.ts
@@ -30,7 +30,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should create a job in the current space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/forecast_with_spaces.ts
@@ -58,7 +58,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should not forecast for a job that has not been opened', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/get_stats_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/get_stats_with_spaces.ts
@@ -58,7 +58,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should fail with non-existing job', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/get_with_spaces.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/get_with_spaces.ts
@@ -58,7 +58,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should fail with non-existing job', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get_spaces.ts
@@ -80,7 +80,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should only list jobs from same space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/jobs_exist_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/jobs_exist_spaces.ts
@@ -68,7 +68,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should find single job from same space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/start_spaces.ts
@@ -73,7 +73,7 @@ export default ({ getService }: FtrProviderContext) => {
       await ml.api.cleanMlIndices();
       await ml.api.deleteIndices(space1JobDestIndex);
       await ml.api.deleteIndices(space2JobDestIndex);
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should start job from same space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/stop_spaces.ts
@@ -71,7 +71,7 @@ export default ({ getService }: FtrProviderContext) => {
       await ml.api.deleteIndices(`user-${jobIdSpace3}`);
       await ml.api.deleteIndices(`user-${jobIdSpace4}`);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace3, idSpace4]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should stop job from same space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update_spaces.ts
@@ -69,7 +69,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should update job from same space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/datafeeds/get_stats_with_spaces.ts b/x-pack/test/api_integration/apis/ml/datafeeds/get_stats_with_spaces.ts
@@ -59,7 +59,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should fail with non-existing datafeed', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/datafeeds/get_with_spaces.ts b/x-pack/test/api_integration/apis/ml/datafeeds/get_with_spaces.ts
@@ -57,7 +57,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should fail with non-existing datafeed', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/datafeeds/update.ts b/x-pack/test/api_integration/apis/ml/datafeeds/update.ts
@@ -57,7 +57,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should update datafeed with correct space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/jobs/jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/jobs.ts
@@ -16,6 +16,7 @@ export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const supertest = getService('supertestWithoutAuth');
   const ml = getService('ml');
+  const spacesService = getService('spaces');
 
   const idSpace1 = 'space1';
 
@@ -95,6 +96,7 @@ export default ({ getService }: FtrProviderContext) => {
     before(async () => {
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
+      await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] });
 
       for (const job of testSetupJobConfigs) {
         await ml.api.createAnomalyDetectionJob(job);
@@ -123,8 +125,9 @@ export default ({ getService }: FtrProviderContext) => {
     });
 
     after(async () => {
+      await spacesService.delete(idSpace1);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('returns expected list of combined jobs with stats in default space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/jobs/jobs_exist_spaces.ts b/x-pack/test/api_integration/apis/ml/jobs/jobs_exist_spaces.ts
@@ -54,7 +54,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should find single job from same space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/jobs/jobs_summary_spaces.ts b/x-pack/test/api_integration/apis/ml/jobs/jobs_summary_spaces.ts
@@ -49,7 +49,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should list job from same space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/management/get_list.ts b/x-pack/test/api_integration/apis/ml/management/get_list.ts
@@ -90,7 +90,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it(`should get AD jobs for space ${idSpace1}`, async () => {

diff --git a/x-pack/test/api_integration/apis/ml/results/get_anomaly_search.ts b/x-pack/test/api_integration/apis/ml/results/get_anomaly_search.ts
@@ -68,10 +68,10 @@ export default ({ getService }: FtrProviderContext) => {
     });
 
     after(async () => {
-      await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
+      await ml.api.cleanMlIndices();
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should see results in current space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_job.ts b/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_job.ts
@@ -76,7 +76,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('job in individual spaces, single space user can only untag', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_trained_model.ts b/x-pack/test/api_integration/apis/ml/saved_objects/can_delete_trained_model.ts
@@ -83,7 +83,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('model in individual spaces, single space user can only untag', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/get_jobs_spaces.ts b/x-pack/test/api_integration/apis/ml/saved_objects/get_jobs_spaces.ts
@@ -64,7 +64,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should list all jobs for user with access to all spaces', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/get_trained_model_spaces.ts b/x-pack/test/api_integration/apis/ml/saved_objects/get_trained_model_spaces.ts
@@ -56,7 +56,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should list all trained models for user with access to all spaces', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/initialize_trained_models.ts b/x-pack/test/api_integration/apis/ml/saved_objects/initialize_trained_models.ts
@@ -92,7 +92,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should initialize trained models and inherit job spaces', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/remove_from_current_space.ts b/x-pack/test/api_integration/apis/ml/saved_objects/remove_from_current_space.ts
@@ -69,10 +69,10 @@ export default ({ getService }: FtrProviderContext) => {
     });
 
     after(async () => {
-      await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
+      await ml.api.cleanMlIndices();
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should remove AD job from current space', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/status.ts b/x-pack/test/api_integration/apis/ml/saved_objects/status.ts
@@ -69,7 +69,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should list jobs and saved objects', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/sync_jobs.ts b/x-pack/test/api_integration/apis/ml/saved_objects/sync_jobs.ts
@@ -67,7 +67,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should sync datafeeds and saved objects', async () => {

diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/sync_trained_models.ts b/x-pack/test/api_integration/apis/ml/saved_objects/sync_trained_models.ts
@@ -79,7 +79,7 @@ export default ({ getService }: FtrProviderContext) => {
       await spacesService.delete(idSpace1);
       await spacesService.delete(idSpace2);
       await ml.api.cleanMlIndices();
-      await ml.testResources.cleanMLSavedObjects([idSpace1, idSpace2]);
+      await ml.testResources.cleanMLSavedObjects();
     });
 
     it('should sync trained model saved objects', async () => {

diff --git a/x-pack/test/functional/apps/ml/short_tests/notifications/notification_list.ts b/x-pack/test/functional/apps/ml/short_tests/notifications/notification_list.ts
@@ -52,8 +52,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await ml.api.deleteAnomalyDetectionJobES(jobId);
       }
       await spacesService.delete(idSpace1);
-      await ml.testResources.cleanMLSavedObjects([idSpace1]);
       await ml.api.cleanMlIndices();
+      await ml.testResources.cleanMLSavedObjects();
       await ml.testResources.deleteIndexPatternByTitle('ft_farequote');
     });
 

diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/manage_spaces.ts b/x-pack/test/functional/apps/ml/stack_management_jobs/manage_spaces.ts
@@ -114,6 +114,12 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.createIndexPatternIfNeeded('ft_ihp_outlier', '@timestamp');
 
+      await spacesService.create({
+        id: spaceIds.idSpace1,
+        name: 'space_one',
+        disabledFeatures: [],
+      });
+
       await ml.testResources.setKibanaTimeZoneToUTC();
       await ml.securityUI.loginAsMlPowerUser();
 
@@ -135,8 +141,8 @@ export default function ({ getService }: FtrProviderContext) {
           await spacesService.delete(spaceId);
         }
       }
-      await ml.testResources.cleanMLSavedObjects([spaceIds.idSpaceDefault, spaceIds.idSpace1]);
       await ml.api.cleanMlIndices();
+      await ml.testResources.cleanMLSavedObjects();
       await ml.testResources.deleteIndexPatternByTitle('ft_farequote');
       await ml.testResources.deleteIndexPatternByTitle('ft_ihp_outlier');
     });