update mlClient type and assert mlClient is not null

elastic · Dec 28, 2019 · 3c173a0 · 3c173a0
1 parent 9e3c8c4
commit 3c173a0
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 18 deletions.
diff --git a/x-pack/legacy/plugins/ml/server/new_platform/plugin.ts b/x-pack/legacy/plugins/ml/server/new_platform/plugin.ts
@@ -8,7 +8,13 @@ import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
 import { ServerRoute } from 'hapi';
 import { KibanaConfig, SavedObjectsLegacyService } from 'src/legacy/server/kbn_server';
-import { Logger, PluginInitializerContext, CoreSetup, IRouter } from 'src/core/server';
+import {
+  Logger,
+  PluginInitializerContext,
+  CoreSetup,
+  IRouter,
+  IScopedClusterClient,
+} from 'src/core/server';
 import { ElasticsearchPlugin } from 'src/legacy/core_plugins/elasticsearch';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { ElasticsearchServiceSetup } from 'src/core/server';
@@ -110,7 +116,9 @@ export interface UsageInitialization {
 
 declare module 'kibana/server' {
   interface RequestHandlerContext {
-    ml?: any;
+    ml?: {
+      mlClient: IScopedClusterClient;
+    };
   }
 }
 

diff --git a/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/legacy/plugins/ml/server/routes/data_frame_analytics.ts
@@ -24,7 +24,7 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
     },
     licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
       try {
-        const results = await context.ml.mlClient.callAsCurrentUser('ml.getDataFrameAnalytics');
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.getDataFrameAnalytics');
         return response.ok({
           body: { ...results },
         });
@@ -44,7 +44,7 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
     licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
       try {
         const { analyticsId } = request.params;
-        const results = await context.ml.mlClient.callAsCurrentUser('ml.getDataFrameAnalytics', {
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.getDataFrameAnalytics', {
           analyticsId,
         });
         return response.ok({
@@ -63,7 +63,7 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
     },
     licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
       try {
-        const results = await context.ml.mlClient.callAsCurrentUser(
+        const results = await context.ml!.mlClient.callAsCurrentUser(
           'ml.getDataFrameAnalyticsStats'
         );
         return response.ok({
@@ -85,7 +85,7 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
     licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
       try {
         const { analyticsId } = request.params;
-        const results = await context.ml.mlClient.callAsCurrentUser(
+        const results = await context.ml!.mlClient.callAsCurrentUser(
           'ml.getDataFrameAnalyticsStats',
           {
             analyticsId,
@@ -113,10 +113,13 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
     licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
       try {
         const { analyticsId } = request.params;
-        const results = await context.ml.mlClient.callAsCurrentUser('ml.createDataFrameAnalytics', {
-          body: request.body,
-          analyticsId,
-        });
+        const results = await context.ml!.mlClient.callAsCurrentUser(
+          'ml.createDataFrameAnalytics',
+          {
+            body: request.body,
+            analyticsId,
+          }
+        );
         return response.ok({
           body: { ...results },
         });
@@ -135,7 +138,7 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
     },
     licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
       try {
-        const results = await context.ml.mlClient.callAsCurrentUser(
+        const results = await context.ml!.mlClient.callAsCurrentUser(
           'ml.evaluateDataFrameAnalytics',
           {
             body: request.body,
@@ -159,7 +162,7 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
     },
     licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
       try {
-        const results = await context.ml.mlClient.callAsCurrentUser(
+        const results = await context.ml!.mlClient.callAsCurrentUser(
           'ml.estimateDataFrameAnalyticsMemoryUsage',
           {
             body: request.body,
@@ -186,9 +189,12 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
     licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
       try {
         const { analyticsId } = request.params;
-        const results = await context.ml.mlClient.callAsCurrentUser('ml.deleteDataFrameAnalytics', {
-          analyticsId,
-        });
+        const results = await context.ml!.mlClient.callAsCurrentUser(
+          'ml.deleteDataFrameAnalytics',
+          {
+            analyticsId,
+          }
+        );
         return response.ok({
           body: { ...results },
         });
@@ -210,7 +216,7 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
     licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
       try {
         const { analyticsId } = request.params;
-        const results = await context.ml.mlClient.callAsCurrentUser('ml.startDataFrameAnalytics', {
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.startDataFrameAnalytics', {
           analyticsId,
         });
         return response.ok({
@@ -243,7 +249,7 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
           options.force = request.url.query.force;
         }
 
-        const results = await context.ml.mlClient.callAsCurrentUser(
+        const results = await context.ml!.mlClient.callAsCurrentUser(
           'ml.stopDataFrameAnalytics',
           options
         );
@@ -267,7 +273,7 @@ export function dataFrameAnalyticsRoutes({ xpackMainPlugin, router }: RouteIniti
       try {
         const { analyticsId } = request.params;
         const { getAnalyticsAuditMessages } = analyticsAuditMessagesProvider(
-          context.ml.mlClient.callAsCurrentUser
+          context.ml!.mlClient.callAsCurrentUser
         );
 
         const results = await getAnalyticsAuditMessages(analyticsId);