[8.14] [HTTP/OAS] Lazy response schemas (#181622) (#181949)

# Backport This will backport the following commits from `main` to `8.14`: - [[HTTP/OAS] Lazy response schemas (#181622)](#181622)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Jean-Louis Leysens <[email protected]>
elastic · Apr 29, 2024 · 7701e73 · 7701e73
1 parent efe1198
commit 7701e73
Show file tree

Hide file tree

Showing 56 changed files with 713 additions and 248 deletions.
diff --git a/packages/core/apps/core-apps-server-internal/src/core_app.ts b/packages/core/apps/core-apps-server-internal/src/core_app.ts
@@ -192,7 +192,7 @@ export class CoreAppsService {
               body: schema.recordOf(schema.string(), schema.any()),
             },
             response: {
-              '200': { body: schema.object({ ok: schema.boolean() }) },
+              '200': { body: () => schema.object({ ok: schema.boolean() }) },
             },
           },
         },

diff --git a/packages/core/http/core-http-router-server-internal/index.ts b/packages/core/http/core-http-router-server-internal/index.ts
@@ -11,6 +11,7 @@ export {
   versionHandlerResolvers,
   CoreVersionedRouter,
   ALLOWED_PUBLIC_VERSION,
+  unwrapVersionedResponseBodyValidation,
   type VersionedRouterRoute,
   type HandlerResolutionStrategy,
 } from './src/versioned_router';

diff --git a/packages/core/http/core-http-router-server-internal/src/router.test.ts b/packages/core/http/core-http-router-server-internal/src/router.test.ts
@@ -8,9 +8,10 @@
 
 import { Router, type RouterOptions } from './router';
 import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
-import { schema } from '@kbn/config-schema';
+import { isConfigSchema, schema } from '@kbn/config-schema';
 import { createFooValidation } from './router.test.util';
 import { createRequestMock } from '@kbn/hapi-mocks/src/request';
