changes based on review

jgowdyelastic · jgowdyelastic · commit 2dae54e37041 · 2020-11-04T17:31:54.000Z
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
@@ -50,7 +50,7 @@ import { getPluginPrivileges } from '../common/types/capabilities';
 import { setupCapabilitiesSwitcher } from './lib/capabilities';
 import { registerKibanaSettings } from './lib/register_settings';
 import { trainedModelsRoutes } from './routes/trained_models';
-import { setupSavedObjects, jobInitializationFactory } from './saved_objects';
+import { setupSavedObjects, jobSavedObjectsInitializationFactory } from './saved_objects';
 import { RouteGuard } from './lib/route_guard';
 
 export type MlPluginSetup = SharedServices;
@@ -188,7 +188,7 @@ export class MlServerPlugin implements Plugin<MlPluginSetup, MlPluginStart, Plug
 
     // check whether the job saved objects exist
     // and create them if needed.
-    const { initializeJobs } = jobInitializationFactory(coreStart);
+    const { initializeJobs } = jobSavedObjectsInitializationFactory(coreStart);
     await initializeJobs();
   }
 
diff --git a/x-pack/plugins/ml/server/saved_objects/checks.ts b/x-pack/plugins/ml/server/saved_objects/checks.ts
@@ -172,7 +172,7 @@ export function checksFactory(
             filter: [
               {
                 term: {
-                  type: 'ml-job',
+                  type: ML_SAVED_OBJECT_TYPE,
                 },
               },
             ],
diff --git a/x-pack/plugins/ml/server/saved_objects/index.ts b/x-pack/plugins/ml/server/saved_objects/index.ts
@@ -8,4 +8,4 @@ export { setupSavedObjects } from './saved_objects';
 export { JobObject, JobSavedObjectService, jobSavedObjectServiceFactory } from './service';
 export { checksFactory } from './checks';
 export { repairFactory } from './repair';
-export { jobInitializationFactory } from './initialization';
+export { jobSavedObjectsInitializationFactory } from './initialization';
diff --git a/x-pack/plugins/ml/server/saved_objects/initialization.ts b/x-pack/plugins/ml/server/saved_objects/initialization.ts
@@ -15,23 +15,35 @@ import { getInternalSavedObjectsClient } from './util';
 import { repairFactory } from './repair';
 import { jobSavedObjectServiceFactory } from './service';
 import { mlLog } from '../lib/log';
+import { ML_SAVED_OBJECT_TYPE } from '../../common/types/saved_objects';
 
-export function jobInitializationFactory(core: CoreStart) {
-  const client = core.elasticsearch.client;
+/**
+ * Creates initializeJobs function which is used to check whether
+ * ml job saved objects exist and creates them if needed
+ *
+ * @param core: CoreStart
+ */
+export function jobSavedObjectsInitializationFactory(core: CoreStart) {
+  const client = (core.elasticsearch.client as unknown) as IScopedClusterClient;
 
+  /**
+   * Check whether ML saved objects exist.
+   * If they don't, check to see whether ML jobs exist.
+   * If jobs exist, but the saved objects do not, create the saved objects.
+   *
+   */
   async function initializeJobs() {
     try {
-      if (await _needsInitializing()) {
-        mlLog.info('Initializing job saved objects');
-        const savedObjectsClient = getInternalSavedObjectsClient(core);
-        const jobSavedObjectService = jobSavedObjectServiceFactory(savedObjectsClient);
-        const { initSavedObjects } = repairFactory(
-          (client as unknown) as IScopedClusterClient,
-          jobSavedObjectService
-        );
-        await initSavedObjects();
-        mlLog.info('Job saved objects initialized for * space');
+      if ((await _needsInitializing()) === false) {
+        // ml job saved objects have already been initialized
+        return;
       }
+      mlLog.info('Initializing job saved objects');
+      const savedObjectsClient = getInternalSavedObjectsClient(core);
+      const jobSavedObjectService = jobSavedObjectServiceFactory(savedObjectsClient);
+      const { initSavedObjects } = repairFactory(client, jobSavedObjectService);
+      await initSavedObjects();
+      mlLog.info('Job saved objects initialized for * space');
     } catch (error) {
       mlLog.error('Error Initializing jobs');
     }
@@ -64,7 +76,7 @@ export function jobInitializationFactory(core: CoreStart) {
             filter: [
               {
                 term: {
-                  type: 'ml-job',
+                  type: ML_SAVED_OBJECT_TYPE,
                 },
               },
             ],

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ export function checksFactory(`
`172`	`172`	`filter: [`
`173`	`173`	`{`
`174`	`174`	`term: {`
`175`		`- type: 'ml-job',`
	`175`	`+ type: ML_SAVED_OBJECT_TYPE,`
`176`	`176`	`},`
`177`	`177`	`},`
`178`	`178`	`],`