Remove legacy elasticsearch client usage from the reporting plugin (#…

…95375)
elastic · Apr 15, 2021 · 6db15cd · 6db15cd
1 parent 2fb8b92
commit 6db15cd
Show file tree

Hide file tree

Showing 19 changed files with 638 additions and 645 deletions.
diff --git a/x-pack/plugins/reporting/common/types.ts b/x-pack/plugins/reporting/common/types.ts
@@ -40,8 +40,8 @@ export interface LayoutParams {
 export interface ReportDocumentHead {
   _id: string;
   _index: string;
-  _seq_no: unknown;
-  _primary_term: unknown;
+  _seq_no: number;
+  _primary_term: number;
 }
 
 export interface TaskRunResult {

diff --git a/x-pack/plugins/reporting/server/core.ts b/x-pack/plugins/reporting/server/core.ts
@@ -10,7 +10,6 @@ import * as Rx from 'rxjs';
 import { first, map, take } from 'rxjs/operators';
 import {
   BasePath,
-  ElasticsearchServiceSetup,
   IClusterClient,
   KibanaRequest,
   PluginInitializerContext,
@@ -38,7 +37,6 @@ export interface ReportingInternalSetup {
   basePath: Pick<BasePath, 'set'>;
   router: ReportingPluginRouter;
   features: FeaturesPluginSetup;
-  elasticsearch: ElasticsearchServiceSetup;
   licensing: LicensingPluginSetup;
   security?: SecurityPluginSetup;
   spaces?: SpacesPluginSetup;
@@ -212,11 +210,6 @@ export class ReportingCore {
     return this.pluginSetupDeps;
   }
 
-  // NOTE: Uses the Legacy API
-  public getElasticsearchService() {
-    return this.getPluginSetupDeps().elasticsearch;
-  }
-
   private async getSavedObjectsClient(request: KibanaRequest) {
     const { savedObjects } = await this.getPluginStartDeps();
     return savedObjects.getScopedClient(request) as SavedObjectsClientContract;