Remove getSavedObjectsRepository, use NP internalRepository

Aaron Caldwell · Aaron Caldwell · commit b462cda6024d · 2020-02-20T07:46:32.000-07:00
diff --git a/x-pack/legacy/plugins/file_upload/index.js b/x-pack/legacy/plugins/file_upload/index.js
@@ -22,19 +22,14 @@ export const fileUpload = kibana => {
 
     init(server) {
       const coreSetup = server.newPlatform.setup.core;
+      const coreStart = server.newPlatform.start.core;
       const { usageCollection } = server.newPlatform.setup.plugins;
-      const pluginsSetup = {
+      const pluginsStart = {
         usageCollection,
       };
-
-      // legacy dependencies
-      const __LEGACY = {
-        savedObjects: {
-          getSavedObjectsRepository: server.savedObjects.getSavedObjectsRepository,
-        },
-      };
-
-      new FileUploadPlugin().setup(coreSetup, pluginsSetup, __LEGACY);
+      const fileUploadPlugin = new FileUploadPlugin();
+      fileUploadPlugin.setup(coreSetup);
+      fileUploadPlugin.start(coreStart, pluginsStart);
     },
   });
 };
diff --git a/x-pack/legacy/plugins/file_upload/server/client/call_with_internal_user_factory.d.ts b/x-pack/legacy/plugins/file_upload/server/client/call_with_internal_user_factory.d.ts
diff --git a/x-pack/legacy/plugins/file_upload/server/client/call_with_internal_user_factory.js b/x-pack/legacy/plugins/file_upload/server/client/call_with_internal_user_factory.js
diff --git a/x-pack/legacy/plugins/file_upload/server/client/call_with_internal_user_factory.test.ts b/x-pack/legacy/plugins/file_upload/server/client/call_with_internal_user_factory.test.ts
diff --git a/x-pack/legacy/plugins/file_upload/server/kibana_server_services.js b/x-pack/legacy/plugins/file_upload/server/kibana_server_services.js
@@ -5,10 +5,14 @@
  */
 
 let dataClient;
-let adminClient;
 
 export const setElasticsearchClientServices = elasticsearch => {
-  ({ dataClient, adminClient } = elasticsearch);
+  ({ dataClient } = elasticsearch);
 };
-export const getAdminClient = () => adminClient;
 export const getDataClient = () => dataClient;
+
+let internalRepository;
+export const setInternalRepository = createInternalRepository => {
+  internalRepository = createInternalRepository();
+};
+export const getInternalRepository = () => internalRepository;
diff --git a/x-pack/legacy/plugins/file_upload/server/plugin.js b/x-pack/legacy/plugins/file_upload/server/plugin.js
@@ -5,19 +5,23 @@
  */
 
 import { initRoutes } from './routes/file_upload';
-import { setElasticsearchClientServices } from './kibana_server_services';
+import { setElasticsearchClientServices, setInternalRepository } from './kibana_server_services';
 import { registerFileUploadUsageCollector } from './telemetry';
 
 export class FileUploadPlugin {
-  setup(core, plugins, __LEGACY) {
-    const getSavedObjectsRepository = __LEGACY.savedObjects.getSavedObjectsRepository;
-    const router = core.http.createRouter();
+  constructor() {
+    this.router = null;
+  }
 
+  setup(core) {
     setElasticsearchClientServices(core.elasticsearch);
-    initRoutes(router, getSavedObjectsRepository);
+    this.router = core.http.createRouter();
+  }
+
+  start(core, plugins) {
+    initRoutes(this.router, core.savedObjects.getSavedObjectsRepository);
+    setInternalRepository(core.savedObjects.createInternalRepository);
 
-    registerFileUploadUsageCollector(plugins.usageCollection, {
-      getSavedObjectsRepository,
-    });
+    registerFileUploadUsageCollector(plugins.usageCollection);
   }
 }
diff --git a/x-pack/legacy/plugins/file_upload/server/routes/file_upload.js b/x-pack/legacy/plugins/file_upload/server/routes/file_upload.js
@@ -75,7 +75,7 @@ export const idConditionalValidation = (body, boolHasId) =>
     )
     .validate(body);
 
