[ML] fix schema definition for job type (elastic#99954) (elastic#100002)

Co-authored-by: Dima Arnautov <[email protected]>
kibanamachine · May 13, 2021 · b09ab28 · b09ab28
1 parent fde1531
commit b09ab28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/x-pack/plugins/ml/server/routes/saved_objects.ts b/x-pack/plugins/ml/server/routes/saved_objects.ts
@@ -5,16 +5,15 @@
  * 2.0.
  */
 
-import { schema } from '@kbn/config-schema';
 import { wrapError } from '../client/error_wrapper';
 import { RouteInitialization, SavedObjectsRouteDeps } from '../types';
 import { checksFactory, syncSavedObjectsFactory } from '../saved_objects';
 import {
   jobsAndSpaces,
   jobsAndCurrentSpace,
   syncJobObjects,
-  jobTypeSchema,
   canDeleteJobSchema,
+  jobTypeSchema,
 } from './schemas/saved_objects';
 import { spacesUtilsProvider } from '../lib/spaces_utils';
 
@@ -308,7 +307,7 @@ export function savedObjectsRoutes(
     {
       path: '/api/ml/saved_objects/can_delete_job/{jobType}',
       validate: {
-        params: schema.object({ jobType: jobTypeSchema }),
+        params: jobTypeSchema,
         body: canDeleteJobSchema,
       },
       options: {

diff --git a/x-pack/plugins/ml/server/routes/schemas/saved_objects.ts b/x-pack/plugins/ml/server/routes/schemas/saved_objects.ts
@@ -7,19 +7,21 @@
 
 import { schema } from '@kbn/config-schema';
 
-export const jobTypeSchema = schema.oneOf([
+export const jobTypeLiterals = schema.oneOf([
   schema.literal('anomaly-detector'),
   schema.literal('data-frame-analytics'),
 ]);
 
+export const jobTypeSchema = schema.object({ jobType: jobTypeLiterals });
+
 export const jobsAndSpaces = schema.object({
-  jobType: jobTypeSchema,
+  jobType: jobTypeLiterals,
   jobIds: schema.arrayOf(schema.string()),
   spaces: schema.arrayOf(schema.string()),
 });
 
 export const jobsAndCurrentSpace = schema.object({
-  jobType: jobTypeSchema,
+  jobType: jobTypeLiterals,
   jobIds: schema.arrayOf(schema.string()),
 });