| LegacyRequest, requestSpecificBasePath: string) => void;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md b/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md
index 2367420068064..238424b1df1d5 100644
--- a/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md
+++ b/docs/development/core/server/kibana-plugin-server.irouter.handlelegacyerrors.md
@@ -1,13 +1,13 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [IRouter](./kibana-plugin-server.irouter.md) > [handleLegacyErrors](./kibana-plugin-server.irouter.handlelegacyerrors.md)
-
-## IRouter.handleLegacyErrors property
-
-Wrap a router handler to catch and converts legacy boom errors to proper custom errors.
-
-Signature:
-
-```typescript
-handleLegacyErrors: (handler: RequestHandler) => RequestHandler;
-```
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [IRouter](./kibana-plugin-server.irouter.md) > [handleLegacyErrors](./kibana-plugin-server.irouter.handlelegacyerrors.md)
+
+## IRouter.handleLegacyErrors property
+
+Wrap a router handler to catch and converts legacy boom errors to proper custom errors.
+
+Signature:
+
+```typescript
+(handler: RequestHandler) => RequestHandler;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.irouter.md b/docs/development/core/server/kibana-plugin-server.irouter.md
index 73e96191e02e7..a6536d2ed6763 100644
--- a/docs/development/core/server/kibana-plugin-server.irouter.md
+++ b/docs/development/core/server/kibana-plugin-server.irouter.md
@@ -18,7 +18,7 @@ export interface IRouter
| --- | --- | --- |
| [delete](./kibana-plugin-server.irouter.delete.md) | RouteRegistrar<'delete'> | Register a route handler for DELETE request. |
| [get](./kibana-plugin-server.irouter.get.md) | RouteRegistrar<'get'> | Register a route handler for GET request. |
-| [handleLegacyErrors](./kibana-plugin-server.irouter.handlelegacyerrors.md) | <P extends ObjectType, Q extends ObjectType, B extends ObjectType>(handler: RequestHandler<P, Q, B>) => RequestHandler<P, Q, B> | Wrap a router handler to catch and converts legacy boom errors to proper custom errors. |
+| [handleLegacyErrors](./kibana-plugin-server.irouter.handlelegacyerrors.md) | <P, Q, B>(handler: RequestHandler<P, Q, B>) => RequestHandler<P, Q, B> | Wrap a router handler to catch and converts legacy boom errors to proper custom errors. |
| [patch](./kibana-plugin-server.irouter.patch.md) | RouteRegistrar<'patch'> | Register a route handler for PATCH request. |
| [post](./kibana-plugin-server.irouter.post.md) | RouteRegistrar<'post'> | Register a route handler for POST request. |
| [put](./kibana-plugin-server.irouter.put.md) | RouteRegistrar<'put'> | Register a route handler for PUT request. |
diff --git a/docs/development/core/server/kibana-plugin-server.md b/docs/development/core/server/kibana-plugin-server.md
index a39c27a758f9d..9c8aafb158bfd 100644
--- a/docs/development/core/server/kibana-plugin-server.md
+++ b/docs/development/core/server/kibana-plugin-server.md
@@ -21,6 +21,7 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [CspConfig](./kibana-plugin-server.cspconfig.md) | CSP configuration for use in Kibana. |
| [ElasticsearchErrorHelpers](./kibana-plugin-server.elasticsearcherrorhelpers.md) | Helpers for working with errors returned from the Elasticsearch service.Since the internal data of errors are subject to change, consumers of the Elasticsearch service should always use these helpers to classify errors instead of checking error internals such as body.error.header[WWW-Authenticate] |
| [KibanaRequest](./kibana-plugin-server.kibanarequest.md) | Kibana specific abstraction for an incoming request. |
+| [RouteValidationError](./kibana-plugin-server.routevalidationerror.md) | Error to return when the validation is not successful. |
| [SavedObjectsClient](./kibana-plugin-server.savedobjectsclient.md) | |
| [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md) | |
| [SavedObjectsRepository](./kibana-plugin-server.savedobjectsrepository.md) | |
@@ -94,7 +95,9 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [RouteConfig](./kibana-plugin-server.routeconfig.md) | Route specific configuration. |
| [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md) | Additional route options. |
| [RouteConfigOptionsBody](./kibana-plugin-server.routeconfigoptionsbody.md) | Additional body options for a route |
-| [RouteSchemas](./kibana-plugin-server.routeschemas.md) | RouteSchemas contains the schemas for validating the different parts of a request. |
+| [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md) | Validation result factory to be used in the custom validation function to return the valid data or validation errorsSee [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md). |
+| [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) | The configuration object to the RouteValidator class. Set params, query and/or body to specify the validation logic to follow for that property. |
+| [RouteValidatorOptions](./kibana-plugin-server.routevalidatoroptions.md) | Additional options for the RouteValidator class to modify its default behaviour. |
| [SavedObject](./kibana-plugin-server.savedobject.md) | |
| [SavedObjectAttributes](./kibana-plugin-server.savedobjectattributes.md) | The data for a Saved Object is stored as an object in the attributes property. |
| [SavedObjectReference](./kibana-plugin-server.savedobjectreference.md) | A reference to another saved object. |
@@ -200,6 +203,9 @@ The plugin integrates with the core system via lifecycle events: `setup`
| [RouteContentType](./kibana-plugin-server.routecontenttype.md) | The set of supported parseable Content-Types |
| [RouteMethod](./kibana-plugin-server.routemethod.md) | The set of common HTTP methods supported by Kibana routing. |
| [RouteRegistrar](./kibana-plugin-server.routeregistrar.md) | Route handler common definition |
+| [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md) | The custom validation function if @kbn/config-schema is not a valid solution for your specific plugin requirements. |
+| [RouteValidationSpec](./kibana-plugin-server.routevalidationspec.md) | Allowed property validation options: either @kbn/config-schema validations or custom validation functionsSee [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md) for custom validation. |
+| [RouteValidatorFullConfig](./kibana-plugin-server.routevalidatorfullconfig.md) | Route validations config and options merged into one object |
| [SavedObjectAttribute](./kibana-plugin-server.savedobjectattribute.md) | Type definition for a Saved Object attribute value |
| [SavedObjectAttributeSingle](./kibana-plugin-server.savedobjectattributesingle.md) | Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-server.savedobjectattribute.md) |
| [SavedObjectsClientContract](./kibana-plugin-server.savedobjectsclientcontract.md) | Saved Objects is Kibana's data persisentence mechanism allowing plugins to use Elasticsearch for storing plugin state.\#\# SavedObjectsClient errorsSince the SavedObjectsClient has its hands in everything we are a little paranoid about the way we present errors back to to application code. Ideally, all errors will be either:1. Caused by bad implementation (ie. undefined is not a function) and as such unpredictable 2. An error that has been classified and decorated appropriately by the decorators in [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md)Type 1 errors are inevitable, but since all expected/handle-able errors should be Type 2 the isXYZError() helpers exposed at SavedObjectsErrorHelpers should be used to understand and manage error responses from the SavedObjectsClient.Type 2 errors are decorated versions of the source error, so if the elasticsearch client threw an error it will be decorated based on its type. That means that rather than looking for error.body.error.type or doing substring checks on error.body.error.reason, just use the helpers to understand the meaning of the error:\`\`\`js if (SavedObjectsErrorHelpers.isNotFoundError(error)) { // handle 404 }if (SavedObjectsErrorHelpers.isNotAuthorizedError(error)) { // 401 handling should be automatic, but in case you wanted to know }// always rethrow the error unless you handle it throw error; \`\`\`\#\#\# 404s from missing indexFrom the perspective of application code and APIs the SavedObjectsClient is a black box that persists objects. One of the internal details that users have no control over is that we use an elasticsearch index for persistance and that index might be missing.At the time of writing we are in the process of transitioning away from the operating assumption that the SavedObjects index is always available. Part of this transition is handling errors resulting from an index missing. These used to trigger a 500 error in most cases, and in others cause 404s with different error messages.From my (Spencer) perspective, a 404 from the SavedObjectsApi is a 404; The object the request/call was targeting could not be found. This is why \#14141 takes special care to ensure that 404 errors are generic and don't distinguish between index missing or document missing.\#\#\# 503s from missing indexUnlike all other methods, create requests are supposed to succeed even when the Kibana index does not exist because it will be automatically created by elasticsearch. When that is not the case it is because Elasticsearch's action.auto_create_index setting prevents it from being created automatically so we throw a special 503 with the intention of informing the user that their Elasticsearch settings need to be updated.See [SavedObjectsClient](./kibana-plugin-server.savedobjectsclient.md) See [SavedObjectsErrorHelpers](./kibana-plugin-server.savedobjectserrorhelpers.md) |
diff --git a/docs/development/core/server/kibana-plugin-server.requesthandler.md b/docs/development/core/server/kibana-plugin-server.requesthandler.md
index 79abfd4293e9f..9fc183ffc334b 100644
--- a/docs/development/core/server/kibana-plugin-server.requesthandler.md
+++ b/docs/development/core/server/kibana-plugin-server.requesthandler.md
@@ -9,7 +9,7 @@ A function executed when route path matched requested resource path. Request han
Signature:
```typescript
-export declare type RequestHandler | Type, Method extends RouteMethod = any> = (context: RequestHandlerContext, request: KibanaRequest, TypeOf, TypeOf, Method>, response: KibanaResponseFactory) => IKibanaResponse | Promise>;
+export declare type RequestHandler = (context: RequestHandlerContext, request: KibanaRequest, response: KibanaResponseFactory) => IKibanaResponse | Promise>;
```
## Example
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfig.md b/docs/development/core/server/kibana-plugin-server.routeconfig.md
index 1970b23c7ec09..4beb12f0d056e 100644
--- a/docs/development/core/server/kibana-plugin-server.routeconfig.md
+++ b/docs/development/core/server/kibana-plugin-server.routeconfig.md
@@ -9,7 +9,7 @@ Route specific configuration.
Signature:
```typescript
-export interface RouteConfig | Type, Method extends RouteMethod>
+export interface RouteConfig
```
## Properties
@@ -18,5 +18,5 @@ export interface RouteConfigRouteConfigOptions<Method> | Additional route options [RouteConfigOptions](./kibana-plugin-server.routeconfigoptions.md). |
| [path](./kibana-plugin-server.routeconfig.path.md) | string | The endpoint \_within\_ the router path to register the route. |
-| [validate](./kibana-plugin-server.routeconfig.validate.md) | RouteSchemas<P, Q, B> | false | A schema created with @kbn/config-schema that every request will be validated against. |
+| [validate](./kibana-plugin-server.routeconfig.validate.md) | RouteValidatorFullConfig<P, Q, B> | false | A schema created with @kbn/config-schema that every request will be validated against. |
diff --git a/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md b/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
index e1ec743ae71cc..4fbcf0981f114 100644
--- a/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
+++ b/docs/development/core/server/kibana-plugin-server.routeconfig.validate.md
@@ -1,62 +1,62 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteConfig](./kibana-plugin-server.routeconfig.md) > [validate](./kibana-plugin-server.routeconfig.validate.md)
-
-## RouteConfig.validate property
-
-A schema created with `@kbn/config-schema` that every request will be validated against.
-
-Signature:
-
-```typescript
-validate: RouteSchemas | false;
-```
-
-## Remarks
-
-You \*must\* specify a validation schema to be able to read: - url path segments - request query - request body To opt out of validating the request, specify `validate: false`. In this case request params, query, and body will be \*\*empty\*\* objects and have no access to raw values. In some cases you may want to use another validation library. To do this, you need to instruct the `@kbn/config-schema` library to output \*\*non-validated values\*\* with setting schema as `schema.object({}, { allowUnknowns: true })`;
-
-## Example
-
-
-```ts
- import { schema } from '@kbn/config-schema';
- router.get({
- path: 'path/{id}',
- validate: {
- params: schema.object({
- id: schema.string(),
- }),
- query: schema.object({...}),
- body: schema.object({...}),
- },
-},
-(context, req, res,) {
- req.params; // type Readonly<{id: string}>
- console.log(req.params.id); // value
-});
-
-router.get({
- path: 'path/{id}',
- validate: false, // handler has no access to params, query, body values.
-},
-(context, req, res,) {
- req.params; // type Readonly<{}>;
- console.log(req.params.id); // undefined
-});
-
-router.get({
- path: 'path/{id}',
- validate: {
- // handler has access to raw non-validated params in runtime
- params: schema.object({}, { allowUnknowns: true })
- },
-},
-(context, req, res,) {
- req.params; // type Readonly<{}>;
- console.log(req.params.id); // value
- myValidationLibrary.validate({ params: req.params });
-});
-
-```
-
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteConfig](./kibana-plugin-server.routeconfig.md) > [validate](./kibana-plugin-server.routeconfig.validate.md)
+
+## RouteConfig.validate property
+
+A schema created with `@kbn/config-schema` that every request will be validated against.
+
+Signature:
+
+```typescript
+RouteValidatorFullConfig | false;
+```
+
+## Remarks
+
+You \*must\* specify a validation schema to be able to read: - url path segments - request query - request body To opt out of validating the request, specify `validate: false`. In this case request params, query, and body will be \*\*empty\*\* objects and have no access to raw values. In some cases you may want to use another validation library. To do this, you need to instruct the `@kbn/config-schema` library to output \*\*non-validated values\*\* with setting schema as `schema.object({}, { allowUnknowns: true })`;
+
+## Example
+
+
+```ts
+ import { schema } from '@kbn/config-schema';
+ router.get({
+ path: 'path/{id}',
+ validate: {
+ params: schema.object({
+ id: schema.string(),
+ }),
+ query: schema.object({...}),
+ body: schema.object({...}),
+ },
+},
+(context, req, res,) {
+ req.params; // type Readonly<{id: string}>
+ console.log(req.params.id); // value
+});
+
+router.get({
+ path: 'path/{id}',
+ validate: false, // handler has no access to params, query, body values.
+},
+(context, req, res,) {
+ req.params; // type Readonly<{}>;
+ console.log(req.params.id); // undefined
+});
+
+router.get({
+ path: 'path/{id}',
+ validate: {
+ // handler has access to raw non-validated params in runtime
+ params: schema.object({}, { allowUnknowns: true })
+ },
+},
+(context, req, res,) {
+ req.params; // type Readonly<{}>;
+ console.log(req.params.id); // value
+ myValidationLibrary.validate({ params: req.params });
+});
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.routeregistrar.md b/docs/development/core/server/kibana-plugin-server.routeregistrar.md
index 0f5f49636fdd5..901d260fee21d 100644
--- a/docs/development/core/server/kibana-plugin-server.routeregistrar.md
+++ b/docs/development/core/server/kibana-plugin-server.routeregistrar.md
@@ -9,5 +9,5 @@ Route handler common definition
Signature:
```typescript
-export declare type RouteRegistrar = | Type>(route: RouteConfig, handler: RequestHandler) => void;
+export declare type RouteRegistrar = (route: RouteConfig, handler: RequestHandler) => void;
```
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.body.md b/docs/development/core/server/kibana-plugin-server.routeschemas.body.md
deleted file mode 100644
index 78a9d25c25d9d..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.body.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteSchemas](./kibana-plugin-server.routeschemas.md) > [body](./kibana-plugin-server.routeschemas.body.md)
-
-## RouteSchemas.body property
-
-Signature:
-
-```typescript
-body?: B;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.md b/docs/development/core/server/kibana-plugin-server.routeschemas.md
deleted file mode 100644
index 77b980551a8ff..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteSchemas](./kibana-plugin-server.routeschemas.md)
-
-## RouteSchemas interface
-
-RouteSchemas contains the schemas for validating the different parts of a request.
-
-Signature:
-
-```typescript
-export interface RouteSchemas | Type>
-```
-
-## Properties
-
-| Property | Type | Description |
-| --- | --- | --- |
-| [body](./kibana-plugin-server.routeschemas.body.md) | B | |
-| [params](./kibana-plugin-server.routeschemas.params.md) | P | |
-| [query](./kibana-plugin-server.routeschemas.query.md) | Q | |
-
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.params.md b/docs/development/core/server/kibana-plugin-server.routeschemas.params.md
deleted file mode 100644
index 3dbf9fed94dc0..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.params.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteSchemas](./kibana-plugin-server.routeschemas.md) > [params](./kibana-plugin-server.routeschemas.params.md)
-
-## RouteSchemas.params property
-
-Signature:
-
-```typescript
-params?: P;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.routeschemas.query.md b/docs/development/core/server/kibana-plugin-server.routeschemas.query.md
deleted file mode 100644
index 5be5830cb4bc8..0000000000000
--- a/docs/development/core/server/kibana-plugin-server.routeschemas.query.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteSchemas](./kibana-plugin-server.routeschemas.md) > [query](./kibana-plugin-server.routeschemas.query.md)
-
-## RouteSchemas.query property
-
-Signature:
-
-```typescript
-query?: Q;
-```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationerror._constructor_.md b/docs/development/core/server/kibana-plugin-server.routevalidationerror._constructor_.md
new file mode 100644
index 0000000000000..31dc6ceb91995
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationerror._constructor_.md
@@ -0,0 +1,21 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationError](./kibana-plugin-server.routevalidationerror.md) > [(constructor)](./kibana-plugin-server.routevalidationerror._constructor_.md)
+
+## RouteValidationError.(constructor)
+
+Constructs a new instance of the `RouteValidationError` class
+
+Signature:
+
+```typescript
+constructor(error;: Error | string, path?: string[];)
+```
+
+## Parameters
+
+| Parameter | Type | Description |
+| --- | --- | --- |
+| error | Error | string | |
+| path | string[] | |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationerror.md b/docs/development/core/server/kibana-plugin-server.routevalidationerror.md
new file mode 100644
index 0000000000000..71bd72dca2eab
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationerror.md
@@ -0,0 +1,20 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationError](./kibana-plugin-server.routevalidationerror.md)
+
+## RouteValidationError class
+
+Error to return when the validation is not successful.
+
+Signature:
+
+```typescript
+export declare class RouteValidationError extends SchemaTypeError
+```
+
+## Constructors
+
+| Constructor | Modifiers | Description |
+| --- | --- | --- |
+| [(constructor)(error, path)](./kibana-plugin-server.routevalidationerror._constructor_.md) | | Constructs a new instance of the RouteValidationError class |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationfunction.md b/docs/development/core/server/kibana-plugin-server.routevalidationfunction.md
new file mode 100644
index 0000000000000..34fa096aaae78
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationfunction.md
@@ -0,0 +1,42 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md)
+
+## RouteValidationFunction type
+
+The custom validation function if @kbn/config-schema is not a valid solution for your specific plugin requirements.
+
+Signature:
+
+```typescript
+export declare type RouteValidationFunction = (data: any, validationResult: RouteValidationResultFactory) => {
+ value: T;
+ error?: never;
+} | {
+ value?: never;
+ error: RouteValidationError;
+};
+```
+
+## Example
+
+The validation should look something like:
+
+```typescript
+interface MyExpectedBody {
+ bar: string;
+ baz: number;
+}
+
+const myBodyValidation: RouteValidationFunction = (data, validationResult) => {
+ const { ok, badRequest } = validationResult;
+ const { bar, baz } = data || {};
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+}
+
+```
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.badrequest.md b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.badrequest.md
new file mode 100644
index 0000000000000..2462ae17943be
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.badrequest.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md) > [badRequest](./kibana-plugin-server.routevalidationresultfactory.badrequest.md)
+
+## RouteValidationResultFactory.badRequest property
+
+Signature:
+
+```typescript
+(error: Error | string, path?: string[]) => {
+ RouteValidationError;
+ };
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.md b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.md
new file mode 100644
index 0000000000000..5f44b490e9a17
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.md
@@ -0,0 +1,23 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md)
+
+## RouteValidationResultFactory interface
+
+Validation result factory to be used in the custom validation function to return the valid data or validation errors
+
+See [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md).
+
+Signature:
+
+```typescript
+export interface RouteValidationResultFactory
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [badRequest](./kibana-plugin-server.routevalidationresultfactory.badrequest.md) | (error: Error | string, path?: string[]) => {
error: RouteValidationError;
} | |
+| [ok](./kibana-plugin-server.routevalidationresultfactory.ok.md) | <T>(value: T) => {
value: T;
} | |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.ok.md b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.ok.md
new file mode 100644
index 0000000000000..c86ef616de103
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationresultfactory.ok.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationResultFactory](./kibana-plugin-server.routevalidationresultfactory.md) > [ok](./kibana-plugin-server.routevalidationresultfactory.ok.md)
+
+## RouteValidationResultFactory.ok property
+
+Signature:
+
+```typescript
+(value: T) => {
+ T;
+ };
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidationspec.md b/docs/development/core/server/kibana-plugin-server.routevalidationspec.md
new file mode 100644
index 0000000000000..f5fc06544043f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidationspec.md
@@ -0,0 +1,15 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidationSpec](./kibana-plugin-server.routevalidationspec.md)
+
+## RouteValidationSpec type
+
+Allowed property validation options: either @kbn/config-schema validations or custom validation functions
+
+See [RouteValidationFunction](./kibana-plugin-server.routevalidationfunction.md) for custom validation.
+
+Signature:
+
+```typescript
+export declare type RouteValidationSpec = ObjectType | Type | RouteValidationFunction;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.body.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.body.md
new file mode 100644
index 0000000000000..8b5d2c0413087
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.body.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) > [body](./kibana-plugin-server.routevalidatorconfig.body.md)
+
+## RouteValidatorConfig.body property
+
+Validation logic for the body payload
+
+Signature:
+
+```typescript
+body?: RouteValidationSpec;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.md
new file mode 100644
index 0000000000000..4637da7741d80
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.md
@@ -0,0 +1,22 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md)
+
+## RouteValidatorConfig interface
+
+The configuration object to the RouteValidator class. Set `params`, `query` and/or `body` to specify the validation logic to follow for that property.
+
+Signature:
+
+```typescript
+export interface RouteValidatorConfig
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [body](./kibana-plugin-server.routevalidatorconfig.body.md) | RouteValidationSpec<B> | Validation logic for the body payload |
+| [params](./kibana-plugin-server.routevalidatorconfig.params.md) | RouteValidationSpec<P> | Validation logic for the URL params |
+| [query](./kibana-plugin-server.routevalidatorconfig.query.md) | RouteValidationSpec<Q> | Validation logic for the Query params |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.params.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.params.md
new file mode 100644
index 0000000000000..11de25ff3b19f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.params.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) > [params](./kibana-plugin-server.routevalidatorconfig.params.md)
+
+## RouteValidatorConfig.params property
+
+Validation logic for the URL params
+
+Signature:
+
+```typescript
+params?: RouteValidationSpec;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.query.md b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.query.md
new file mode 100644
index 0000000000000..510325c2dfff7
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorconfig.query.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorConfig](./kibana-plugin-server.routevalidatorconfig.md) > [query](./kibana-plugin-server.routevalidatorconfig.query.md)
+
+## RouteValidatorConfig.query property
+
+Validation logic for the Query params
+
+Signature:
+
+```typescript
+query?: RouteValidationSpec;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatorfullconfig.md b/docs/development/core/server/kibana-plugin-server.routevalidatorfullconfig.md
new file mode 100644
index 0000000000000..0f3785b954a3a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatorfullconfig.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorFullConfig](./kibana-plugin-server.routevalidatorfullconfig.md)
+
+## RouteValidatorFullConfig type
+
+Route validations config and options merged into one object
+
+Signature:
+
+```typescript
+export declare type RouteValidatorFullConfig = RouteValidatorConfig & RouteValidatorOptions;
+```
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.md b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.md
new file mode 100644
index 0000000000000..00b029d9928e3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.md
@@ -0,0 +1,20 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorOptions](./kibana-plugin-server.routevalidatoroptions.md)
+
+## RouteValidatorOptions interface
+
+Additional options for the RouteValidator class to modify its default behaviour.
+
+Signature:
+
+```typescript
+export interface RouteValidatorOptions
+```
+
+## Properties
+
+| Property | Type | Description |
+| --- | --- | --- |
+| [unsafe](./kibana-plugin-server.routevalidatoroptions.unsafe.md) | {
params?: boolean;
query?: boolean;
body?: boolean;
} | Set the unsafe config to avoid running some additional internal \*safe\* validations on top of your custom validation |
+
diff --git a/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.unsafe.md b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.unsafe.md
new file mode 100644
index 0000000000000..b1c75e6dbdf67
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-server.routevalidatoroptions.unsafe.md
@@ -0,0 +1,18 @@
+
+
+[Home](./index.md) > [kibana-plugin-server](./kibana-plugin-server.md) > [RouteValidatorOptions](./kibana-plugin-server.routevalidatoroptions.md) > [unsafe](./kibana-plugin-server.routevalidatoroptions.unsafe.md)
+
+## RouteValidatorOptions.unsafe property
+
+Set the `unsafe` config to avoid running some additional internal \*safe\* validations on top of your custom validation
+
+Signature:
+
+```typescript
+unsafe?: {
+ params?: boolean;
+ query?: boolean;
+ body?: boolean;
+ }
+
+```
diff --git a/docs/limitations.asciidoc b/docs/limitations.asciidoc
index 0b26a3cdcf71a..9bcba3b65d660 100644
--- a/docs/limitations.asciidoc
+++ b/docs/limitations.asciidoc
@@ -12,7 +12,7 @@
These {stack} features also have limitations that affect {kib}:
* {ref}/watcher-limitations.html[Alerting]
-* {stack-ov}/ml-limitations.html[Machine learning]
+* {ml-docs}/ml-limitations.html[Machine learning]
* {ref}/security-limitations.html[Security]
--
diff --git a/docs/user/ml/index.asciidoc b/docs/user/ml/index.asciidoc
index a2c23aad98d5b..cca0dc5e4530f 100644
--- a/docs/user/ml/index.asciidoc
+++ b/docs/user/ml/index.asciidoc
@@ -50,8 +50,8 @@ pane:
image::user/ml/images/ml-job-management.jpg[Job Management]
You can use the *Settings* pane to create and edit
-{stack-ov}/ml-calendars.html[calendars] and the filters that are used in
-{stack-ov}/ml-rules.html[custom rules]:
+{ml-docs}/ml-calendars.html[calendars] and the filters that are used in
+{ml-docs}/ml-rules.html[custom rules]:
[role="screenshot"]
image::user/ml/images/ml-settings.jpg[Calendar Management]
@@ -73,7 +73,7 @@ image::user/ml/images/ml-annotations-list.jpg[Single Metric Viewer with annotati
In some circumstances, annotations are also added automatically. For example, if
the {anomaly-job} detects that there is missing data, it annotates the affected
time period. For more information, see
-{stack-ov}/ml-delayed-data-detection.html[Handling delayed data]. The
+{ml-docs}/ml-delayed-data-detection.html[Handling delayed data]. The
*Job Management* pane shows the full list of annotations for each job.
NOTE: The {kib} {ml-features} use pop-ups. You must configure your web
@@ -82,7 +82,7 @@ browser so that it does not block pop-up windows or create an exception for your
For more information about the {anomaly-detect} feature, see
https://www.elastic.co/what-is/elastic-stack-machine-learning[{ml-cap} in the {stack}]
-and {stack-ov}/xpack-ml.html[{ml-cap} {anomaly-detect}].
+and {ml-docs}/xpack-ml.html[{ml-cap} {anomaly-detect}].
[[xpack-ml-dfanalytics]]
== {dfanalytics-cap}
@@ -99,4 +99,4 @@ in {kib}. For example:
image::user/ml/images/outliers.jpg[{oldetection-cap} results in {kib}]
For more information about the {dfanalytics} feature, see
-{stack-ov}/ml-dfanalytics.html[{ml-cap} {dfanalytics}].
\ No newline at end of file
+{ml-docs}/ml-dfanalytics.html[{ml-cap} {dfanalytics}].
\ No newline at end of file
diff --git a/package.json b/package.json
index 1cec7aaacbbc9..651ffb60d7b88 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
"@elastic/charts": "^14.0.0",
"@elastic/datemath": "5.0.2",
"@elastic/ems-client": "1.0.5",
- "@elastic/eui": "17.1.2",
+ "@elastic/eui": "17.3.1",
"@elastic/filesaver": "1.1.2",
"@elastic/good": "8.1.1-kibana2",
"@elastic/numeral": "2.3.3",
diff --git a/packages/kbn-config-schema/src/index.ts b/packages/kbn-config-schema/src/index.ts
index 56b3096433c24..fc3e3c541846a 100644
--- a/packages/kbn-config-schema/src/index.ts
+++ b/packages/kbn-config-schema/src/index.ts
@@ -59,6 +59,7 @@ import {
export { ObjectType, TypeOf, Type };
export { ByteSizeValue } from './byte_size_value';
+export { SchemaTypeError, ValidationError } from './errors';
function any(options?: TypeOptions) {
return new AnyType(options);
diff --git a/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap b/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap
index 08b72c35ee2d3..b9a4f775c2b56 100644
--- a/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap
+++ b/src/core/public/fatal_errors/__snapshots__/fatal_errors_screen.test.tsx.snap
@@ -2,20 +2,15 @@
exports[`rendering render matches snapshot 1`] = `
-
+
, Readonly<{}>, Readonly<{}>>;
+ );
}
type DeepPartial = T extends any[]
diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts
index 27d9f530050be..df357aeaf2731 100644
--- a/src/core/server/http/http_server.test.ts
+++ b/src/core/server/http/http_server.test.ts
@@ -27,10 +27,18 @@ import supertest from 'supertest';
import { ByteSizeValue, schema } from '@kbn/config-schema';
import { HttpConfig } from './http_config';
-import { Router } from './router';
+import {
+ Router,
+ KibanaRequest,
+ KibanaResponseFactory,
+ RequestHandler,
+ RouteValidationResultFactory,
+ RouteValidationFunction,
+} from './router';
import { loggingServiceMock } from '../logging/logging_service.mock';
import { HttpServer } from './http_server';
import { Readable } from 'stream';
+import { RequestHandlerContext } from 'kibana/server';
const cookieOptions = {
name: 'sid',
@@ -288,6 +296,229 @@ test('valid body', async () => {
});
});
+test('valid body with validate function', async () => {
+ const router = new Router('/foo', logger, enhanceWithContext);
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: ({ bar, baz } = {}, { ok, badRequest }) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ },
+ },
+ },
+ (context, req, res) => {
+ return res.ok({ body: req.body });
+ }
+ );
+
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ registerRouter(router);
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+});
+
+test('not inline validation - specifying params', async () => {
+ const router = new Router('/foo', logger, enhanceWithContext);
+
+ const bodyValidation = (
+ { bar, baz }: any = {},
+ { ok, badRequest }: RouteValidationResultFactory
+ ) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ };
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: bodyValidation,
+ },
+ },
+ (context, req, res) => {
+ return res.ok({ body: req.body });
+ }
+ );
+
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ registerRouter(router);
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+});
+
+test('not inline validation - specifying validation handler', async () => {
+ const router = new Router('/foo', logger, enhanceWithContext);
+
+ const bodyValidation: RouteValidationFunction<{ bar: string; baz: number }> = (
+ { bar, baz } = {},
+ { ok, badRequest }
+ ) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ };
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: bodyValidation,
+ },
+ },
+ (context, req, res) => {
+ return res.ok({ body: req.body });
+ }
+ );
+
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ registerRouter(router);
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+});
+
+// https://github.com/elastic/kibana/issues/47047
+test('not inline handler - KibanaRequest', async () => {
+ const router = new Router('/foo', logger, enhanceWithContext);
+
+ const handler = (
+ context: RequestHandlerContext,
+ req: KibanaRequest,
+ res: KibanaResponseFactory
+ ) => {
+ const body = {
+ bar: req.body.bar.toUpperCase(),
+ baz: req.body.baz.toString(),
+ };
+
+ return res.ok({ body });
+ };
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: ({ bar, baz } = {}, { ok, badRequest }) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ },
+ },
+ },
+ handler
+ );
+
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ registerRouter(router);
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'TEST', baz: '123' });
+ });
+});
+
+test('not inline handler - RequestHandler', async () => {
+ const router = new Router('/foo', logger, enhanceWithContext);
+
+ const handler: RequestHandler = (
+ context,
+ req,
+ res
+ ) => {
+ const body = {
+ bar: req.body.bar.toUpperCase(),
+ baz: req.body.baz.toString(),
+ };
+
+ return res.ok({ body });
+ };
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: ({ bar, baz } = {}, { ok, badRequest }) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ },
+ },
+ },
+ handler
+ );
+
+ const { registerRouter, server: innerServer } = await server.setup(config);
+ registerRouter(router);
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'TEST', baz: '123' });
+ });
+});
+
test('invalid body', async () => {
const router = new Router('/foo', logger, enhanceWithContext);
diff --git a/src/core/server/http/index.ts b/src/core/server/http/index.ts
index 21de3945f1044..55ba813484268 100644
--- a/src/core/server/http/index.ts
+++ b/src/core/server/http/index.ts
@@ -47,10 +47,16 @@ export {
RouteMethod,
RouteRegistrar,
RouteConfigOptions,
- RouteSchemas,
RouteConfigOptionsBody,
RouteContentType,
validBodyOutput,
+ RouteValidatorConfig,
+ RouteValidationSpec,
+ RouteValidationFunction,
+ RouteValidatorOptions,
+ RouteValidationError,
+ RouteValidatorFullConfig,
+ RouteValidationResultFactory,
} from './router';
export { BasePathProxyServer } from './base_path_proxy_server';
export { OnPreAuthHandler, OnPreAuthToolkit } from './lifecycle/on_pre_auth';
diff --git a/src/core/server/http/integration_tests/router.test.ts b/src/core/server/http/integration_tests/router.test.ts
index 6117190c57ba8..c3b9b20d84865 100644
--- a/src/core/server/http/integration_tests/router.test.ts
+++ b/src/core/server/http/integration_tests/router.test.ts
@@ -642,6 +642,116 @@ describe('Response factory', () => {
});
});
+ it('validate function in body', async () => {
+ const { server: innerServer, createRouter } = await server.setup(setupDeps);
+ const router = createRouter('/foo');
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: ({ bar, baz } = {}, { ok, badRequest }) => {
+ if (typeof bar === 'string' && typeof baz === 'number') {
+ return ok({ bar, baz });
+ } else {
+ return badRequest('Wrong payload', ['body']);
+ }
+ },
+ },
+ },
+ (context, req, res) => {
+ return res.ok({ body: req.body });
+ }
+ );
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: '123',
+ })
+ .expect(400)
+ .then(res => {
+ expect(res.body).toEqual({
+ error: 'Bad Request',
+ message: '[request body.body]: Wrong payload',
+ statusCode: 400,
+ });
+ });
+ });
+
+ it('@kbn/config-schema validation in body', async () => {
+ const { server: innerServer, createRouter } = await server.setup(setupDeps);
+ const router = createRouter('/foo');
+
+ router.post(
+ {
+ path: '/',
+ validate: {
+ body: schema.object({
+ bar: schema.string(),
+ baz: schema.number(),
+ }),
+ },
+ },
+ (context, req, res) => {
+ return res.ok({ body: req.body });
+ }
+ );
+
+ await server.start();
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 123,
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: '123', // Automatic casting happens
+ })
+ .expect(200)
+ .then(res => {
+ expect(res.body).toEqual({ bar: 'test', baz: 123 });
+ });
+
+ await supertest(innerServer.listener)
+ .post('/foo/')
+ .send({
+ bar: 'test',
+ baz: 'test', // Can't cast it into number
+ })
+ .expect(400)
+ .then(res => {
+ expect(res.body).toEqual({
+ error: 'Bad Request',
+ message: '[request body.baz]: expected value of type [number] but got [string]',
+ statusCode: 400,
+ });
+ });
+ });
+
it('401 Unauthorized', async () => {
const { server: innerServer, createRouter } = await server.setup(setupDeps);
const router = createRouter('/');
diff --git a/src/core/server/http/router/error_wrapper.ts b/src/core/server/http/router/error_wrapper.ts
index c4b4d3840d1b9..8f895753c38c3 100644
--- a/src/core/server/http/router/error_wrapper.ts
+++ b/src/core/server/http/router/error_wrapper.ts
@@ -18,19 +18,18 @@
*/
import Boom from 'boom';
-import { ObjectType, TypeOf } from '@kbn/config-schema';
import { KibanaRequest } from './request';
import { KibanaResponseFactory } from './response';
import { RequestHandler } from './router';
import { RequestHandlerContext } from '../../../server';
import { RouteMethod } from './route';
-export const wrapErrors = (
+export const wrapErrors = (
handler: RequestHandler
): RequestHandler => {
return async (
context: RequestHandlerContext,
- request: KibanaRequest, TypeOf, TypeOf, RouteMethod>,
+ request: KibanaRequest,
response: KibanaResponseFactory
) => {
try {
diff --git a/src/core/server/http/router/index.ts b/src/core/server/http/router/index.ts
index 35bfb3ba9c33a..084d30d694474 100644
--- a/src/core/server/http/router/index.ts
+++ b/src/core/server/http/router/index.ts
@@ -31,7 +31,6 @@ export {
RouteMethod,
RouteConfig,
RouteConfigOptions,
- RouteSchemas,
RouteContentType,
RouteConfigOptionsBody,
validBodyOutput,
@@ -55,3 +54,13 @@ export {
} from './response';
export { IKibanaSocket } from './socket';
+
+export {
+ RouteValidatorConfig,
+ RouteValidationSpec,
+ RouteValidationFunction,
+ RouteValidatorOptions,
+ RouteValidationError,
+ RouteValidatorFullConfig,
+ RouteValidationResultFactory,
+} from './validator';
diff --git a/src/core/server/http/router/request.test.ts b/src/core/server/http/router/request.test.ts
index ebb7ffa7a6fc9..51162a2c258e9 100644
--- a/src/core/server/http/router/request.test.ts
+++ b/src/core/server/http/router/request.test.ts
@@ -18,6 +18,7 @@
*/
import { KibanaRequest } from './request';
import { httpServerMock } from '../http_server.mocks';
+import { schema } from '@kbn/config-schema';
describe('KibanaRequest', () => {
describe('get all headers', () => {
@@ -64,4 +65,56 @@ describe('KibanaRequest', () => {
});
});
});
+
+ describe('RouteSchema type inferring', () => {
+ it('should work with config-schema', () => {
+ const body = Buffer.from('body!');
+ const request = {
+ ...httpServerMock.createRawRequest({
+ params: { id: 'params' },
+ query: { search: 'query' },
+ }),
+ payload: body, // Set outside because the mock is using `merge` by lodash and breaks the Buffer into arrays
+ } as any;
+ const kibanaRequest = KibanaRequest.from(request, {
+ params: schema.object({ id: schema.string() }),
+ query: schema.object({ search: schema.string() }),
+ body: schema.buffer(),
+ });
+ expect(kibanaRequest.params).toStrictEqual({ id: 'params' });
+ expect(kibanaRequest.params.id.toUpperCase()).toEqual('PARAMS'); // infers it's a string
+ expect(kibanaRequest.query).toStrictEqual({ search: 'query' });
+ expect(kibanaRequest.query.search.toUpperCase()).toEqual('QUERY'); // infers it's a string
+ expect(kibanaRequest.body).toEqual(body);
+ expect(kibanaRequest.body.byteLength).toBeGreaterThan(0); // infers it's a buffer
+ });
+
+ it('should work with ValidationFunction', () => {
+ const body = Buffer.from('body!');
+ const request = {
+ ...httpServerMock.createRawRequest({
+ params: { id: 'params' },
+ query: { search: 'query' },
+ }),
+ payload: body, // Set outside because the mock is using `merge` by lodash and breaks the Buffer into arrays
+ } as any;
+ const kibanaRequest = KibanaRequest.from(request, {
+ params: schema.object({ id: schema.string() }),
+ query: schema.object({ search: schema.string() }),
+ body: (data, { ok, badRequest }) => {
+ if (Buffer.isBuffer(data)) {
+ return ok(data);
+ } else {
+ return badRequest('It should be a Buffer', []);
+ }
+ },
+ });
+ expect(kibanaRequest.params).toStrictEqual({ id: 'params' });
+ expect(kibanaRequest.params.id.toUpperCase()).toEqual('PARAMS'); // infers it's a string
+ expect(kibanaRequest.query).toStrictEqual({ search: 'query' });
+ expect(kibanaRequest.query.search.toUpperCase()).toEqual('QUERY'); // infers it's a string
+ expect(kibanaRequest.body).toEqual(body);
+ expect(kibanaRequest.body.byteLength).toBeGreaterThan(0); // infers it's a buffer
+ });
+ });
});
diff --git a/src/core/server/http/router/request.ts b/src/core/server/http/router/request.ts
index b132899910569..47b001700b015 100644
--- a/src/core/server/http/router/request.ts
+++ b/src/core/server/http/router/request.ts
@@ -20,13 +20,11 @@
import { Url } from 'url';
import { Request } from 'hapi';
-import { ObjectType, Type, TypeOf } from '@kbn/config-schema';
-
-import { Stream } from 'stream';
import { deepFreeze, RecursiveReadonly } from '../../../utils';
import { Headers } from './headers';
-import { RouteMethod, RouteSchemas, RouteConfigOptions, validBodyOutput } from './route';
+import { RouteMethod, RouteConfigOptions, validBodyOutput } from './route';
import { KibanaSocket, IKibanaSocket } from './socket';
+import { RouteValidator, RouteValidatorFullConfig } from './validator';
const requestSymbol = Symbol('request');
@@ -70,12 +68,13 @@ export class KibanaRequest<
* instance of a KibanaRequest.
* @internal
*/
- public static from<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
- >(req: Request, routeSchemas?: RouteSchemas, withoutSecretHeaders: boolean = true) {
- const requestParts = KibanaRequest.validate(req, routeSchemas);
+ public static from(
+ req: Request,
+ routeSchemas: RouteValidator | RouteValidatorFullConfig = {},
+ withoutSecretHeaders: boolean = true
+ ) {
+ const routeValidator = RouteValidator.from(routeSchemas);
+ const requestParts = KibanaRequest.validate(req, routeValidator);
return new KibanaRequest(
req,
requestParts.params,
@@ -91,40 +90,17 @@ export class KibanaRequest<
* received in the route handler.
* @internal
*/
- private static validate<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
- >(
+ private static validate(
req: Request,
- routeSchemas: RouteSchemas | undefined
+ routeValidator: RouteValidator
): {
- params: TypeOf;
- query: TypeOf;
- body: TypeOf;
+ params: P;
+ query: Q;
+ body: B;
} {
- if (routeSchemas === undefined) {
- return {
- body: {},
- params: {},
- query: {},
- };
- }
-
- const params =
- routeSchemas.params === undefined
- ? {}
- : routeSchemas.params.validate(req.params, {}, 'request params');
-
- const query =
- routeSchemas.query === undefined
- ? {}
- : routeSchemas.query.validate(req.query, {}, 'request query');
-
- const body =
- routeSchemas.body === undefined
- ? {}
- : routeSchemas.body.validate(req.payload, {}, 'request body');
+ const params = routeValidator.getParams(req.params, 'request params');
+ const query = routeValidator.getQuery(req.query, 'request query');
+ const body = routeValidator.getBody(req.payload, 'request body');
return { query, params, body };
}
diff --git a/src/core/server/http/router/route.ts b/src/core/server/http/router/route.ts
index 129cf4c922ffd..4439a80b1eac7 100644
--- a/src/core/server/http/router/route.ts
+++ b/src/core/server/http/router/route.ts
@@ -17,8 +17,7 @@
* under the License.
*/
-import { ObjectType, Type } from '@kbn/config-schema';
-import { Stream } from 'stream';
+import { RouteValidatorFullConfig } from './validator';
/**
* The set of common HTTP methods supported by Kibana routing.
@@ -124,12 +123,7 @@ export interface RouteConfigOptions {
* Route specific configuration.
* @public
*/
-export interface RouteConfig<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type,
- Method extends RouteMethod
-> {
+export interface RouteConfig {
/**
* The endpoint _within_ the router path to register the route.
*
@@ -201,25 +195,10 @@ export interface RouteConfig<
* });
* ```
*/
- validate: RouteSchemas | false;
+ validate: RouteValidatorFullConfig | false;
/**
* Additional route options {@link RouteConfigOptions}.
*/
options?: RouteConfigOptions;
}
-
-/**
- * RouteSchemas contains the schemas for validating the different parts of a
- * request.
- * @public
- */
-export interface RouteSchemas<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
-> {
- params?: P;
- query?: Q;
- body?: B;
-}
diff --git a/src/core/server/http/router/router.test.ts b/src/core/server/http/router/router.test.ts
index f5469a95b5106..a936da6a40a9f 100644
--- a/src/core/server/http/router/router.test.ts
+++ b/src/core/server/http/router/router.test.ts
@@ -20,6 +20,7 @@
import { Router } from './router';
import { loggingServiceMock } from '../../logging/logging_service.mock';
import { schema } from '@kbn/config-schema';
+
const logger = loggingServiceMock.create().get();
const enhanceWithContext = (fn: (...args: any[]) => any) => fn.bind(null, {});
@@ -38,12 +39,15 @@ describe('Router', () => {
const router = new Router('', logger, enhanceWithContext);
expect(() =>
router.get(
- // we use 'any' because validate requires @kbn/config-schema usage
- { path: '/', validate: { params: { validate: () => 'error' } } } as any,
+ // we use 'any' because validate requires valid Type or function usage
+ {
+ path: '/',
+ validate: { params: { validate: () => 'error' } } as any,
+ },
(context, req, res) => res.ok({})
)
).toThrowErrorMatchingInlineSnapshot(
- `"Expected a valid schema declared with '@kbn/config-schema' package at key: [params]."`
+ `"Expected a valid validation logic declared with '@kbn/config-schema' package or a RouteValidationFunction at key: [params]."`
);
});
diff --git a/src/core/server/http/router/router.ts b/src/core/server/http/router/router.ts
index 5c52e71cd54bb..bb56ee3727d1a 100644
--- a/src/core/server/http/router/router.ts
+++ b/src/core/server/http/router/router.ts
@@ -17,24 +17,18 @@
* under the License.
*/
-import { ObjectType, TypeOf, Type } from '@kbn/config-schema';
import { Request, ResponseObject, ResponseToolkit } from 'hapi';
import Boom from 'boom';
-import { Stream } from 'stream';
+import { Type } from '@kbn/config-schema';
import { Logger } from '../../logging';
import { KibanaRequest } from './request';
import { KibanaResponseFactory, kibanaResponseFactory, IKibanaResponse } from './response';
-import {
- RouteConfig,
- RouteConfigOptions,
- RouteMethod,
- RouteSchemas,
- validBodyOutput,
-} from './route';
+import { RouteConfig, RouteConfigOptions, RouteMethod, validBodyOutput } from './route';
import { HapiResponseAdapter } from './response_adapter';
import { RequestHandlerContext } from '../../../server';
import { wrapErrors } from './error_wrapper';
+import { RouteValidator } from './validator';
interface RouterRoute {
method: RouteMethod;
@@ -48,11 +42,7 @@ interface RouterRoute {
*
* @public
*/
-export type RouteRegistrar = <
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
->(
+export type RouteRegistrar = (
route: RouteConfig,
handler: RequestHandler
) => void;
@@ -108,9 +98,7 @@ export interface IRouter {
* Wrap a router handler to catch and converts legacy boom errors to proper custom errors.
* @param handler {@link RequestHandler} - a route handler to wrap
*/
- handleLegacyErrors: (
- handler: RequestHandler
- ) => RequestHandler;
+ handleLegacyErrors: (handler: RequestHandler) => RequestHandler;
/**
* Returns all routes registered with this router.
@@ -120,12 +108,9 @@ export interface IRouter {
getRoutes: () => RouterRoute[];
}
-export type ContextEnhancer<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType,
- Method extends RouteMethod
-> = (handler: RequestHandler) => RequestHandlerEnhanced;
+export type ContextEnhancer = (
+ handler: RequestHandler
+) => RequestHandlerEnhanced;
function getRouteFullPath(routerPath: string, routePath: string) {
// If router's path ends with slash and route's path starts with slash,
@@ -140,11 +125,10 @@ function getRouteFullPath(routerPath: string, routePath: string) {
* @returns Route schemas if `validate` is specified on the route, otherwise
* undefined.
*/
-function routeSchemasFromRouteConfig<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
->(route: RouteConfig, routeMethod: RouteMethod) {
+function routeSchemasFromRouteConfig(
+ route: RouteConfig,
+ routeMethod: RouteMethod
+) {
// The type doesn't allow `validate` to be undefined, but it can still
// happen when it's used from JavaScript.
if (route.validate === undefined) {
@@ -155,15 +139,17 @@ function routeSchemasFromRouteConfig<
if (route.validate !== false) {
Object.entries(route.validate).forEach(([key, schema]) => {
- if (!(schema instanceof Type)) {
+ if (!(schema instanceof Type || typeof schema === 'function')) {
throw new Error(
- `Expected a valid schema declared with '@kbn/config-schema' package at key: [${key}].`
+ `Expected a valid validation logic declared with '@kbn/config-schema' package or a RouteValidationFunction at key: [${key}].`
);
}
});
}
- return route.validate ? route.validate : undefined;
+ if (route.validate) {
+ return RouteValidator.from(route.validate);
+ }
}
/**
@@ -174,12 +160,7 @@ function routeSchemasFromRouteConfig<
*/
function validOptions(
method: RouteMethod,
- routeConfig: RouteConfig<
- ObjectType,
- ObjectType,
- ObjectType | Type | Type,
- typeof method
- >
+ routeConfig: RouteConfig
) {
const shouldNotHavePayload = ['head', 'get'].includes(method);
const { options = {}, validate } = routeConfig;
@@ -225,11 +206,7 @@ export class Router implements IRouter {
private readonly log: Logger,
private readonly enhanceWithContext: ContextEnhancer
) {
- const buildMethod = (method: Method) => <
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
- >(
+ const buildMethod = (method: Method) => (
route: RouteConfig,
handler: RequestHandler
) => {
@@ -260,17 +237,11 @@ export class Router implements IRouter {
return [...this.routes];
}
- public handleLegacyErrors(
- handler: RequestHandler
- ): RequestHandler {
+ public handleLegacyErrors(handler: RequestHandler): RequestHandler {
return wrapErrors(handler);
}
- private async handle<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type
- >({
+ private async handle({
routeSchemas,
request,
responseToolkit,
@@ -279,9 +250,9 @@ export class Router implements IRouter {
request: Request;
responseToolkit: ResponseToolkit;
handler: RequestHandlerEnhanced;
- routeSchemas?: RouteSchemas;
+ routeSchemas?: RouteValidator;
}) {
- let kibanaRequest: KibanaRequest, TypeOf, TypeOf, typeof request.method>;
+ let kibanaRequest: KibanaRequest;
const hapiResponseAdapter = new HapiResponseAdapter(responseToolkit);
try {
kibanaRequest = KibanaRequest.from(request, routeSchemas);
@@ -303,12 +274,9 @@ type WithoutHeadArgument = T extends (first: any, ...rest: infer Params) => i
? (...rest: Params) => Return
: never;
-type RequestHandlerEnhanced<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type,
- Method extends RouteMethod
-> = WithoutHeadArgument>;
+type RequestHandlerEnhanced = WithoutHeadArgument<
+ RequestHandler
+>;
/**
* A function executed when route path matched requested resource path.
@@ -345,12 +313,12 @@ type RequestHandlerEnhanced<
* @public
*/
export type RequestHandler<
- P extends ObjectType,
- Q extends ObjectType,
- B extends ObjectType | Type | Type,
+ P = unknown,
+ Q = unknown,
+ B = unknown,
Method extends RouteMethod = any
> = (
context: RequestHandlerContext,
- request: KibanaRequest, TypeOf, TypeOf, Method>,
+ request: KibanaRequest,
response: KibanaResponseFactory
) => IKibanaResponse | Promise>;
diff --git a/src/core/server/http/router/validator/index.ts b/src/core/server/http/router/validator/index.ts
new file mode 100644
index 0000000000000..edb116c40144a
--- /dev/null
+++ b/src/core/server/http/router/validator/index.ts
@@ -0,0 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export {
+ RouteValidator,
+ RouteValidatorConfig,
+ RouteValidationSpec,
+ RouteValidationFunction,
+ RouteValidatorOptions,
+ RouteValidatorFullConfig,
+ RouteValidationResultFactory,
+} from './validator';
+export { RouteValidationError } from './validator_error';
diff --git a/src/core/server/http/router/validator/validator.test.ts b/src/core/server/http/router/validator/validator.test.ts
new file mode 100644
index 0000000000000..729eb1b60c10a
--- /dev/null
+++ b/src/core/server/http/router/validator/validator.test.ts
@@ -0,0 +1,135 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { RouteValidationError, RouteValidator } from './';
+import { schema, Type } from '@kbn/config-schema';
+
+describe('Router validator', () => {
+ it('should validate and infer the type from a function', () => {
+ const validator = RouteValidator.from({
+ params: ({ foo }, validationResult) => {
+ if (typeof foo === 'string') {
+ return validationResult.ok({ foo });
+ }
+ return validationResult.badRequest('Not a string', ['foo']);
+ },
+ });
+ expect(validator.getParams({ foo: 'bar' })).toStrictEqual({ foo: 'bar' });
+ expect(validator.getParams({ foo: 'bar' }).foo.toUpperCase()).toBe('BAR'); // It knows it's a string! :)
+ expect(() => validator.getParams({ foo: 1 })).toThrowError('[foo]: Not a string');
+ expect(() => validator.getParams({})).toThrowError('[foo]: Not a string');
+
+ expect(() => validator.getParams(undefined)).toThrowError(
+ "Cannot destructure property `foo` of 'undefined' or 'null'."
+ );
+ expect(() => validator.getParams({}, 'myField')).toThrowError('[myField.foo]: Not a string');
+
+ expect(validator.getBody(undefined)).toStrictEqual({});
+ expect(validator.getQuery(undefined)).toStrictEqual({});
+ });
+
+ it('should validate and infer the type from a function that does not use the resolver', () => {
+ const validator = RouteValidator.from({
+ params: data => {
+ if (typeof data.foo === 'string') {
+ return { value: { foo: data.foo as string } };
+ }
+ return { error: new RouteValidationError('Not a string', ['foo']) };
+ },
+ });
+ expect(validator.getParams({ foo: 'bar' })).toStrictEqual({ foo: 'bar' });
+ expect(validator.getParams({ foo: 'bar' }).foo.toUpperCase()).toBe('BAR'); // It knows it's a string! :)
+ expect(() => validator.getParams({ foo: 1 })).toThrowError('[foo]: Not a string');
+ expect(() => validator.getParams({})).toThrowError('[foo]: Not a string');
+
+ expect(() => validator.getParams(undefined)).toThrowError(
+ `Cannot read property 'foo' of undefined`
+ );
+ expect(() => validator.getParams({}, 'myField')).toThrowError('[myField.foo]: Not a string');
+
+ expect(validator.getBody(undefined)).toStrictEqual({});
+ expect(validator.getQuery(undefined)).toStrictEqual({});
+ });
+
+ it('should validate and infer the type from a config-schema ObjectType', () => {
+ const schemaValidation = RouteValidator.from({
+ params: schema.object({
+ foo: schema.string(),
+ }),
+ });
+
+ expect(schemaValidation.getParams({ foo: 'bar' })).toStrictEqual({ foo: 'bar' });
+ expect(schemaValidation.getParams({ foo: 'bar' }).foo.toUpperCase()).toBe('BAR'); // It knows it's a string! :)
+ expect(() => schemaValidation.getParams({ foo: 1 })).toThrowError(
+ '[foo]: expected value of type [string] but got [number]'
+ );
+ expect(() => schemaValidation.getParams({})).toThrowError(
+ '[foo]: expected value of type [string] but got [undefined]'
+ );
+ expect(() => schemaValidation.getParams(undefined)).toThrowError(
+ '[foo]: expected value of type [string] but got [undefined]'
+ );
+ expect(() => schemaValidation.getParams({}, 'myField')).toThrowError(
+ '[myField.foo]: expected value of type [string] but got [undefined]'
+ );
+ });
+
+ it('should validate and infer the type from a config-schema non-ObjectType', () => {
+ const schemaValidation = RouteValidator.from({ params: schema.buffer() });
+
+ const foo = Buffer.from('hi!');
+ expect(schemaValidation.getParams(foo)).toStrictEqual(foo);
+ expect(schemaValidation.getParams(foo).byteLength).toBeGreaterThan(0); // It knows it's a buffer! :)
+ expect(() => schemaValidation.getParams({ foo: 1 })).toThrowError(
+ 'expected value of type [Buffer] but got [Object]'
+ );
+ expect(() => schemaValidation.getParams({})).toThrowError(
+ 'expected value of type [Buffer] but got [Object]'
+ );
+ expect(() => schemaValidation.getParams(undefined)).toThrowError(
+ `expected value of type [Buffer] but got [undefined]`
+ );
+ expect(() => schemaValidation.getParams({}, 'myField')).toThrowError(
+ '[myField]: expected value of type [Buffer] but got [Object]'
+ );
+ });
+
+ it('should catch the errors thrown by the validate function', () => {
+ const validator = RouteValidator.from({
+ params: data => {
+ throw new Error('Something went terribly wrong');
+ },
+ });
+
+ expect(() => validator.getParams({ foo: 1 })).toThrowError('Something went terribly wrong');
+ expect(() => validator.getParams({}, 'myField')).toThrowError(
+ '[myField]: Something went terribly wrong'
+ );
+ });
+
+ it('should not accept invalid validation options', () => {
+ const wrongValidateSpec = RouteValidator.from({
+ params: { validate: (data: T): T => data } as Type,
+ });
+
+ expect(() => wrongValidateSpec.getParams({ foo: 1 })).toThrowError(
+ 'The validation rule provided in the handler is not valid'
+ );
+ });
+});
diff --git a/src/core/server/http/router/validator/validator.ts b/src/core/server/http/router/validator/validator.ts
new file mode 100644
index 0000000000000..65c0a934e6ef0
--- /dev/null
+++ b/src/core/server/http/router/validator/validator.ts
@@ -0,0 +1,280 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ValidationError, Type, schema, ObjectType } from '@kbn/config-schema';
+import { Stream } from 'stream';
+import { RouteValidationError } from './validator_error';
+
+/**
+ * Validation result factory to be used in the custom validation function to return the valid data or validation errors
+ *
+ * See {@link RouteValidationFunction}.
+ *
+ * @public
+ */
+export interface RouteValidationResultFactory {
+ ok: (value: T) => { value: T };
+ badRequest: (error: Error | string, path?: string[]) => { error: RouteValidationError };
+}
+
+/**
+ * The custom validation function if @kbn/config-schema is not a valid solution for your specific plugin requirements.
+ *
+ * @example
+ *
+ * The validation should look something like:
+ * ```typescript
+ * interface MyExpectedBody {
+ * bar: string;
+ * baz: number;
+ * }
+ *
+ * const myBodyValidation: RouteValidationFunction = (data, validationResult) => {
+ * const { ok, badRequest } = validationResult;
+ * const { bar, baz } = data || {};
+ * if (typeof bar === 'string' && typeof baz === 'number') {
+ * return ok({ bar, baz });
+ * } else {
+ * return badRequest('Wrong payload', ['body']);
+ * }
+ * }
+ * ```
+ *
+ * @public
+ */
+export type RouteValidationFunction = (
+ data: any,
+ validationResult: RouteValidationResultFactory
+) =>
+ | {
+ value: T;
+ error?: never;
+ }
+ | {
+ value?: never;
+ error: RouteValidationError;
+ };
+
+/**
+ * Allowed property validation options: either @kbn/config-schema validations or custom validation functions
+ *
+ * See {@link RouteValidationFunction} for custom validation.
+ *
+ * @public
+ */
+export type RouteValidationSpec = ObjectType | Type | RouteValidationFunction;
+
+// Ugly as hell but we need this conditional typing to have proper type inference
+type RouteValidationResultType | undefined> = NonNullable<
+ T extends RouteValidationFunction
+ ? ReturnType['value']
+ : T extends Type
+ ? ReturnType
+ : undefined
+>;
+
+/**
+ * The configuration object to the RouteValidator class.
+ * Set `params`, `query` and/or `body` to specify the validation logic to follow for that property.
+ *
+ * @public
+ */
+export interface RouteValidatorConfig {
+ /**
+ * Validation logic for the URL params
+ * @public
+ */
+ params?: RouteValidationSpec;
+ /**
+ * Validation logic for the Query params
+ * @public
+ */
+ query?: RouteValidationSpec;
+ /**
+ * Validation logic for the body payload
+ * @public
+ */
+ body?: RouteValidationSpec;
+}
+
+/**
+ * Additional options for the RouteValidator class to modify its default behaviour.
+ *
+ * @public
+ */
+export interface RouteValidatorOptions {
+ /**
+ * Set the `unsafe` config to avoid running some additional internal *safe* validations on top of your custom validation
+ * @public
+ */
+ unsafe?: {
+ params?: boolean;
+ query?: boolean;
+ body?: boolean;
+ };
+}
+
+/**
+ * Route validations config and options merged into one object
+ * @public
+ */
+export type RouteValidatorFullConfig = RouteValidatorConfig &
+ RouteValidatorOptions;
+
+/**
+ * Route validator class to define the validation logic for each new route.
+ *
+ * @internal
+ */
+export class RouteValidator {
+ public static from
(
+ opts: RouteValidator | RouteValidatorFullConfig
+ ) {
+ if (opts instanceof RouteValidator) {
+ return opts;
+ }
+ const { params, query, body, ...options } = opts;
+ return new RouteValidator({ params, query, body }, options);
+ }
+
+ private static ResultFactory: RouteValidationResultFactory = {
+ ok: (value: T) => ({ value }),
+ badRequest: (error: Error | string, path?: string[]) => ({
+ error: new RouteValidationError(error, path),
+ }),
+ };
+
+ private constructor(
+ private readonly config: RouteValidatorConfig,
+ private readonly options: RouteValidatorOptions = {}
+ ) {}
+
+ /**
+ * Get validated URL params
+ * @internal
+ */
+ public getParams(data: unknown, namespace?: string): Readonly {
+ return this.validate(this.config.params, this.options.unsafe?.params, data, namespace);
+ }
+
+ /**
+ * Get validated query params
+ * @internal
+ */
+ public getQuery(data: unknown, namespace?: string): Readonly {
+ return this.validate(this.config.query, this.options.unsafe?.query, data, namespace);
+ }
+
+ /**
+ * Get validated body
+ * @internal
+ */
+ public getBody(data: unknown, namespace?: string): Readonly {
+ return this.validate(this.config.body, this.options.unsafe?.body, data, namespace);
+ }
+
+ /**
+ * Has body validation
+ * @internal
+ */
+ public hasBody(): boolean {
+ return typeof this.config.body !== 'undefined';
+ }
+
+ private validate(
+ validationRule?: RouteValidationSpec,
+ unsafe?: boolean,
+ data?: unknown,
+ namespace?: string
+ ): RouteValidationResultType {
+ if (typeof validationRule === 'undefined') {
+ return {};
+ }
+ let precheckedData = this.preValidateSchema(data).validate(data, {}, namespace);
+
+ if (unsafe !== true) {
+ precheckedData = this.safetyPrechecks(precheckedData, namespace);
+ }
+
+ const customCheckedData = this.customValidation(validationRule, precheckedData, namespace);
+
+ if (unsafe === true) {
+ return customCheckedData;
+ }
+
+ return this.safetyPostchecks(customCheckedData, namespace);
+ }
+
+ private safetyPrechecks(data: T, namespace?: string): T {
+ // We can add any pre-validation safety logic in here
+ return data;
+ }
+
+ private safetyPostchecks(data: T, namespace?: string): T {
+ // We can add any post-validation safety logic in here
+ return data;
+ }
+
+ private customValidation(
+ validationRule: RouteValidationSpec,
+ data?: unknown,
+ namespace?: string
+ ): RouteValidationResultType {
+ if (validationRule instanceof Type) {
+ return validationRule.validate(data, {}, namespace);
+ } else if (typeof validationRule === 'function') {
+ return this.validateFunction(validationRule, data, namespace);
+ } else {
+ throw new ValidationError(
+ new RouteValidationError(`The validation rule provided in the handler is not valid`),
+ namespace
+ );
+ }
+ }
+
+ private validateFunction(
+ validateFn: RouteValidationFunction,
+ data: unknown,
+ namespace?: string
+ ): T {
+ let result: ReturnType;
+ try {
+ result = validateFn(data, RouteValidator.ResultFactory);
+ } catch (err) {
+ result = { error: new RouteValidationError(err) };
+ }
+
+ if (result.error) {
+ throw new ValidationError(result.error, namespace);
+ }
+ return result.value;
+ }
+
+ private preValidateSchema(data: any) {
+ if (Buffer.isBuffer(data)) {
+ // if options.body.parse !== true
+ return schema.buffer();
+ } else if (data instanceof Stream) {
+ // if options.body.output === 'stream'
+ return schema.stream();
+ } else {
+ return schema.maybe(schema.nullable(schema.object({}, { allowUnknowns: true })));
+ }
+ }
+}
diff --git a/src/core/server/http/router/validator/validator_error.ts b/src/core/server/http/router/validator/validator_error.ts
new file mode 100644
index 0000000000000..d306db4ad1cf4
--- /dev/null
+++ b/src/core/server/http/router/validator/validator_error.ts
@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SchemaTypeError } from '@kbn/config-schema';
+
+/**
+ * Error to return when the validation is not successful.
+ * @public
+ */
+export class RouteValidationError extends SchemaTypeError {
+ constructor(error: Error | string, path: string[] = []) {
+ super(error, path);
+
+ // Set the prototype explicitly, see:
+ // https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#extending-built-ins-like-error-array-and-map-may-no-longer-work
+ Object.setPrototypeOf(this, RouteValidationError.prototype);
+ }
+}
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 060265120b865..878f854f2a517 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -134,10 +134,16 @@ export {
RouteRegistrar,
RouteMethod,
RouteConfigOptions,
- RouteSchemas,
RouteConfigOptionsBody,
RouteContentType,
validBodyOutput,
+ RouteValidatorConfig,
+ RouteValidationSpec,
+ RouteValidationFunction,
+ RouteValidatorOptions,
+ RouteValidatorFullConfig,
+ RouteValidationResultFactory,
+ RouteValidationError,
SessionStorage,
SessionStorageCookieOptions,
SessionCookieValidationResult,
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 85c0af8131ccb..ef5368751c8f5 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -115,6 +115,7 @@ import { RenderSearchTemplateParams } from 'elasticsearch';
import { Request } from 'hapi';
import { ResponseObject } from 'hapi';
import { ResponseToolkit } from 'hapi';
+import { SchemaTypeError } from '@kbn/config-schema';
import { ScrollParams } from 'elasticsearch';
import { SearchParams } from 'elasticsearch';
import { SearchResponse } from 'elasticsearch';
@@ -449,11 +450,11 @@ export interface AuthToolkit {
export class BasePath {
// @internal
constructor(serverBasePath?: string);
- get: (request: LegacyRequest | KibanaRequest) => string;
+ get: (request: KibanaRequest | LegacyRequest) => string;
prepend: (path: string) => string;
remove: (path: string) => string;
readonly serverBasePath: string;
- set: (request: LegacyRequest | KibanaRequest, requestSpecificBasePath: string) => void;
+ set: (request: KibanaRequest | LegacyRequest, requestSpecificBasePath: string) => void;
}
// Warning: (ae-forgotten-export) The symbol "BootstrapArgs" needs to be exported by the entry point index.d.ts
@@ -805,7 +806,7 @@ export interface IRouter {
//
// @internal
getRoutes: () => RouterRoute[];
- handleLegacyErrors: (handler: RequestHandler) => RequestHandler;
+ handleLegacyErrors: (handler: RequestHandler) => RequestHandler;
patch: RouteRegistrar<'patch'>;
post: RouteRegistrar<'post'>;
put: RouteRegistrar<'put'>;
@@ -841,8 +842,10 @@ export class KibanaRequest | Type>(req: Request, routeSchemas?: RouteSchemas, withoutSecretHeaders?: boolean): KibanaRequest;
+ static from(req: Request, routeSchemas?: RouteValidator | RouteValidatorFullConfig, withoutSecretHeaders?: boolean): KibanaRequest;
readonly headers: Headers;
// (undocumented)
readonly params: Params;
@@ -1159,7 +1162,7 @@ export type RedirectResponseOptions = HttpResponseOptions & {
};
// @public
-export type RequestHandler | Type, Method extends RouteMethod = any> = (context: RequestHandlerContext, request: KibanaRequest, TypeOf, TypeOf, Method>, response: KibanaResponseFactory) => IKibanaResponse | Promise>;
+export type RequestHandler = (context: RequestHandlerContext, request: KibanaRequest, response: KibanaResponseFactory) => IKibanaResponse | Promise>;
// @public
export interface RequestHandlerContext {
@@ -1201,10 +1204,10 @@ export type ResponseHeaders = {
};
// @public
-export interface RouteConfig | Type, Method extends RouteMethod> {
+export interface RouteConfig {
options?: RouteConfigOptions;
path: string;
- validate: RouteSchemas | false;
+ validate: RouteValidatorFullConfig | false;
}
// @public
@@ -1229,16 +1232,54 @@ export type RouteContentType = 'application/json' | 'application/*+json' | 'appl
export type RouteMethod = 'get' | 'post' | 'put' | 'delete' | 'patch' | 'options';
// @public
-export type RouteRegistrar = | Type>(route: RouteConfig, handler: RequestHandler) => void;
+export type RouteRegistrar = (route: RouteConfig, handler: RequestHandler) => void;
// @public
-export interface RouteSchemas | Type> {
- // (undocumented)
- body?: B;
+export class RouteValidationError extends SchemaTypeError {
+ constructor(error: Error | string, path?: string[]);
+}
+
+// @public
+export type RouteValidationFunction = (data: any, validationResult: RouteValidationResultFactory) => {
+ value: T;
+ error?: never;
+} | {
+ value?: never;
+ error: RouteValidationError;
+};
+
+// @public
+export interface RouteValidationResultFactory {
// (undocumented)
- params?: P;
+ badRequest: (error: Error | string, path?: string[]) => {
+ error: RouteValidationError;
+ };
// (undocumented)
- query?: Q;
+ ok: (value: T) => {
+ value: T;
+ };
+}
+
+// @public
+export type RouteValidationSpec = ObjectType | Type | RouteValidationFunction;
+
+// @public
+export interface RouteValidatorConfig {
+ body?: RouteValidationSpec;
+ params?: RouteValidationSpec;
+ query?: RouteValidationSpec;
+}
+
+// @public
+export type RouteValidatorFullConfig = RouteValidatorConfig & RouteValidatorOptions;
+
+// @public
+export interface RouteValidatorOptions {
+ unsafe?: {
+ params?: boolean;
+ query?: boolean;
+ body?: boolean;
+ };
}
// @public (undocumented)
diff --git a/src/core/server/uuid/fs.ts b/src/core/server/uuid/fs.ts
new file mode 100644
index 0000000000000..f10d6370c09d1
--- /dev/null
+++ b/src/core/server/uuid/fs.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Fs from 'fs';
+import { promisify } from 'util';
+
+export const readFile = promisify(Fs.readFile);
+export const writeFile = promisify(Fs.writeFile);
diff --git a/src/core/server/uuid/resolve_uuid.test.ts b/src/core/server/uuid/resolve_uuid.test.ts
index 1ddd667eacdee..d1332daa02057 100644
--- a/src/core/server/uuid/resolve_uuid.test.ts
+++ b/src/core/server/uuid/resolve_uuid.test.ts
@@ -17,31 +17,22 @@
* under the License.
*/
-import { promises } from 'fs';
import { join } from 'path';
+import { readFile, writeFile } from './fs';
import { resolveInstanceUuid } from './resolve_uuid';
import { configServiceMock } from '../config/config_service.mock';
import { loggingServiceMock } from '../logging/logging_service.mock';
import { BehaviorSubject } from 'rxjs';
import { Logger } from '../logging';
-const { readFile, writeFile } = promises;
-
jest.mock('uuid', () => ({
v4: () => 'NEW_UUID',
}));
-jest.mock('fs', () => {
- const actual = jest.requireActual('fs');
- return {
- ...actual,
- promises: {
- ...actual.promises,
- readFile: jest.fn(() => Promise.resolve('')),
- writeFile: jest.fn(() => Promise.resolve('')),
- },
- };
-});
+jest.mock('./fs', () => ({
+ readFile: jest.fn(() => Promise.resolve('')),
+ writeFile: jest.fn(() => Promise.resolve('')),
+}));
const DEFAULT_FILE_UUID = 'FILE_UUID';
const DEFAULT_CONFIG_UUID = 'CONFIG_UUID';
diff --git a/src/core/server/uuid/resolve_uuid.ts b/src/core/server/uuid/resolve_uuid.ts
index 17412bfa0544c..3f5bdc7387392 100644
--- a/src/core/server/uuid/resolve_uuid.ts
+++ b/src/core/server/uuid/resolve_uuid.ts
@@ -18,16 +18,14 @@
*/
import uuid from 'uuid';
-import { promises } from 'fs';
import { join } from 'path';
import { take } from 'rxjs/operators';
+import { readFile, writeFile } from './fs';
import { IConfigService } from '../config';
import { PathConfigType, config as pathConfigDef } from '../path';
import { HttpConfigType, config as httpConfigDef } from '../http';
import { Logger } from '../logging';
-const { readFile, writeFile } = promises;
-
const FILE_ENCODING = 'utf8';
const FILE_NAME = 'uuid';
diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts
index c9ce825f3596e..09881c00c63b6 100644
--- a/src/legacy/core_plugins/data/public/index.ts
+++ b/src/legacy/core_plugins/data/public/index.ts
@@ -30,9 +30,16 @@ export function plugin() {
export { DataStart };
export { Field, FieldType, IFieldList, IndexPattern } from './index_patterns';
-export { SavedQuery, SavedQueryTimeFilter } from '../../../../plugins/data/public';
+export { EsQuerySortValue, FetchOptions, ISearchSource, SortDirection } from './search/types';
+export { SearchSourceFields } from './search/types';
+export {
+ SavedQueryAttributes,
+ SavedQuery,
+ SavedQueryTimeFilter,
+} from '../../../../plugins/data/public';
/** @public static code */
export * from '../common';
export { FilterStateManager } from './filter/filter_manager';
export { getFromSavedObject, getRoutes, flattenHitWrapper } from './index_patterns';
+export { getRequestInspectorStats, getResponseInspectorStats } from './search';
diff --git a/src/legacy/core_plugins/data/public/plugin.ts b/src/legacy/core_plugins/data/public/plugin.ts
index 676904faf6f2f..893e477b38583 100644
--- a/src/legacy/core_plugins/data/public/plugin.ts
+++ b/src/legacy/core_plugins/data/public/plugin.ts
@@ -18,10 +18,16 @@
*/
import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
+import { SearchService, SearchStart } from './search';
import { DataPublicPluginStart } from '../../../../plugins/data/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { setFieldFormats } from '../../../../plugins/data/public/services';
+import {
+ setFieldFormats,
+ setNotifications,
+ setIndexPatterns,
+ setQueryService,
+ // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../plugins/data/public/services';
export interface DataPluginStartDependencies {
data: DataPublicPluginStart;
@@ -32,8 +38,9 @@ export interface DataPluginStartDependencies {
*
* @public
*/
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface DataStart {}
+export interface DataStart {
+ search: SearchStart;
+}
/**
* Data Plugin - public
@@ -48,13 +55,24 @@ export interface DataStart {}
*/
export class DataPlugin implements Plugin {
+ private readonly search = new SearchService();
+
public setup(core: CoreSetup) {}
public start(core: CoreStart, { data }: DataPluginStartDependencies): DataStart {
// This is required for when Angular code uses Field and FieldList.
setFieldFormats(data.fieldFormats);
- return {};
+ setQueryService(data.query);
+ setIndexPatterns(data.indexPatterns);
+ setFieldFormats(data.fieldFormats);
+ setNotifications(core.notifications);
+
+ return {
+ search: this.search.start(core),
+ };
}
- public stop() {}
+ public stop() {
+ this.search.stop();
+ }
}
diff --git a/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts b/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
index c94d35d1f7f2a..4ec4dbd7f88d6 100644
--- a/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
+++ b/src/legacy/core_plugins/data/public/search/expressions/esaggs.ts
@@ -21,43 +21,43 @@ import { get, has } from 'lodash';
import { i18n } from '@kbn/i18n';
import { AggConfigs } from 'ui/agg_types/agg_configs';
import { createFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
-import chrome from 'ui/chrome';
-import { Query, TimeRange, esFilters } from 'src/plugins/data/public';
import {
KibanaContext,
KibanaDatatable,
ExpressionFunction,
KibanaDatatableColumn,
} from 'src/plugins/expressions/public';
-import { npStart } from 'ui/new_platform';
+import {
+ Query,
+ TimeRange,
+ esFilters,
+ getTime,
+ FilterManager,
+} from '../../../../../../plugins/data/public';
import {
SearchSource,
- SearchSourceContract,
+ ISearchSource,
getRequestInspectorStats,
getResponseInspectorStats,
} from '../../../../../ui/public/courier';
-// @ts-ignore
-import {
- FilterBarQueryFilterProvider,
- QueryFilter,
-} from '../../../../../ui/public/filter_manager/query_filter';
import { buildTabularInspectorData } from '../../../../../ui/public/inspector/build_tabular_inspector_data';
import { calculateObjectHash } from '../../../../visualizations/public';
-import { getTime } from '../../../../../ui/public/timefilter';
// @ts-ignore
import { tabifyAggResponse } from '../../../../../ui/public/agg_response/tabify/tabify';
import { PersistedState } from '../../../../../ui/public/persisted_state';
import { Adapters } from '../../../../../../plugins/inspector/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getQueryService, getIndexPatterns } from '../../../../../../plugins/data/public/services';
export interface RequestHandlerParams {
- searchSource: SearchSourceContract;
+ searchSource: ISearchSource;
aggs: AggConfigs;
timeRange?: TimeRange;
query?: Query;
filters?: esFilters.Filter[];
forceFetch: boolean;
- queryFilter: QueryFilter;
+ filterManager: FilterManager;
uiState?: PersistedState;
partialRows?: boolean;
inspectorAdapters: Adapters;
@@ -90,7 +90,7 @@ const handleCourierRequest = async ({
partialRows,
metricsAtAllLevels,
inspectorAdapters,
- queryFilter,
+ filterManager,
abortSignal,
}: RequestHandlerParams) => {
// Create a new search source that inherits the original search source
@@ -216,7 +216,7 @@ const handleCourierRequest = async ({
}
inspectorAdapters.data.setTabularLoader(
- () => buildTabularInspectorData((searchSource as any).tabifiedResponse, queryFilter),
+ () => buildTabularInspectorData((searchSource as any).tabifiedResponse, filterManager),
{ returnsFormattedValues: true }
);
@@ -259,10 +259,8 @@ export const esaggs = (): ExpressionFunction
diff --git a/src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
rename to src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
diff --git a/src/legacy/ui/public/courier/fetch/components/_shard_failure_modal.scss b/src/legacy/core_plugins/data/public/search/fetch/components/_shard_failure_modal.scss
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/_shard_failure_modal.scss
rename to src/legacy/core_plugins/data/public/search/fetch/components/_shard_failure_modal.scss
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_description.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_description.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_description.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx
similarity index 96%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_description.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx
index 6028a50cf9c3e..60e0e35a0f152 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_description.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description.tsx
@@ -19,7 +19,7 @@
import React from 'react';
import { EuiCodeBlock, EuiDescriptionList, EuiSpacer } from '@elastic/eui';
import { ShardFailure } from './shard_failure_types';
-import { getFlattenedObject } from '../../../../../../legacy/utils/get_flattened_object';
+import { getFlattenedObject } from '../../../../../../../legacy/utils/get_flattened_object';
import { ShardFailureDescriptionHeader } from './shard_failure_description_header';
/**
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_description_header.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx
similarity index 96%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_description_header.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx
index ea4f33f9e914e..947f33efa242c 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_description_header.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_description_header.tsx
@@ -35,7 +35,7 @@ export function getFailureSummaryText(failure: ShardFailure, failureDetails?: st
const displayDetails =
typeof failureDetails === 'string' ? failureDetails : getFailureSummaryDetailsText(failure);
- return i18n.translate('common.ui.courier.fetch.shardsFailedModal.failureHeader', {
+ return i18n.translate('data.search.searchSource.fetch.shardsFailedModal.failureHeader', {
defaultMessage: '{failureName} at {failureDetails}',
values: { failureName, failureDetails: displayDetails },
description: 'Summary of shard failures, e.g. "IllegalArgumentException at shard 0 node xyz"',
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_modal.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_modal.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_modal.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx
similarity index 85%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_modal.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx
index d028a831a6e39..65cb49c611575 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_modal.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_modal.tsx
@@ -59,15 +59,18 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
const tabs = [
{
id: 'table',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderShardFailures', {
- defaultMessage: 'Shard failures',
- description: 'Name of the tab displaying shard failures',
- }),
+ name: i18n.translate(
+ 'data.search.searchSource.fetch.shardsFailedModal.tabHeaderShardFailures',
+ {
+ defaultMessage: 'Shard failures',
+ description: 'Name of the tab displaying shard failures',
+ }
+ ),
content: ,
},
{
id: 'json-request',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderRequest', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tabHeaderRequest', {
defaultMessage: 'Request',
description: 'Name of the tab displaying the JSON request',
}),
@@ -79,7 +82,7 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
},
{
id: 'json-response',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tabHeaderResponse', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tabHeaderResponse', {
defaultMessage: 'Response',
description: 'Name of the tab displaying the JSON response',
}),
@@ -104,7 +107,7 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
{copy => (
@@ -112,7 +115,7 @@ export function ShardFailureModal({ request, response, title, onClose }: Props)
onClose()} fill data-test-sub="closeShardFailureModal">
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.mocks.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
similarity index 77%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
index b09270881cc05..4dd4d5943fadc 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.mocks.tsx
@@ -16,16 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { setOverlays } from '../../../../../../../plugins/data/public/services';
+import { OverlayStart } from 'kibana/public';
+
export const openModal = jest.fn();
-jest.doMock('ui/new_platform', () => {
- return {
- npStart: {
- core: {
- overlays: {
- openModal,
- },
- },
- },
- };
-});
+setOverlays(({
+ openModal,
+} as unknown) as OverlayStart);
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx
similarity index 84%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx
index b02344ce6dd72..c3ff042083473 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_open_modal_button.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_open_modal_button.tsx
@@ -17,12 +17,12 @@
* under the License.
*/
import React from 'react';
-// @ts-ignore
-import { npStart } from 'ui/new_platform';
import { FormattedMessage } from '@kbn/i18n/react';
import { EuiButton, EuiTextAlign } from '@elastic/eui';
-import { toMountPoint } from '../../../../../../plugins/kibana_react/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getOverlays } from '../../../../../../../plugins/data/public/services';
+import { toMountPoint } from '../../../../../../../plugins/kibana_react/public';
import { ShardFailureModal } from './shard_failure_modal';
import { ResponseWithShardFailure, Request } from './shard_failure_types';
@@ -34,7 +34,7 @@ interface Props {
export function ShardFailureOpenModalButton({ request, response, title }: Props) {
function onClick() {
- const modal = npStart.core.overlays.openModal(
+ const modal = getOverlays().openModal(
toMountPoint(
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_table.test.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.test.tsx
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_table.test.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.test.tsx
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_table.tsx b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx
similarity index 87%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_table.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx
index 54de64e52f745..5d5047631231a 100644
--- a/src/legacy/ui/public/courier/fetch/components/shard_failure_table.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_table.tsx
@@ -44,7 +44,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
render: (item: ListItem) => {
const failureSummeryText = getFailureSummaryText(item);
const collapseLabel = i18n.translate(
- 'common.ui.courier.fetch.shardsFailedModal.tableRowCollapse',
+ 'data.search.searchSource.fetch.shardsFailedModal.tableRowCollapse',
{
defaultMessage: 'Collapse {rowDescription}',
description: 'Collapse a row of a table with failures',
@@ -53,7 +53,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
);
const expandLabel = i18n.translate(
- 'common.ui.courier.fetch.shardsFailedModal.tableRowExpand',
+ 'data.search.searchSource.fetch.shardsFailedModal.tableRowExpand',
{
defaultMessage: 'Expand {rowDescription}',
description: 'Expand a row of a table with failures',
@@ -81,7 +81,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
},
{
field: 'shard',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColShard', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColShard', {
defaultMessage: 'Shard',
}),
sortable: true,
@@ -90,7 +90,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
},
{
field: 'index',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColIndex', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColIndex', {
defaultMessage: 'Index',
}),
sortable: true,
@@ -98,7 +98,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
},
{
field: 'node',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColNode', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColNode', {
defaultMessage: 'Node',
}),
sortable: true,
@@ -106,7 +106,7 @@ export function ShardFailureTable({ failures }: { failures: ShardFailure[] }) {
},
{
field: 'reason.type',
- name: i18n.translate('common.ui.courier.fetch.shardsFailedModal.tableColReason', {
+ name: i18n.translate('data.search.searchSource.fetch.shardsFailedModal.tableColReason', {
defaultMessage: 'Reason',
}),
truncateText: true,
diff --git a/src/legacy/ui/public/courier/fetch/components/shard_failure_types.ts b/src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_types.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/components/shard_failure_types.ts
rename to src/legacy/core_plugins/data/public/search/fetch/components/shard_failure_types.ts
diff --git a/src/legacy/ui/public/courier/fetch/errors.ts b/src/legacy/core_plugins/data/public/search/fetch/errors.ts
similarity index 91%
rename from src/legacy/ui/public/courier/fetch/errors.ts
rename to src/legacy/core_plugins/data/public/search/fetch/errors.ts
index a2ac013915b4b..5f5dc0452df51 100644
--- a/src/legacy/ui/public/courier/fetch/errors.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/errors.ts
@@ -17,9 +17,10 @@
* under the License.
*/
-import { SearchError } from '../../courier';
-import { KbnError } from '../../../../../plugins/kibana_utils/public';
+import { SearchError } from '../search_strategy';
+import { KbnError } from '../../../../../../plugins/kibana_utils/public';
import { SearchResponse } from '../types';
+
/**
* Request Failure - When an entire multi request fails
* @param {Error} err - the Error that came back
diff --git a/src/legacy/ui/public/courier/fetch/fetch_soon.test.ts b/src/legacy/core_plugins/data/public/search/fetch/fetch_soon.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/fetch/fetch_soon.test.ts
rename to src/legacy/core_plugins/data/public/search/fetch/fetch_soon.test.ts
index d96fb536985da..69a343c78b1e1 100644
--- a/src/legacy/ui/public/courier/fetch/fetch_soon.test.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/fetch_soon.test.ts
@@ -19,7 +19,7 @@
import { fetchSoon } from './fetch_soon';
import { callClient } from './call_client';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
import { FetchHandlers, FetchOptions } from './types';
import { SearchRequest, SearchResponse } from '../types';
diff --git a/src/legacy/ui/public/courier/fetch/fetch_soon.ts b/src/legacy/core_plugins/data/public/search/fetch/fetch_soon.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/fetch_soon.ts
rename to src/legacy/core_plugins/data/public/search/fetch/fetch_soon.ts
diff --git a/src/legacy/ui/public/courier/fetch/get_search_params.test.ts b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/fetch/get_search_params.test.ts
rename to src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts
index 76f3105d7f942..f856aa77bf1f8 100644
--- a/src/legacy/ui/public/courier/fetch/get_search_params.test.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.test.ts
@@ -18,7 +18,7 @@
*/
import { getMSearchParams, getSearchParams } from './get_search_params';
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
function getConfigStub(config: any = {}) {
return {
diff --git a/src/legacy/ui/public/courier/fetch/get_search_params.ts b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts
similarity index 97%
rename from src/legacy/ui/public/courier/fetch/get_search_params.ts
rename to src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts
index 9fb8f2c728c6f..de9ec4cb920e8 100644
--- a/src/legacy/ui/public/courier/fetch/get_search_params.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/get_search_params.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
const sessionId = Date.now();
diff --git a/src/legacy/ui/public/courier/fetch/handle_response.test.ts b/src/legacy/core_plugins/data/public/search/fetch/handle_response.test.ts
similarity index 67%
rename from src/legacy/ui/public/courier/fetch/handle_response.test.ts
rename to src/legacy/core_plugins/data/public/search/fetch/handle_response.test.ts
index 0163aca777161..231ebf56993b6 100644
--- a/src/legacy/ui/public/courier/fetch/handle_response.test.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/handle_response.test.ts
@@ -18,15 +18,12 @@
*/
import { handleResponse } from './handle_response';
-import { toastNotifications } from '../../notify/toasts';
-jest.mock('../../notify/toasts', () => {
- return {
- toastNotifications: {
- addWarning: jest.fn(),
- },
- };
-});
+// Temporary disable eslint, will be removed after moving to new platform folder
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { notificationServiceMock } from '../../../../../../core/public/notifications/notifications_service.mock';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { setNotifications } from '../../../../../../plugins/data/public/services';
jest.mock('@kbn/i18n', () => {
return {
@@ -37,8 +34,11 @@ jest.mock('@kbn/i18n', () => {
});
describe('handleResponse', () => {
+ const notifications = notificationServiceMock.createStartContract();
+
beforeEach(() => {
- (toastNotifications.addWarning as jest.Mock).mockReset();
+ setNotifications(notifications);
+ (notifications.toasts.addWarning as jest.Mock).mockReset();
});
test('should notify if timed out', () => {
@@ -48,8 +48,8 @@ describe('handleResponse', () => {
};
const result = handleResponse(request, response);
expect(result).toBe(response);
- expect(toastNotifications.addWarning).toBeCalled();
- expect((toastNotifications.addWarning as jest.Mock).mock.calls[0][0].title).toMatch(
+ expect(notifications.toasts.addWarning).toBeCalled();
+ expect((notifications.toasts.addWarning as jest.Mock).mock.calls[0][0].title).toMatch(
'request timed out'
);
});
@@ -63,8 +63,8 @@ describe('handleResponse', () => {
};
const result = handleResponse(request, response);
expect(result).toBe(response);
- expect(toastNotifications.addWarning).toBeCalled();
- expect((toastNotifications.addWarning as jest.Mock).mock.calls[0][0].title).toMatch(
+ expect(notifications.toasts.addWarning).toBeCalled();
+ expect((notifications.toasts.addWarning as jest.Mock).mock.calls[0][0].title).toMatch(
'shards failed'
);
});
diff --git a/src/legacy/ui/public/courier/fetch/handle_response.tsx b/src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx
similarity index 77%
rename from src/legacy/ui/public/courier/fetch/handle_response.tsx
rename to src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx
index d7f2263268f8c..a08b7d14fd1c3 100644
--- a/src/legacy/ui/public/courier/fetch/handle_response.tsx
+++ b/src/legacy/core_plugins/data/public/search/fetch/handle_response.tsx
@@ -20,23 +20,24 @@
import React from 'react';
import { i18n } from '@kbn/i18n';
import { EuiSpacer } from '@elastic/eui';
-import { toastNotifications } from '../../notify/toasts';
import { ShardFailureOpenModalButton } from './components/shard_failure_open_modal_button';
import { Request, ResponseWithShardFailure } from './components/shard_failure_types';
import { SearchRequest, SearchResponse } from '../types';
-import { toMountPoint } from '../../../../../plugins/kibana_react/public';
+import { toMountPoint } from '../../../../../../plugins/kibana_react/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getNotifications } from '../../../../../../plugins/data/public/services';
export function handleResponse(request: SearchRequest, response: SearchResponse) {
if (response.timed_out) {
- toastNotifications.addWarning({
- title: i18n.translate('common.ui.courier.fetch.requestTimedOutNotificationMessage', {
+ getNotifications().toasts.addWarning({
+ title: i18n.translate('data.search.searchSource.fetch.requestTimedOutNotificationMessage', {
defaultMessage: 'Data might be incomplete because your request timed out',
}),
});
}
if (response._shards && response._shards.failed) {
- const title = i18n.translate('common.ui.courier.fetch.shardsFailedNotificationMessage', {
+ const title = i18n.translate('data.search.searchSource.fetch.shardsFailedNotificationMessage', {
defaultMessage: '{shardsFailed} of {shardsTotal} shards failed',
values: {
shardsFailed: response._shards.failed,
@@ -44,7 +45,7 @@ export function handleResponse(request: SearchRequest, response: SearchResponse)
},
});
const description = i18n.translate(
- 'common.ui.courier.fetch.shardsFailedNotificationDescription',
+ 'data.search.searchSource.fetch.shardsFailedNotificationDescription',
{
defaultMessage: 'The data you are seeing might be incomplete or wrong.',
}
@@ -62,7 +63,7 @@ export function handleResponse(request: SearchRequest, response: SearchResponse)
);
- toastNotifications.addWarning({ title, text });
+ getNotifications().toasts.addWarning({ title, text });
}
return response;
diff --git a/src/legacy/ui/public/courier/fetch/index.ts b/src/legacy/core_plugins/data/public/search/fetch/index.ts
similarity index 100%
rename from src/legacy/ui/public/courier/fetch/index.ts
rename to src/legacy/core_plugins/data/public/search/fetch/index.ts
diff --git a/src/legacy/ui/public/courier/fetch/types.ts b/src/legacy/core_plugins/data/public/search/fetch/types.ts
similarity index 95%
rename from src/legacy/ui/public/courier/fetch/types.ts
rename to src/legacy/core_plugins/data/public/search/fetch/types.ts
index 03bf51ae15d45..0887a1f84c7c8 100644
--- a/src/legacy/ui/public/courier/fetch/types.ts
+++ b/src/legacy/core_plugins/data/public/search/fetch/types.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { IUiSettingsClient } from '../../../../../core/public';
+import { IUiSettingsClient } from '../../../../../../core/public';
import { SearchRequest, SearchResponse } from '../types';
export interface ApiCaller {
diff --git a/src/legacy/core_plugins/data/public/search/index.ts b/src/legacy/core_plugins/data/public/search/index.ts
index 9880b336e76e5..d930a47219514 100644
--- a/src/legacy/core_plugins/data/public/search/index.ts
+++ b/src/legacy/core_plugins/data/public/search/index.ts
@@ -16,3 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+export { SearchService, SearchSetup, SearchStart } from './search_service';
+
+export { getRequestInspectorStats, getResponseInspectorStats } from './utils';
diff --git a/src/legacy/core_plugins/data/public/search/search_service.ts b/src/legacy/core_plugins/data/public/search/search_service.ts
new file mode 100644
index 0000000000000..85701187fb31d
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_service.ts
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Plugin, CoreSetup, CoreStart } from '../../../../../core/public';
+import { SearchSource } from './search_source';
+import { defaultSearchStrategy } from './search_strategy';
+import { SearchStrategyProvider } from './search_strategy/types';
+
+export interface SearchSetup {} // eslint-disable-line @typescript-eslint/no-empty-interface
+
+export interface SearchStart {
+ defaultSearchStrategy: SearchStrategyProvider;
+ SearchSource: typeof SearchSource;
+}
+
+/**
+ * The contract provided here is a new platform shim for ui/courier.
+ *
+ * Once it has been refactored to work with new platform services,
+ * it will move into the existing search service in src/plugins/data/public/search
+ */
+export class SearchService implements Plugin {
+ public setup(core: CoreSetup): SearchSetup {
+ return {};
+ }
+
+ public start(core: CoreStart): SearchStart {
+ return {
+ defaultSearchStrategy,
+ SearchSource,
+ };
+ }
+
+ public stop() {}
+}
diff --git a/src/legacy/ui/public/courier/search_source/filter_docvalue_fields.test.ts b/src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.test.ts
similarity index 100%
rename from src/legacy/ui/public/courier/search_source/filter_docvalue_fields.test.ts
rename to src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.test.ts
diff --git a/src/legacy/ui/public/courier/search_source/filter_docvalue_fields.ts b/src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.ts
similarity index 100%
rename from src/legacy/ui/public/courier/search_source/filter_docvalue_fields.ts
rename to src/legacy/core_plugins/data/public/search/search_source/filter_docvalue_fields.ts
diff --git a/src/legacy/server/sample_data/index.js b/src/legacy/core_plugins/data/public/search/search_source/index.ts
similarity index 93%
rename from src/legacy/server/sample_data/index.js
rename to src/legacy/core_plugins/data/public/search/search_source/index.ts
index 2e24946761f20..72170adc2b129 100644
--- a/src/legacy/server/sample_data/index.js
+++ b/src/legacy/core_plugins/data/public/search/search_source/index.ts
@@ -17,4 +17,4 @@
* under the License.
*/
-export { sampleDataMixin } from './sample_data_mixin';
+export * from './search_source';
diff --git a/src/legacy/core_plugins/data/public/search/search_source/mocks.ts b/src/legacy/core_plugins/data/public/search/search_source/mocks.ts
new file mode 100644
index 0000000000000..fd72158012de6
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_source/mocks.ts
@@ -0,0 +1,59 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"), you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ISearchSource } from './search_source';
+
+export const searchSourceMock: MockedKeys = {
+ setPreferredSearchStrategyId: jest.fn(),
+ setFields: jest.fn().mockReturnThis(),
+ setField: jest.fn().mockReturnThis(),
+ getId: jest.fn(),
+ getFields: jest.fn(),
+ getField: jest.fn(),
+ getOwnField: jest.fn(),
+ create: jest.fn().mockReturnThis(),
+ createCopy: jest.fn().mockReturnThis(),
+ createChild: jest.fn().mockReturnThis(),
+ setParent: jest.fn(),
+ getParent: jest.fn().mockReturnThis(),
+ fetch: jest.fn().mockResolvedValue({}),
+ onRequestStart: jest.fn(),
+ getSearchRequestBody: jest.fn(),
+ destroy: jest.fn(),
+ history: [],
+};
diff --git a/src/legacy/ui/public/courier/search_source/normalize_sort_request.test.ts b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts
similarity index 97%
rename from src/legacy/ui/public/courier/search_source/normalize_sort_request.test.ts
rename to src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts
index d27b01eb5cf7c..22d1d931a9d09 100644
--- a/src/legacy/ui/public/courier/search_source/normalize_sort_request.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.test.ts
@@ -19,7 +19,7 @@
import { normalizeSortRequest } from './normalize_sort_request';
import { SortDirection } from './types';
-import { IndexPattern } from '../../../../core_plugins/data/public/index_patterns';
+import { IIndexPattern } from '../../../../../../plugins/data/public';
jest.mock('ui/new_platform');
@@ -40,7 +40,7 @@ describe('SearchSource#normalizeSortRequest', function() {
};
const indexPattern = {
fields: [scriptedField, murmurScriptedField],
- } as IndexPattern;
+ } as IIndexPattern;
it('should return an array', function() {
const sortable = { someField: SortDirection.desc };
diff --git a/src/legacy/ui/public/courier/search_source/normalize_sort_request.ts b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts
similarity index 93%
rename from src/legacy/ui/public/courier/search_source/normalize_sort_request.ts
rename to src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts
index 0f8fc8076caa0..93834c95514dc 100644
--- a/src/legacy/ui/public/courier/search_source/normalize_sort_request.ts
+++ b/src/legacy/core_plugins/data/public/search/search_source/normalize_sort_request.ts
@@ -17,12 +17,12 @@
* under the License.
*/
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IIndexPattern } from '../../../../../../plugins/data/public';
import { EsQuerySortValue, SortOptions } from './types';
export function normalizeSortRequest(
sortObject: EsQuerySortValue | EsQuerySortValue[],
- indexPattern: IndexPattern | string | undefined,
+ indexPattern: IIndexPattern | string | undefined,
defaultSortOptions: SortOptions = {}
) {
const sortArray: EsQuerySortValue[] = Array.isArray(sortObject) ? sortObject : [sortObject];
@@ -38,7 +38,7 @@ export function normalizeSortRequest(
*/
function normalize(
sortable: EsQuerySortValue,
- indexPattern: IndexPattern | string | undefined,
+ indexPattern: IIndexPattern | string | undefined,
defaultSortOptions: any
) {
const [[sortField, sortOrder]] = Object.entries(sortable);
diff --git a/src/legacy/ui/public/courier/search_source/search_source.test.ts b/src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts
similarity index 98%
rename from src/legacy/ui/public/courier/search_source/search_source.test.ts
rename to src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts
index ddd3717f55e29..28f8dba9a75de 100644
--- a/src/legacy/ui/public/courier/search_source/search_source.test.ts
+++ b/src/legacy/core_plugins/data/public/search/search_source/search_source.test.ts
@@ -18,7 +18,7 @@
*/
import { SearchSource } from '../search_source';
-import { IndexPattern } from '../../../../core_plugins/data/public';
+import { IndexPattern } from '../../../../../../plugins/data/public';
jest.mock('ui/new_platform');
@@ -26,7 +26,7 @@ jest.mock('../fetch', () => ({
fetchSoon: jest.fn().mockResolvedValue({}),
}));
-jest.mock('../../chrome', () => ({
+jest.mock('ui/chrome', () => ({
dangerouslyGetActiveInjector: () => ({
get: jest.fn(),
}),
diff --git a/src/legacy/core_plugins/data/public/search/search_source/search_source.ts b/src/legacy/core_plugins/data/public/search/search_source/search_source.ts
new file mode 100644
index 0000000000000..6efcae4d4b88d
--- /dev/null
+++ b/src/legacy/core_plugins/data/public/search/search_source/search_source.ts
@@ -0,0 +1,410 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @name SearchSource
+ *
+ * @description A promise-based stream of search results that can inherit from other search sources.
+ *
+ * Because filters/queries in Kibana have different levels of persistence and come from different
+ * places, it is important to keep track of where filters come from for when they are saved back to
+ * the savedObject store in the Kibana index. To do this, we create trees of searchSource objects
+ * that can have associated query parameters (index, query, filter, etc) which can also inherit from
+ * other searchSource objects.
+ *
+ * At query time, all of the searchSource objects that have subscribers are "flattened", at which
+ * point the query params from the searchSource are collected while traversing up the inheritance
+ * chain. At each link in the chain a decision about how to merge the query params is made until a
+ * single set of query parameters is created for each active searchSource (a searchSource with
+ * subscribers).
+ *
+ * That set of query parameters is then sent to elasticsearch. This is how the filter hierarchy
+ * works in Kibana.
+ *
+ * Visualize, starting from a new search:
+ *
+ * - the `savedVis.searchSource` is set as the `appSearchSource`.
+ * - The `savedVis.searchSource` would normally inherit from the `appSearchSource`, but now it is
+ * upgraded to inherit from the `rootSearchSource`.
+ * - Any interaction with the visualization will still apply filters to the `appSearchSource`, so
+ * they will be stored directly on the `savedVis.searchSource`.
+ * - Any interaction with the time filter will be written to the `rootSearchSource`, so those
+ * filters will not be saved by the `savedVis`.
+ * - When the `savedVis` is saved to elasticsearch, it takes with it all the filters that are
+ * defined on it directly, but none of the ones that it inherits from other places.
+ *
+ * Visualize, starting from an existing search:
+ *
+ * - The `savedVis` loads the `savedSearch` on which it is built.
+ * - The `savedVis.searchSource` is set to inherit from the `saveSearch.searchSource` and set as
+ * the `appSearchSource`.
+ * - The `savedSearch.searchSource`, is set to inherit from the `rootSearchSource`.
+ * - Then the `savedVis` is written to elasticsearch it will be flattened and only include the
+ * filters created in the visualize application and will reconnect the filters from the
+ * `savedSearch` at runtime to prevent losing the relationship
+ *
+ * Dashboard search sources:
+ *
+ * - Each panel in a dashboard has a search source.
+ * - The `savedDashboard` also has a searchsource, and it is set as the `appSearchSource`.
+ * - Each panel's search source inherits from the `appSearchSource`, meaning that they inherit from
+ * the dashboard search source.
+ * - When a filter is added to the search box, or via a visualization, it is written to the
+ * `appSearchSource`.
+ */
+
+import _ from 'lodash';
+import { npSetup } from 'ui/new_platform';
+import chrome from 'ui/chrome';
+import { normalizeSortRequest } from './normalize_sort_request';
+import { fetchSoon } from '../fetch';
+import { fieldWildcardFilter } from '../../../../../../plugins/kibana_utils/public';
+import { getHighlightRequest, esFilters, esQuery } from '../../../../../../plugins/data/public';
+import { RequestFailure } from '../fetch/errors';
+import { filterDocvalueFields } from './filter_docvalue_fields';
+import { SearchSourceOptions, SearchSourceFields, SearchRequest } from './types';
+import { FetchOptions, ApiCaller } from '../fetch/types';
+
+const esShardTimeout = npSetup.core.injectedMetadata.getInjectedVar('esShardTimeout') as number;
+const config = npSetup.core.uiSettings;
+
+export type ISearchSource = Pick