Merge branch 'chore/oss-telemetry-banner-notice' of https://github.co…

…m/elastic/kibana into chore/oss-telemetry-banner-notice
elastic · Nov 18, 2019 · 11122a1 · 11122a1
2 parents 37199bb + c8bc021
commit 11122a1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
@@ -156,7 +156,6 @@ export {
   SavedObjectsMigrationLogger,
   SavedObjectsRawDoc,
   SavedObjectsResolveImportErrorsOptions,
-  SavedObjectsRepository,
   SavedObjectsSchema,
   SavedObjectsSerializer,
   SavedObjectsLegacyService,

diff --git a/src/core/server/saved_objects/service/index.ts b/src/core/server/saved_objects/service/index.ts
@@ -18,7 +18,7 @@
  */
 
 import { Readable } from 'stream';
-import { SavedObjectsClientProvider, SavedObjectsRepository } from './lib';
+import { SavedObjectsClientProvider } from './lib';
 import { SavedObjectsClient } from './saved_objects_client';
 import { SavedObjectsExportOptions } from '../export';
 import { SavedObjectsImportOptions, SavedObjectsImportResponse } from '../import';
@@ -39,7 +39,7 @@ export interface SavedObjectsLegacyService<Request = any> {
   SavedObjectsClient: typeof SavedObjectsClient;
   types: string[];
   schema: SavedObjectsSchema;
-  getSavedObjectsRepository(...rest: any[]): SavedObjectsRepository;
+  getSavedObjectsRepository(...rest: any[]): any;
   importExport: {
     objectLimit: number;
     importSavedObjects(options: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;

diff --git a/src/legacy/core_plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts b/src/legacy/core_plugins/telemetry/server/routes/telemetry_user_has_seen_notice.ts
@@ -19,15 +19,15 @@
 
 import { Legacy } from 'kibana';
 import { Request } from 'hapi';
-import { CoreSetup, SavedObjectsRepository } from 'src/core/server';
+import { CoreSetup } from 'src/core/server';
 import {
   TelemetrySavedObject,
   TelemetrySavedObjectAttributes,
   getTelemetrySavedObject,
   updateTelemetrySavedObject,
 } from '../telemetry_repository';
 
-const getInternalRepository = (server: Legacy.Server): SavedObjectsRepository => {
+const getInternalRepository = (server: Legacy.Server) => {
   const { getSavedObjectsRepository } = server.savedObjects;
   const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin');
   const internalRepository = getSavedObjectsRepository(callWithInternalUser);