-const finishValidationAndProcessReq = getSavedObjectsRepository => {
+const finishValidationAndProcessReq = () => {
   return async (con, req, { ok, badRequest }) => {
     const {
       query: { id },
@@ -103,7 +103,7 @@ const finishValidationAndProcessReq = getSavedObjectsRepository => {
         resp = ok({ body: processedReq });
         // If no id's been established then this is a new index, update telemetry
         if (!boolHasId) {
-          await updateTelemetry({ getSavedObjectsRepository });
+          await updateTelemetry();
         }
       } else {
         resp = badRequest(`Error processing request 1: ${processedReq.error.message}`, ['body']);
@@ -115,7 +115,7 @@ const finishValidationAndProcessReq = getSavedObjectsRepository => {
   };
 };
 
-export const initRoutes = (router, getSavedObjectsRepository) => {
+export const initRoutes = router => {
   router.post(
     {
       path: `${IMPORT_ROUTE}{id?}`,
@@ -125,6 +125,6 @@ export const initRoutes = (router, getSavedObjectsRepository) => {
       },
       options,
     },
-    finishValidationAndProcessReq(getSavedObjectsRepository)
+    finishValidationAndProcessReq()
   );
 };
diff --git a/x-pack/legacy/plugins/file_upload/server/telemetry/file_upload_usage_collector.ts b/x-pack/legacy/plugins/file_upload/server/telemetry/file_upload_usage_collector.ts
@@ -9,17 +9,11 @@ import { getTelemetry, initTelemetry } from './telemetry';
 
 const TELEMETRY_TYPE = 'fileUploadTelemetry';
 
-export function registerFileUploadUsageCollector(
-  usageCollection: UsageCollectionSetup,
-  deps: {
-    getSavedObjectsRepository: any;
-  }
-): void {
-  const { getSavedObjectsRepository } = deps;
+export function registerFileUploadUsageCollector(usageCollection: UsageCollectionSetup): void {
   const fileUploadUsageCollector = usageCollection.makeUsageCollector({
     type: TELEMETRY_TYPE,
     isReady: () => true,
-    fetch: async () => (await getTelemetry(getSavedObjectsRepository)) || initTelemetry(),
+    fetch: async () => (await getTelemetry()) || initTelemetry(),
   });
 
   usageCollection.registerCollector(fileUploadUsageCollector);
diff --git a/x-pack/legacy/plugins/file_upload/server/telemetry/telemetry.ts b/x-pack/legacy/plugins/file_upload/server/telemetry/telemetry.ts
@@ -5,7 +5,8 @@
  */
 
 import _ from 'lodash';
-import { callWithInternalUserFactory } from '../client/call_with_internal_user_factory';
+// @ts-ignore
+import { getInternalRepository } from '../kibana_server_services';
 
 export const TELEMETRY_DOC_ID = 'file-upload-telemetry';
 
@@ -17,22 +18,14 @@ export interface TelemetrySavedObject {
   attributes: Telemetry;
 }
 
-export function getInternalRepository(getSavedObjectsRepository: any): any {
-  const callWithInternalUser = callWithInternalUserFactory();
-  return getSavedObjectsRepository(callWithInternalUser);
-}
-
 export function initTelemetry(): Telemetry {
   return {
     filesUploadedTotalCount: 0,
   };
 }
 
-export async function getTelemetry(
-  getSavedObjectsRepository: any,
-  internalRepo?: object
-): Promise<Telemetry> {
-  const internalRepository = internalRepo || getInternalRepository(getSavedObjectsRepository);
+export async function getTelemetry(internalRepo?: object): Promise<Telemetry> {
+  const internalRepository = internalRepo || getInternalRepository();
   let telemetrySavedObject;
 
   try {
@@ -44,15 +37,9 @@ export async function getTelemetry(
   return telemetrySavedObject ? telemetrySavedObject.attributes : null;
 }
 
-export async function updateTelemetry({
-  getSavedObjectsRepository,
-  internalRepo,
-}: {
-  getSavedObjectsRepository: any;
-  internalRepo?: any;
-}) {
-  const internalRepository = internalRepo || getInternalRepository(getSavedObjectsRepository);
-  let telemetry = await getTelemetry(getSavedObjectsRepository, internalRepository);
+export async function updateTelemetry(internalRepo?: any) {
+  const internalRepository = internalRepo || getInternalRepository();
+  let telemetry = await getTelemetry(internalRepository);
   // Create if doesn't exist
   if (!telemetry || _.isEmpty(telemetry)) {
     const newTelemetrySavedObject = await internalRepository.create(
