From a45dae4edbdb2043c8039fb3becd183d8f6d10be Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Mon, 25 Nov 2019 13:24:50 -0500
Subject: [PATCH] Move validate to appropriate level of route definition object
 for monitor details endpoint.

---
 .../rest_api/monitors/monitors_details.ts     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
index 1440b55c1c13786..00860248ff1538c 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
@@ -3,23 +3,27 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import Joi from 'joi';
+
+import { schema } from '@kbn/config-schema';
 import { UMServerLibs } from '../../lib/lib';
-import { MonitorDetails } from '../../../common/runtime_types/monitor/monitor_details';
+import { UMRestApiRouteCreator } from '../types';
 
-export const createGetMonitorDetailsRoute = (libs: UMServerLibs) => ({
+export const createGetMonitorDetailsRoute: UMRestApiRouteCreator = (libs: UMServerLibs) => ({
   method: 'GET',
   path: '/api/uptime/monitor/details',
+  validate: {
+    query: schema.object({
+      monitorId: schema.maybe(schema.string()),
+    }),
+  },
   options: {
-    validate: {
-      query: Joi.object({
-        monitorId: Joi.string(),
-      }),
-    },
     tags: ['access:uptime'],
   },
-  handler: async (request: any): Promise<MonitorDetails> => {
+  handler: async (_context, request, response): Promise<any> => {
     const { monitorId } = request.query;
-    return await libs.monitors.getMonitorDetails(request, monitorId);
+
+    return response.ok({
+      body: { ...(await libs.monitors.getMonitorDetails(request, monitorId)) },
+    });
   },
 });