[7.x] Use savedObjects provided by the platform instead of legacy shim. (#53284)

Author: azasypkin

x-pack/legacy/plugins/encrypted_saved_objects/index.ts

@@ -33,7 +33,6 @@ export const encryptedSavedObjects = (kibana: {
       }
 
       encryptedSavedObjectsPlugin.__legacyCompat.registerLegacyAPI({
-        savedObjects: server.savedObjects,
         auditLogger: new AuditLogger(
           server,
           'encryptedSavedObjects',

x-pack/plugins/encrypted_saved_objects/server/plugin.ts

@@ -9,9 +9,6 @@ import {
   SavedObjectsBaseOptions,
   PluginInitializerContext,
   CoreSetup,
-  SavedObjectsLegacyService,
-  KibanaRequest,
-  LegacyRequest,
 } from 'src/core/server';
 import { first } from 'rxjs/operators';
 import { createConfig$ } from './config';
@@ -37,7 +34,6 @@ export interface PluginStartContract extends SavedObjectsSetup {
  * to function properly.
  */
 export interface LegacyAPI {
-  savedObjects: SavedObjectsLegacyService<KibanaRequest | LegacyRequest>;
   auditLogger: {
     log: (eventType: string, message: string, data?: Record<string, unknown>) => void;
   };
@@ -48,7 +44,7 @@ export interface LegacyAPI {
  */
 export class Plugin {
   private readonly logger: Logger;
-  private savedObjectsSetup?: ReturnType<typeof setupSavedObjects>;
+  private savedObjectsSetup!: SavedObjectsSetup;
 
   private legacyAPI?: LegacyAPI;
   private readonly getLegacyAPI = () => {
@@ -66,7 +62,6 @@ export class Plugin {
     const config = await createConfig$(this.initializerContext)
       .pipe(first())
       .toPromise();
-    const adminClusterClient = await core.elasticsearch.adminClient$.pipe(first()).toPromise();
 
     const service = Object.freeze(
       new EncryptedSavedObjectsService(
@@ -76,19 +71,12 @@ export class Plugin {
       )
     );
 
+    this.savedObjectsSetup = setupSavedObjects({ service, savedObjects: core.savedObjects });
+
     return {
       registerType: (typeRegistration: EncryptedSavedObjectTypeRegistration) =>
         service.registerType(typeRegistration),
-      __legacyCompat: {
-        registerLegacyAPI: (legacyAPI: LegacyAPI) => {
-          this.legacyAPI = legacyAPI;
-          this.savedObjectsSetup = setupSavedObjects({
-            adminClusterClient,
-            service,
-            savedObjects: legacyAPI.savedObjects,
-          });
-        },
-      },
+      __legacyCompat: { registerLegacyAPI: (legacyAPI: LegacyAPI) => (this.legacyAPI = legacyAPI) },
     };
   }
 
@@ -98,10 +86,6 @@ export class Plugin {
     return {
       isEncryptionError: (error: Error) => error instanceof EncryptionError,
       getDecryptedAsInternalUser: (type: string, id: string, options?: SavedObjectsBaseOptions) => {
-        if (!this.savedObjectsSetup) {
-          throw new Error('Legacy SavedObjects API is not registered!');
-        }
-
         return this.savedObjectsSetup.getDecryptedAsInternalUser(type, id, options);
       },
     };

x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts

@@ -5,19 +5,17 @@
  */
 
 import {
-  IClusterClient,
+  CoreSetup,
   SavedObject,
   SavedObjectAttributes,
   SavedObjectsBaseOptions,
 } from 'src/core/server';
-import { LegacyAPI } from '../plugin';
 import { EncryptedSavedObjectsService } from '../crypto';
 import { EncryptedSavedObjectsClientWrapper } from './encrypted_saved_objects_client_wrapper';
 
 interface SetupSavedObjectsParams {
-  adminClusterClient: IClusterClient;
   service: PublicMethodsOf<EncryptedSavedObjectsService>;
-  savedObjects: LegacyAPI['savedObjects'];
+  savedObjects: CoreSetup['savedObjects'];
 }
 
 export interface SavedObjectsSetup {
@@ -29,7 +27,6 @@ export interface SavedObjectsSetup {
 }
 
 export function setupSavedObjects({
-  adminClusterClient,
   service,
   savedObjects,
 }: SetupSavedObjectsParams): SavedObjectsSetup {
@@ -38,16 +35,13 @@ export function setupSavedObjects({
   // priority for this wrapper to allow all other wrappers to set proper `namespace` for the Saved
   // Object (e.g. wrapper registered by the Spaces plugin) before we encrypt attributes since
   // `namespace` is included into AAD.
-  savedObjects.addScopedSavedObjectsClientWrapperFactory(
+  savedObjects.addClientWrapper(
     Number.MAX_SAFE_INTEGER,
     'encryptedSavedObjects',
     ({ client: baseClient }) => new EncryptedSavedObjectsClientWrapper({ baseClient, service })
   );
 
-  const internalRepository = savedObjects.getSavedObjectsRepository(
-    adminClusterClient.callAsInternalUser
-  );
-
+  const internalRepository = savedObjects.createInternalRepository();
   return {
     getDecryptedAsInternalUser: async <T extends SavedObjectAttributes = any>(
       type: string,