Move plugin init back into routes folder. Syntax updates

elastic · Dec 23, 2019 · ac97af5 · ac97af5
1 parent 24b7c90
commit ac97af5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 25 deletions.
diff --git a/x-pack/legacy/plugins/file_upload/server/plugin.js b/x-pack/legacy/plugins/file_upload/server/plugin.js
@@ -4,21 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getImportRouteHandler, importRouteConfig } from './routes/file_upload';
+import { initRoutes } from './routes/file_upload';
 import { registerFileUploadUsageCollector } from './telemetry';
 
+export const IMPORT_ROUTE = '/api/fileupload/import';
+
 export class FileUploadPlugin {
   setup(core, plugins, __LEGACY) {
     const elasticsearchPlugin = __LEGACY.plugins.elasticsearch;
     const getSavedObjectsRepository = __LEGACY.savedObjects.getSavedObjectsRepository;
 
-    // Set up route
-    __LEGACY.route({
-      method: 'POST',
-      path: '/api/fileupload/import',
-      handler: getImportRouteHandler(elasticsearchPlugin, getSavedObjectsRepository),
-      config: importRouteConfig
-    });
+    initRoutes(__LEGACY.route, elasticsearchPlugin, getSavedObjectsRepository);
 
     registerFileUploadUsageCollector(plugins.usageCollection, {
       elasticsearchPlugin,

diff --git a/x-pack/legacy/plugins/file_upload/server/routes/file_upload.js b/x-pack/legacy/plugins/file_upload/server/routes/file_upload.js
@@ -10,6 +10,7 @@ import { importDataProvider } from '../models/import_data';
 import { updateTelemetry } from '../telemetry/telemetry';
 import { MAX_BYTES } from '../../common/constants/file_import';
 import Joi from 'joi';
+import { IMPORT_ROUTE } from '../plugin';
 
 function importData({ callWithRequest, id, index, settings, mappings, ingestPipeline, data }) {
   const { importData: importDataFunc } = importDataProvider(callWithRequest);
@@ -37,40 +38,54 @@ export function getImportRouteHandler(elasticsearchPlugin, getSavedObjectsReposi
     const requestContentWithDefaults = {
       id,
       callWithRequest: callWithRequestFactory(elasticsearchPlugin, requestObj),
-      ...requestObj.payload
+      ...requestObj.payload,
     };
     return importData(requestContentWithDefaults).catch(wrapError);
   };
 }
 
 export const importRouteConfig = {
   payload: {
-    maxBytes: MAX_BYTES
+    maxBytes: MAX_BYTES,
   },
   validate: {
     query: Joi.object().keys({
       id: Joi.string(),
     }),
     payload: Joi.object({
       app: Joi.string(),
-      index: Joi.string().min(1).required(),
-      data: Joi.array().when(
-        Joi.ref('$query.id'), {
+      index: Joi.string()
+        .min(1)
+        .required(),
+      data: Joi.array()
+        .when(Joi.ref('$query.id'), {
           is: Joi.exist(),
-          then: Joi.array().min(1).required()
-        }).default([]),
+          then: Joi.array()
+            .min(1)
+            .required(),
+        })
+        .default([]),
       fileType: Joi.string().required(),
       ingestPipeline: Joi.object().default({}),
-      settings: Joi.object().when(
-        Joi.ref('$query.id'), {
+      settings: Joi.object()
+        .when(Joi.ref('$query.id'), {
           is: null,
-          then: Joi.required()
-        }).default({}),
-      mappings: Joi.object().when(
-        Joi.ref('$query.id'), {
-          is: null,
-          then: Joi.required()
-        }),
+          then: Joi.required(),
+        })
+        .default({}),
+      mappings: Joi.object().when(Joi.ref('$query.id'), {
+        is: null,
+        then: Joi.required(),
+      }),
     }).required(),
-  }
+  },
+};
+
+export const initRoutes = (route, esPlugin, getSavedObjectsRepository) => {
+  route({
+    method: 'POST',
+    path: IMPORT_ROUTE,
+    handler: getImportRouteHandler(esPlugin, getSavedObjectsRepository),
+    config: importRouteConfig,
+  });
 };