+import type { RouteValidatorRequestAndResponses } from '@kbn/core-http-server';
 
 const mockResponse: any = {
   code: jest.fn().mockImplementation(() => mockResponse),
@@ -32,6 +33,10 @@ const routerOptions: RouterOptions = {
 };
 
 describe('Router', () => {
+  let testValidation: ReturnType<typeof createFooValidation>;
+  beforeEach(() => {
+    testValidation = createFooValidation();
+  });
   afterEach(() => jest.clearAllMocks());
   describe('#getRoutes', () => {
     it('returns expected route metadata', () => {
@@ -81,12 +86,10 @@ describe('Router', () => {
     });
   });
 
-  const { fooValidation, validateBodyFn, validateOutputFn, validateParamsFn, validateQueryFn } =
-    createFooValidation();
-
   it.each([['static' as const], ['lazy' as const]])(
     'runs %s route validations',
     async (staticOrLazy) => {
+      const { fooValidation } = testValidation;
       const router = new Router('', logger, enhanceWithContext, routerOptions);
       router.post(
         {
@@ -104,6 +107,8 @@ describe('Router', () => {
         }),
         mockResponseToolkit
       );
+      const { validateBodyFn, validateParamsFn, validateQueryFn, validateOutputFn } =
+        testValidation;
       expect(validateBodyFn).toHaveBeenCalledTimes(1);
       expect(validateParamsFn).toHaveBeenCalledTimes(1);
       expect(validateQueryFn).toHaveBeenCalledTimes(1);
@@ -113,6 +118,16 @@ describe('Router', () => {
 
   it('constructs lazily provided validations once (idempotency)', async () => {
     const router = new Router('', logger, enhanceWithContext, routerOptions);
+    const { fooValidation } = testValidation;
+
+    const response200 = fooValidation.response[200].body;
+    const lazyResponse200 = jest.fn(() => response200());
+    fooValidation.response[200].body = lazyResponse200;
+
+    const response404 = fooValidation.response[404].body;
+    const lazyResponse404 = jest.fn(() => response404());
+    fooValidation.response[404].body = lazyResponse404;
+
     const lazyValidation = jest.fn(() => fooValidation);
     router.post(
       {
@@ -121,7 +136,7 @@ describe('Router', () => {
       },
       (context, req, res) => res.ok()
     );
-    const [{ handler }] = router.getRoutes();
+    const [{ handler, validationSchemas }] = router.getRoutes();
     for (let i = 0; i < 10; i++) {
       await handler(
         createRequestMock({
@@ -131,8 +146,25 @@ describe('Router', () => {
         }),
         mockResponseToolkit
       );
+
+      expect(
+        isConfigSchema(
+          (
+            validationSchemas as () => RouteValidatorRequestAndResponses<unknown, unknown, unknown>
+          )().response![200].body()
+        )
+      ).toBe(true);
+      expect(
+        isConfigSchema(
+          (
+            validationSchemas as () => RouteValidatorRequestAndResponses<unknown, unknown, unknown>
+          )().response![404].body()
+        )
+      ).toBe(true);
     }
     expect(lazyValidation).toHaveBeenCalledTimes(1);
+    expect(lazyResponse200).toHaveBeenCalledTimes(1);
+    expect(lazyResponse404).toHaveBeenCalledTimes(1);
   });
 
   it('registers pluginId if provided', () => {

diff --git a/packages/core/http/core-http-router-server-internal/src/router.test.util.ts b/packages/core/http/core-http-router-server-internal/src/router.test.util.ts
@@ -33,11 +33,18 @@ export function createFooValidation() {
     },
     response: {
       200: {
-        body: schema.object({
-          foo: schema.number({
-            validate: validateOutputFn,
+        body: () =>
+          schema.object({
+            foo: schema.number({
+              validate: validateOutputFn,
+            }),
+          }),
+      },
+      404: {
+        body: () =>
+          schema.object({
+            error: schema.string(),
           }),
-        }),
       },
     },
   };

diff --git a/packages/core/http/core-http-router-server-internal/src/router.ts b/packages/core/http/core-http-router-server-internal/src/router.ts
@@ -7,7 +7,6 @@
  */
 
 import type { Request, ResponseToolkit } from '@hapi/hapi';
-import { once } from 'lodash';
 import apm from 'elastic-apm-node';
 import { isConfigSchema } from '@kbn/config-schema';
 import type { Logger } from '@kbn/logging';
@@ -35,6 +34,7 @@ import { kibanaResponseFactory } from './response';
 import { HapiResponseAdapter } from './response_adapter';
 import { wrapErrors } from './error_wrapper';
 import { Method } from './versioned_router/types';
+import { prepareRouteConfigValidation } from './util';
 
 export type ContextEnhancer<
   P,
@@ -187,9 +187,7 @@ export class Router<Context extends RequestHandlerContextBase = RequestHandlerCo
         handler: RequestHandler<P, Q, B, Context, Method>,
         internalOptions: { isVersioned: boolean } = { isVersioned: false }
       ) => {
-        if (typeof route.validate === 'function') {
-          route = { ...route, validate: once(route.validate) };
-        }
+        route = prepareRouteConfigValidation(route);
         const routeSchemas = routeSchemasFromRouteConfig(route, method);
 
         this.routes.push({

diff --git a/packages/core/http/core-http-router-server-internal/src/util.test.ts b/packages/core/http/core-http-router-server-internal/src/util.test.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { RouteValidator } from '@kbn/core-http-server';
+import { prepareResponseValidation } from './util';
+
+describe('prepareResponseValidation', () => {
+  it('wraps only expected values in "once"', () => {
+    const validation: RouteValidator<unknown, unknown, unknown> = {
+      request: {},
+      response: {
+        200: {
+          body: jest.fn(() => schema.string()),
+        },
+        404: {
+          body: jest.fn(() => schema.string()),
+        },
+        unsafe: {
+          body: true,
+        },
+      },
+    };
+
+    const prepared = prepareResponseValidation(validation.response!);
+
+    expect(prepared).toEqual({
+      200: { body: expect.any(Function) },
+      404: { body: expect.any(Function) },
+      unsafe: { body: true },
+    });
+
+    [1, 2, 3].forEach(() => prepared[200].body());
+    [1, 2, 3].forEach(() => prepared[404].body());
+
+    expect(validation.response![200].body).toHaveBeenCalledTimes(1);
+    expect(validation.response![404].body).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/packages/core/http/core-http-router-server-internal/src/util.ts b/packages/core/http/core-http-router-server-internal/src/util.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { once } from 'lodash';
+import {
+  isFullValidatorContainer,
+  type RouteConfig,
+  type RouteMethod,
+  type RouteValidator,
+} from '@kbn/core-http-server';
+import type { ObjectType, Type } from '@kbn/config-schema';
+
+function isStatusCode(key: string) {
+  return !isNaN(parseInt(key, 10));
+}
+
+interface ResponseValidation {
+  [statusCode: number]: { body: () => ObjectType | Type<unknown> };
+}
+
+export function prepareResponseValidation(validation: ResponseValidation): ResponseValidation {
+  const responses = Object.entries(validation).map(([key, value]) => {
+    if (isStatusCode(key)) {
+      return [key, { body: once(value.body) }];
+    }
+    return [key, value];
+  });
+
+  return Object.fromEntries(responses);
+}
+
+function prepareValidation<P, Q, B>(validator: RouteValidator<P, Q, B>) {
+  if (isFullValidatorContainer(validator) && validator.response) {
+    return {
+      ...validator,
+      response: prepareResponseValidation(validator.response),
+    };
+  }
+  return validator;
+}
+
+// Integration tested in ./routes.test.ts
+export function prepareRouteConfigValidation<P, Q, B>(
+  config: RouteConfig<P, Q, B, RouteMethod>
+): RouteConfig<P, Q, B, RouteMethod> {
+  // Calculating schema validation can be expensive so when it is provided lazily
+  // we only want to instantiate it once. This also provides idempotency guarantees
+  if (typeof config.validate === 'function') {
+    const validate = config.validate;
+    return {
+      ...config,
+      validate: once(() => prepareValidation(validate())),
+    };
+  } else if (typeof config.validate === 'object' && typeof config.validate !== null) {
+    return {
+      ...config,
+      validate: prepareValidation(config.validate),
+    };
+  }
+  return config;
+}