Remove more throwIfNotOk uses from API calls

These are unneeded as an error response will already throw an error to be handled at the call site.
elastic · Mar 5, 2020 · 797b607 · 797b607
1 parent 15edf2d
commit 797b607
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 77 deletions.
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts b/x-pack/legacy/plugins/siem/public/components/ml/api/anomalies_table_data.ts
@@ -5,7 +5,6 @@
  */
 
 import { Anomalies, InfluencerInput, CriteriaFields } from '../types';
-import { throwIfNotOk } from '../../../hooks/api/api';
 import { KibanaServices } from '../../../lib/kibana';
 
 export interface Body {
@@ -22,17 +21,10 @@ export interface Body {
 }
 
 export const anomaliesTableData = async (body: Body, signal: AbortSignal): Promise<Anomalies> => {
-  const response = await KibanaServices.get().http.fetch<Anomalies>(
-    '/api/ml/results/anomalies_table_data',
-    {
-      method: 'POST',
-      body: JSON.stringify(body),
-      asResponse: true,
-      asSystemRequest: true,
-      signal,
-    }
-  );
-
-  await throwIfNotOk(response.response);
-  return response.body!;
+  return KibanaServices.get().http.fetch<Anomalies>('/api/ml/results/anomalies_table_data', {
+    method: 'POST',
+    body: JSON.stringify(body),
+    asSystemRequest: true,
+    signal,
+  });
 };
diff --git a/x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts b/x-pack/legacy/plugins/siem/public/components/ml/api/get_ml_capabilities.ts
@@ -5,7 +5,6 @@
  */
 
 import { InfluencerInput, MlCapabilities } from '../types';
-import { throwIfNotOk } from '../../../hooks/api/api';
 import { KibanaServices } from '../../../lib/kibana';
 
 export interface Body {
@@ -22,16 +21,9 @@ export interface Body {
 }
 
 export const getMlCapabilities = async (signal: AbortSignal): Promise<MlCapabilities> => {
-  const response = await KibanaServices.get().http.fetch<MlCapabilities>(
-    '/api/ml/ml_capabilities',
-    {
-      method: 'GET',
-      asResponse: true,
-      asSystemRequest: true,
-      signal,
-    }
-  );
-
-  await throwIfNotOk(response.response);
-  return response.body!;
+  return KibanaServices.get().http.fetch<MlCapabilities>('/api/ml/ml_capabilities', {
+    method: 'GET',
+    asSystemRequest: true,
+    signal,
+  });
 };
diff --git a/x-pack/legacy/plugins/siem/public/components/ml_popover/api.tsx b/x-pack/legacy/plugins/siem/public/components/ml_popover/api.tsx
@@ -18,7 +18,6 @@ import {
   StopDatafeedResponse,
 } from './types';
 import { throwIfErrorAttached, throwIfErrorAttachedToSetup } from '../ml/api/throw_if_not_ok';
-import { throwIfNotOk } from '../../hooks/api/api';
 import { KibanaServices } from '../../lib/kibana';
 
 /**
@@ -31,18 +30,14 @@ export const checkRecognizer = async ({
   indexPatternName,
   signal,
 }: CheckRecognizerProps): Promise<RecognizerModule[]> => {
-  const response = await KibanaServices.get().http.fetch<RecognizerModule[]>(
+  return KibanaServices.get().http.fetch<RecognizerModule[]>(
     `/api/ml/modules/recognize/${indexPatternName}`,
     {
       method: 'GET',
-      asResponse: true,
       asSystemRequest: true,
       signal,
     }
   );
-
-  await throwIfNotOk(response.response);
-  return response.body!;
 };
 
 /**
@@ -52,18 +47,11 @@ export const checkRecognizer = async ({
  * @param signal to cancel request
  */
 export const getModules = async ({ moduleId = '', signal }: GetModulesProps): Promise<Module[]> => {
-  const response = await KibanaServices.get().http.fetch<Module[]>(
-    `/api/ml/modules/get_module/${moduleId}`,
-    {
-      method: 'GET',
-      asResponse: true,
-      asSystemRequest: true,
-      signal,
-    }
-  );
-
-  await throwIfNotOk(response.response);
-  return response.body!;
+  return KibanaServices.get().http.fetch<Module[]>(`/api/ml/modules/get_module/${moduleId}`, {
+    method: 'GET',
+    asSystemRequest: true,
+    signal,
+  });
 };
 
 /**
@@ -93,16 +81,12 @@ export const setupMlJob = async ({
         startDatafeed: false,
         useDedicatedIndex: true,
       }),
-      asResponse: true,
       asSystemRequest: true,
     }
   );
 
-  await throwIfNotOk(response.response);
-  const json = response.body!;
-  throwIfErrorAttachedToSetup(json, jobIdErrorFilter);
-
-  return json;
+  throwIfErrorAttachedToSetup(response, jobIdErrorFilter);
+  return response;
 };
 
 /**
@@ -126,16 +110,12 @@ export const startDatafeeds = async ({
         datafeedIds,
         ...(start !== 0 && { start }),
       }),
-      asResponse: true,
       asSystemRequest: true,
     }
   );
 
-  await throwIfNotOk(response.response);
-  const json = response.body!;
-  throwIfErrorAttached(json, datafeedIds);
-
-  return json;
+  throwIfErrorAttached(response, datafeedIds);
+  return response;
 };
 
 /**
@@ -155,14 +135,10 @@ export const stopDatafeeds = async ({
       body: JSON.stringify({
         datafeedIds,
       }),
-      asResponse: true,
       asSystemRequest: true,
     }
   );
 
-  await throwIfNotOk(stopDatafeedsResponse.response);
-  const stopDatafeedsResponseJson = stopDatafeedsResponse.body!;
-
   const datafeedPrefix = 'datafeed-';
   const closeJobsResponse = await KibanaServices.get().http.fetch<CloseJobsResponse>(
     '/api/ml/jobs/close_jobs',
@@ -175,13 +151,11 @@ export const stopDatafeeds = async ({
             : dataFeedId
         ),
       }),
-      asResponse: true,
       asSystemRequest: true,
     }
   );
 
-  await throwIfNotOk(closeJobsResponse.response);
-  return [stopDatafeedsResponseJson, closeJobsResponse.body!];
+  return [stopDatafeedsResponse, closeJobsResponse];
 };
 
 /**
@@ -193,17 +167,10 @@ export const stopDatafeeds = async ({
  * @param signal to cancel request
  */
 export const getJobsSummary = async (signal: AbortSignal): Promise<JobSummary[]> => {
-  const response = await KibanaServices.get().http.fetch<JobSummary[]>(
-    '/api/ml/jobs/jobs_summary',
-    {
-      method: 'POST',
-      body: JSON.stringify({}),
-      asResponse: true,
-      asSystemRequest: true,
-      signal,
-    }
-  );
-
-  await throwIfNotOk(response.response);
-  return response.body!;
+  return KibanaServices.get().http.fetch<JobSummary[]>('/api/ml/jobs/jobs_summary', {
+    method: 'POST',
+    body: JSON.stringify({}),
+    asSystemRequest: true,
+    signal,
+  });
 };