remove elasticsearch package imports from reporting (#107126) (#107297)

* remove elasticsearch package imports from reporting * remove dead code Co-authored-by: Mikhail Shustov <restrry@gmail.com>
elastic · Jul 31, 2021 · 4bae1ff · 4bae1ff
1 parent 17d7976
commit 4bae1ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 26 deletions.
diff --git a/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts b/x-pack/plugins/reporting/server/export_types/csv_searchsource/generate_csv/generate_csv.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { SearchResponse } from 'elasticsearch';
+import type { estypes } from '@elastic/elasticsearch';
 import { IScopedClusterClient, IUiSettingsClient } from 'src/core/server';
 import { IScopedSearchClient } from 'src/plugins/data/server';
 import { Datatable } from 'src/plugins/expressions/server';
@@ -93,7 +93,7 @@ export class CsvGenerator {
     };
     const results = (
       await this.clients.data.search(searchParams, { strategy: ES_SEARCH_STRATEGY }).toPromise()
-    ).rawResponse as SearchResponse<unknown>;
+    ).rawResponse as estypes.SearchResponse<unknown>;
 
     return results;
   }
@@ -107,7 +107,7 @@ export class CsvGenerator {
           scroll_id: scrollId,
         },
       })
-    ).body as SearchResponse<unknown>;
+    ).body;
     return results;
   }
 
@@ -321,13 +321,13 @@ export class CsvGenerator {
         if (this.cancellationToken.isCancelled()) {
           break;
         }
-        let results: SearchResponse<unknown> | undefined;
+        let results: estypes.SearchResponse<unknown> | undefined;
         if (scrollId == null) {
           // open a scroll cursor in Elasticsearch
           results = await this.scan(index, searchSource, scrollSettings);
           scrollId = results?._scroll_id;
           if (results.hits?.total != null) {
-            totalRecords = results.hits.total;
+            totalRecords = results.hits.total as number;
             this.logger.debug(`Total search results: ${totalRecords}`);
           }
         } else {

diff --git a/x-pack/plugins/reporting/server/routes/generation.ts b/x-pack/plugins/reporting/server/routes/generation.ts
@@ -6,7 +6,6 @@
  */
 
 import Boom from '@hapi/boom';
-import { errors as elasticsearchErrors } from 'elasticsearch';
 import { kibanaResponseFactory } from 'src/core/server';
 import { ReportingCore } from '../';
 import { API_BASE_URL } from '../../common/constants';
@@ -17,8 +16,6 @@ import { registerLegacy } from './legacy';
 import { registerGenerateCsvFromSavedObjectImmediate } from './csv_searchsource_immediate';
 import { HandlerFunction } from './types';
 
-const esErrors = elasticsearchErrors as Record<string, any>;
-
 const getDownloadBaseUrl = (reporting: ReportingCore) => {
   const config = reporting.getConfig();
   return config.kbnConfig.get('server', 'basePath') + `${API_BASE_URL}/jobs/download`;
@@ -78,24 +75,6 @@ export function registerJobGenerationRoutes(reporting: ReportingCore, logger: Lo
       });
     }
 
-    if (err instanceof esErrors['401']) {
-      return res.unauthorized({
-        body: `Sorry, you aren't authenticated`,
-      });
-    }
-
-    if (err instanceof esErrors['403']) {
-      return res.forbidden({
-        body: `Sorry, you are not authorized`,
-      });
-    }
-
-    if (err instanceof esErrors['404']) {
-      return res.notFound({
-        body: err.message,
-      });
-    }
-
     // unknown error, can't convert to 4xx
     throw err;
   }