Add route to accept a direct package upload.

elastic · Sep 9, 2020 · f921fb9 · f921fb9
1 parent a127766
commit f921fb9
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 12 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/constants/routes.ts b/x-pack/plugins/ingest_manager/common/constants/routes.ts
@@ -21,7 +21,8 @@ export const EPM_API_ROUTES = {
  LIST_PATTERN: EPM_PACKAGES_MANY,
  LIMITED_LIST_PATTERN: `${EPM_PACKAGES_MANY}/limited`,
  INFO_PATTERN: EPM_PACKAGES_ONE,
- INSTALL_PATTERN: EPM_PACKAGES_ONE,
+ INSTALL_FROM_REGISTRY_PATTERN: EPM_PACKAGES_ONE,
+ INSTALL_BY_UPLOAD_PATTERN: EPM_PACKAGES_MANY,
  DELETE_PATTERN: EPM_PACKAGES_ONE,
  FILEPATH_PATTERN: `${EPM_PACKAGES_FILE}/{filePath*}`,
  CATEGORIES_PATTERN: `${EPM_API_ROOT}/categories`,

diff --git a/x-pack/plugins/ingest_manager/common/services/routes.ts b/x-pack/plugins/ingest_manager/common/services/routes.ts
@@ -40,7 +40,10 @@ export const epmRouteService = {
  },
 
  getInstallPath: (pkgkey: string) => {
- return EPM_API_ROUTES.INSTALL_PATTERN.replace('{pkgkey}', pkgkey).replace(/\/$/, ''); // trim trailing slash
+ return EPM_API_ROUTES.INSTALL_FROM_REGISTRY_PATTERN.replace('{pkgkey}', pkgkey).replace(
+ /\/$/,
+ ''
+ ); // trim trailing slash
  },
 
  getRemovePath: (pkgkey: string) => {

diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/epm.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/epm.ts
@@ -71,6 +71,10 @@ export interface InstallPackageResponse {
  response: AssetReference[];
 }
 
+export interface InstallTmpPackageResponse {
+ response: string;
+}
+
 export interface DeletePackageRequest {
  params: {
  pkgkey: string;

diff --git a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts
@@ -9,6 +9,7 @@ import { appContextService } from '../../services';
 import {
  GetInfoResponse,
  InstallPackageResponse,
+ InstallTmpPackageResponse,
  DeletePackageResponse,
  GetCategoriesResponse,
  GetPackagesResponse,
@@ -19,7 +20,8 @@ import {
  GetPackagesRequestSchema,
  GetFileRequestSchema,
  GetInfoRequestSchema,
- InstallPackageRequestSchema,
+ InstallPackageFromRegistryRequestSchema,
+ InstallPackageByUploadRequestSchema,
  DeletePackageRequestSchema,
 } from '../../types';
 import {
@@ -129,10 +131,10 @@ export const getInfoHandler: RequestHandler<TypeOf<typeof GetInfoRequestSchema.p
  }
 };
 
-export const installPackageHandler: RequestHandler<
- TypeOf<typeof InstallPackageRequestSchema.params>,
+export const installPackageFromRegistryHandler: RequestHandler<
+ TypeOf<typeof InstallPackageFromRegistryRequestSchema.params>,
  undefined,
- TypeOf<typeof InstallPackageRequestSchema.body>
+ TypeOf<typeof InstallPackageFromRegistryRequestSchema.body>
 > = async (context, request, response) => {
  const logger = appContextService.getLogger();
  const savedObjectsClient = context.core.savedObjects.client;
@@ -183,6 +185,17 @@ export const installPackageHandler: RequestHandler<
  }
 };
 
+export const installPackageByUploadHandler: RequestHandler<
+ undefined,
+ undefined,
+ TypeOf<typeof InstallPackageByUploadRequestSchema.body>
+> = async (context, request, response) => {
+ const body: InstallTmpPackageResponse = {
+ response: 'package upload was received ok, but not installed (not implemented yet)',
+ };
+ return response.ok({ body });
+};
+
 export const deletePackageHandler: RequestHandler<TypeOf<
  typeof DeletePackageRequestSchema.params
 >> = async (context, request, response) => {

diff --git a/x-pack/plugins/ingest_manager/server/routes/epm/index.ts b/x-pack/plugins/ingest_manager/server/routes/epm/index.ts
@@ -11,18 +11,22 @@ import {
  getLimitedListHandler,
  getFileHandler,
  getInfoHandler,
- installPackageHandler,
+ installPackageFromRegistryHandler,
+ installPackageByUploadHandler,
  deletePackageHandler,
 } from './handlers';
 import {
  GetCategoriesRequestSchema,
  GetPackagesRequestSchema,
  GetFileRequestSchema,
  GetInfoRequestSchema,
- InstallPackageRequestSchema,
+ InstallPackageFromRegistryRequestSchema,
+ InstallPackageByUploadRequestSchema,
  DeletePackageRequestSchema,
 } from '../../types';
 
+const MAX_FILE_SIZE_BYTES = 104857600; // 100MB
+
 export const registerRoutes = (router: IRouter) => {
  router.get(
  {
@@ -71,11 +75,26 @@ export const registerRoutes = (router: IRouter) => {
 
  router.post(
  {
- path: EPM_API_ROUTES.INSTALL_PATTERN,
- validate: InstallPackageRequestSchema,
+ path: EPM_API_ROUTES.INSTALL_FROM_REGISTRY_PATTERN,
+ validate: InstallPackageFromRegistryRequestSchema,
  options: { tags: [`access:${PLUGIN_ID}-all`] },
  },
- installPackageHandler
+ installPackageFromRegistryHandler
+ );
+
+ router.post(
+ {
+ path: EPM_API_ROUTES.INSTALL_BY_UPLOAD_PATTERN,
+ validate: InstallPackageByUploadRequestSchema,
+ options: {
+ tags: [`access:${PLUGIN_ID}-all`],
+ body: {
+ accepts: ['application/octet-stream'],
+ maxBytes: MAX_FILE_SIZE_BYTES,
+ },
+ },
+ },
+ installPackageByUploadHandler
  );
 
  router.delete(

diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/epm.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/epm.ts
@@ -32,7 +32,7 @@ export const GetInfoRequestSchema = {
  }),
 };
 
-export const InstallPackageRequestSchema = {
+export const InstallPackageFromRegistryRequestSchema = {
  params: schema.object({
  pkgkey: schema.string(),
  }),
@@ -43,6 +43,10 @@ export const InstallPackageRequestSchema = {
  ),
 };
 
+export const InstallPackageByUploadRequestSchema = {
+ body: schema.buffer(),
+};
+
 export const DeletePackageRequestSchema = {
  params: schema.object({
  pkgkey: schema.string(),