Revert "[Saved Objects] adds support for including hidden types in sa…

…ved objects client (#66879)" This reverts commit dfa22d1.
elastic · May 20, 2020 · 8fc78c9 · 8fc78c9
1 parent dfa22d1
commit 8fc78c9
Show file tree

Hide file tree

Showing 44 changed files with 185 additions and 615 deletions.
diff --git a/.../development/core/server/kibana-plugin-core-server.savedobjectsclientfactory.md b/.../development/core/server/kibana-plugin-core-server.savedobjectsclientfactory.md
@@ -9,8 +9,7 @@ Describes the factory used to create instances of the Saved Objects Client.
 <b>Signature:</b>
 
 ```typescript
-export declare type SavedObjectsClientFactory = ({ request, includedHiddenTypes, }: {
+export declare type SavedObjectsClientFactory = ({ request, }: {
     request: KibanaRequest;
-    includedHiddenTypes?: string[];
 }) => SavedObjectsClientContract;
 ```
diff --git a/...ana-plugin-core-server.savedobjectsclientprovideroptions.includedhiddentypes.md b/...ana-plugin-core-server.savedobjectsclientprovideroptions.includedhiddentypes.md
diff --git a/...ment/core/server/kibana-plugin-core-server.savedobjectsclientprovideroptions.md b/...ment/core/server/kibana-plugin-core-server.savedobjectsclientprovideroptions.md
@@ -17,5 +17,4 @@ export interface SavedObjectsClientProviderOptions
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [excludedWrappers](./kibana-plugin-core-server.savedobjectsclientprovideroptions.excludedwrappers.md) | <code>string[]</code> |  |
-|  [includedHiddenTypes](./kibana-plugin-core-server.savedobjectsclientprovideroptions.includedhiddentypes.md) | <code>string[]</code> |  |
 
diff --git a/...na-plugin-core-server.savedobjectsrepositoryfactory.createinternalrepository.md b/...na-plugin-core-server.savedobjectsrepositoryfactory.createinternalrepository.md
@@ -9,5 +9,5 @@ Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsre
 <b>Signature:</b>
 
 ```typescript
-createInternalRepository: (includedHiddenTypes?: string[]) => ISavedObjectsRepository;
+createInternalRepository: (extraTypes?: string[]) => ISavedObjectsRepository;
 ```
diff --git a/...bana-plugin-core-server.savedobjectsrepositoryfactory.createscopedrepository.md b/...bana-plugin-core-server.savedobjectsrepositoryfactory.createscopedrepository.md
@@ -9,5 +9,5 @@ Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsre
 <b>Signature:</b>
 
 ```typescript
-createScopedRepository: (req: KibanaRequest, includedHiddenTypes?: string[]) => ISavedObjectsRepository;
+createScopedRepository: (req: KibanaRequest, extraTypes?: string[]) => ISavedObjectsRepository;
 ```
diff --git a/...elopment/core/server/kibana-plugin-core-server.savedobjectsrepositoryfactory.md b/...elopment/core/server/kibana-plugin-core-server.savedobjectsrepositoryfactory.md
@@ -16,6 +16,6 @@ export interface SavedObjectsRepositoryFactory
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [createInternalRepository](./kibana-plugin-core-server.savedobjectsrepositoryfactory.createinternalrepository.md) | <code>(includedHiddenTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
-|  [createScopedRepository](./kibana-plugin-core-server.savedobjectsrepositoryfactory.createscopedrepository.md) | <code>(req: KibanaRequest, includedHiddenTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
+|  [createInternalRepository](./kibana-plugin-core-server.savedobjectsrepositoryfactory.createinternalrepository.md) | <code>(extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
+|  [createScopedRepository](./kibana-plugin-core-server.savedobjectsrepositoryfactory.createscopedrepository.md) | <code>(req: KibanaRequest, extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
 
diff --git a/.../kibana-plugin-core-server.savedobjectsservicestart.createinternalrepository.md b/.../kibana-plugin-core-server.savedobjectsservicestart.createinternalrepository.md
@@ -9,5 +9,5 @@ Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsre
 <b>Signature:</b>
 
 ```typescript
-createInternalRepository: (includedHiddenTypes?: string[]) => ISavedObjectsRepository;
+createInternalRepository: (extraTypes?: string[]) => ISavedObjectsRepository;
 ```
diff --git a/...er/kibana-plugin-core-server.savedobjectsservicestart.createscopedrepository.md b/...er/kibana-plugin-core-server.savedobjectsservicestart.createscopedrepository.md
@@ -9,7 +9,7 @@ Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsre
 <b>Signature:</b>
 
 ```typescript
-createScopedRepository: (req: KibanaRequest, includedHiddenTypes?: string[]) => ISavedObjectsRepository;
+createScopedRepository: (req: KibanaRequest, extraTypes?: string[]) => ISavedObjectsRepository;
 ```
 
 ## Remarks

diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicestart.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicestart.md
@@ -16,8 +16,8 @@ export interface SavedObjectsServiceStart
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [createInternalRepository](./kibana-plugin-core-server.savedobjectsservicestart.createinternalrepository.md) | <code>(includedHiddenTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
-|  [createScopedRepository](./kibana-plugin-core-server.savedobjectsservicestart.createscopedrepository.md) | <code>(req: KibanaRequest, includedHiddenTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
+|  [createInternalRepository](./kibana-plugin-core-server.savedobjectsservicestart.createinternalrepository.md) | <code>(extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
+|  [createScopedRepository](./kibana-plugin-core-server.savedobjectsservicestart.createscopedrepository.md) | <code>(req: KibanaRequest, extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
 |  [createSerializer](./kibana-plugin-core-server.savedobjectsservicestart.createserializer.md) | <code>() =&gt; SavedObjectsSerializer</code> | Creates a [serializer](./kibana-plugin-core-server.savedobjectsserializer.md) that is aware of all registered types. |
 |  [getScopedClient](./kibana-plugin-core-server.savedobjectsservicestart.getscopedclient.md) | <code>(req: KibanaRequest, options?: SavedObjectsClientProviderOptions) =&gt; SavedObjectsClientContract</code> | Creates a [Saved Objects client](./kibana-plugin-core-server.savedobjectsclientcontract.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. If other plugins have registered Saved Objects client wrappers, these will be applied to extend the functionality of the client.<!-- -->A client that is already scoped to the incoming request is also exposed from the route handler context see [RequestHandlerContext](./kibana-plugin-core-server.requesthandlercontext.md)<!-- -->. |
 |  [getTypeRegistry](./kibana-plugin-core-server.savedobjectsservicestart.gettyperegistry.md) | <code>() =&gt; ISavedObjectTypeRegistry</code> | Returns the [registry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) containing all registered [saved object types](./kibana-plugin-core-server.savedobjectstype.md) |

diff --git a/src/core/server/saved_objects/saved_objects_service.test.ts b/src/core/server/saved_objects/saved_objects_service.test.ts
@@ -35,10 +35,6 @@ import { legacyServiceMock } from '../legacy/legacy_service.mock';
 import { httpServiceMock } from '../http/http_service.mock';
 import { SavedObjectsClientFactoryProvider } from './service/lib';
 import { NodesVersionCompatibility } from '../elasticsearch/version_check/ensure_es_version';
-import { SavedObjectsRepository } from './service/lib/repository';
-import { KibanaRequest } from '../http';
-
-jest.mock('./service/lib/repository');
 
 describe('SavedObjectsService', () => {
   const createCoreContext = ({
@@ -273,86 +269,5 @@ describe('SavedObjectsService', () => {
         expect(getTypeRegistry()).toBe(typeRegistryInstanceMock);
       });
     });
-
-    describe('#createScopedRepository', () => {
-      it('creates a respository scoped to the user', async () => {
-        const coreContext = createCoreContext({ skipMigration: false });
-        const soService = new SavedObjectsService(coreContext);
-        const coreSetup = createSetupDeps();
-        await soService.setup(coreSetup);
-        const { createScopedRepository } = await soService.start({});
-
-        const req = {} as KibanaRequest;
-        createScopedRepository(req);
-
-        expect(coreSetup.elasticsearch.adminClient.asScoped).toHaveBeenCalledWith(req);
-
-        const [
-          {
-            value: { callAsCurrentUser },
-          },
-        ] = coreSetup.elasticsearch.adminClient.asScoped.mock.results;
-
-        const [
-          [, , , callCluster, includedHiddenTypes],
-        ] = (SavedObjectsRepository.createRepository as jest.Mocked<any>).mock.calls;
-
-        expect(callCluster).toBe(callAsCurrentUser);
-        expect(includedHiddenTypes).toEqual([]);
-      });
-
-      it('creates a respository including hidden types when specified', async () => {
-        const coreContext = createCoreContext({ skipMigration: false });
-        const soService = new SavedObjectsService(coreContext);
-        const coreSetup = createSetupDeps();
-        await soService.setup(coreSetup);
-        const { createScopedRepository } = await soService.start({});
-
-        const req = {} as KibanaRequest;
-        createScopedRepository(req, ['someHiddenType']);
-
-        const [
-          [, , , , includedHiddenTypes],
-        ] = (SavedObjectsRepository.createRepository as jest.Mocked<any>).mock.calls;
-
-        expect(includedHiddenTypes).toEqual(['someHiddenType']);
-      });
-    });
-
-    describe('#createInternalRepository', () => {
-      it('creates a respository using the admin user', async () => {
-        const coreContext = createCoreContext({ skipMigration: false });
-        const soService = new SavedObjectsService(coreContext);
-        const coreSetup = createSetupDeps();
-        await soService.setup(coreSetup);
-        const { createInternalRepository } = await soService.start({});
-
-        createInternalRepository();
-
-        const [
-          [, , , callCluster, includedHiddenTypes],
-        ] = (SavedObjectsRepository.createRepository as jest.Mocked<any>).mock.calls;
-
-        expect(coreSetup.elasticsearch.adminClient.callAsInternalUser).toBe(callCluster);
-        expect(callCluster).toBe(coreSetup.elasticsearch.adminClient.callAsInternalUser);
-        expect(includedHiddenTypes).toEqual([]);
-      });
-
-      it('creates a respository including hidden types when specified', async () => {
-        const coreContext = createCoreContext({ skipMigration: false });
-        const soService = new SavedObjectsService(coreContext);
-        const coreSetup = createSetupDeps();
-        await soService.setup(coreSetup);
-        const { createInternalRepository } = await soService.start({});
-
-        createInternalRepository(['someHiddenType']);
-
-        const [
-          [, , , , includedHiddenTypes],
-        ] = (SavedObjectsRepository.createRepository as jest.Mocked<any>).mock.calls;
-
-        expect(includedHiddenTypes).toEqual(['someHiddenType']);
-      });
-    });
   });
 });
diff --git a/src/core/server/saved_objects/saved_objects_service.ts b/src/core/server/saved_objects/saved_objects_service.ts
@@ -198,23 +198,20 @@ export interface SavedObjectsServiceStart {
    * Elasticsearch.
    *
    * @param req - The request to create the scoped repository from.
-   * @param includedHiddenTypes - A list of additional hidden types the repository should have access to.
+   * @param extraTypes - A list of additional hidden types the repository should have access to.
    *
    * @remarks
    * Prefer using `getScopedClient`. This should only be used when using methods
    * not exposed on {@link SavedObjectsClientContract}
    */
-  createScopedRepository: (
-    req: KibanaRequest,
-    includedHiddenTypes?: string[]
-  ) => ISavedObjectsRepository;
+  createScopedRepository: (req: KibanaRequest, extraTypes?: string[]) => ISavedObjectsRepository;
   /**
    * Creates a {@link ISavedObjectsRepository | Saved Objects repository} that
    * uses the internal Kibana user for authenticating with Elasticsearch.
    *
-   * @param includedHiddenTypes - A list of additional hidden types the repository should have access to.
+   * @param extraTypes - A list of additional hidden types the repository should have access to.
    */
-  createInternalRepository: (includedHiddenTypes?: string[]) => ISavedObjectsRepository;
+  createInternalRepository: (extraTypes?: string[]) => ISavedObjectsRepository;
   /**
    * Creates a {@link SavedObjectsSerializer | serializer} that is aware of all registered types.
    */
@@ -249,19 +246,16 @@ export interface SavedObjectsRepositoryFactory {
    * uses the credentials from the passed in request to authenticate with
    * Elasticsearch.
    *
-   * @param includedHiddenTypes - A list of additional hidden types the repository should have access to.
+   * @param extraTypes - A list of additional hidden types the repository should have access to.
    */
-  createScopedRepository: (
-    req: KibanaRequest,
-    includedHiddenTypes?: string[]
-  ) => ISavedObjectsRepository;
+  createScopedRepository: (req: KibanaRequest, extraTypes?: string[]) => ISavedObjectsRepository;
   /**
    * Creates a {@link ISavedObjectsRepository | Saved Objects repository} that
    * uses the internal Kibana user for authenticating with Elasticsearch.
    *
-   * @param includedHiddenTypes - A list of additional hidden types the repository should have access to.
+   * @param extraTypes - A list of additional hidden types the repository should have access to.
    */
-  createInternalRepository: (includedHiddenTypes?: string[]) => ISavedObjectsRepository;
+  createInternalRepository: (extraTypes?: string[]) => ISavedObjectsRepository;
 }
 
 /** @internal */
@@ -423,26 +417,26 @@ export class SavedObjectsService
       await migrator.runMigrations();
     }
 
-    const createRepository = (callCluster: APICaller, includedHiddenTypes: string[] = []) => {
+    const createRepository = (callCluster: APICaller, extraTypes: string[] = []) => {
       return SavedObjectsRepository.createRepository(
         migrator,
         this.typeRegistry,
         kibanaConfig.index,
         callCluster,
-        includedHiddenTypes
+        extraTypes
       );
     };
 
     const repositoryFactory: SavedObjectsRepositoryFactory = {
-      createInternalRepository: (includedHiddenTypes?: string[]) =>
-        createRepository(adminClient.callAsInternalUser, includedHiddenTypes),
-      createScopedRepository: (req: KibanaRequest, includedHiddenTypes?: string[]) =>
-        createRepository(adminClient.asScoped(req).callAsCurrentUser, includedHiddenTypes),
+      createInternalRepository: (extraTypes?: string[]) =>
+        createRepository(adminClient.callAsInternalUser, extraTypes),
+      createScopedRepository: (req: KibanaRequest, extraTypes?: string[]) =>
+        createRepository(adminClient.asScoped(req).callAsCurrentUser, extraTypes),
     };
 
     const clientProvider = new SavedObjectsClientProvider({
-      defaultClientFactory({ request, includedHiddenTypes }) {
-        const repository = repositoryFactory.createScopedRepository(request, includedHiddenTypes);
+      defaultClientFactory({ request }) {
+        const repository = repositoryFactory.createScopedRepository(request);
         return new SavedObjectsClient(repository);
       },
       typeRegistry: this.typeRegistry,

diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
@@ -132,22 +132,22 @@ export class SavedObjectsRepository {
     typeRegistry: SavedObjectTypeRegistry,
     indexName: string,
     callCluster: APICaller,
-    includedHiddenTypes: string[] = [],
+    extraTypes: string[] = [],
     injectedConstructor: any = SavedObjectsRepository
   ): ISavedObjectsRepository {
     const mappings = migrator.getActiveMappings();
     const allTypes = Object.keys(getRootPropertiesObjects(mappings));
     const serializer = new SavedObjectsSerializer(typeRegistry);
     const visibleTypes = allTypes.filter(type => !typeRegistry.isHidden(type));
 
-    const missingTypeMappings = includedHiddenTypes.filter(type => !allTypes.includes(type));
+    const missingTypeMappings = extraTypes.filter(type => !allTypes.includes(type));
     if (missingTypeMappings.length > 0) {
       throw new Error(
         `Missing mappings for saved objects types: '${missingTypeMappings.join(', ')}'`
       );
     }
 
-    const allowedTypes = [...new Set(visibleTypes.concat(includedHiddenTypes))];
+    const allowedTypes = [...new Set(visibleTypes.concat(extraTypes))];
 
     return new injectedConstructor({
       index: indexName,

diff --git a/src/core/server/saved_objects/service/lib/scoped_client_provider.test.js b/src/core/server/saved_objects/service/lib/scoped_client_provider.test.js
@@ -167,23 +167,3 @@ test(`allows all wrappers to be excluded`, () => {
   expect(firstClientWrapperFactoryMock).not.toHaveBeenCalled();
   expect(secondClientWrapperFactoryMock).not.toHaveBeenCalled();
 });
-
-test(`allows hidden typed to be included`, () => {
-  const defaultClient = Symbol();
-  const defaultClientFactoryMock = jest.fn().mockReturnValue(defaultClient);
-  const clientProvider = new SavedObjectsClientProvider({
-    defaultClientFactory: defaultClientFactoryMock,
-    typeRegistry: typeRegistryMock.create(),
-  });
-  const request = Symbol();
-
-  const actualClient = clientProvider.getClient(request, {
-    includedHiddenTypes: ['task'],
-  });
-
-  expect(actualClient).toBe(defaultClient);
-  expect(defaultClientFactoryMock).toHaveBeenCalledWith({
-    request,
-    includedHiddenTypes: ['task'],
-  });
-});
diff --git a/src/core/server/saved_objects/service/lib/scoped_client_provider.ts b/src/core/server/saved_objects/service/lib/scoped_client_provider.ts
@@ -46,10 +46,8 @@ export type SavedObjectsClientWrapperFactory = (
  */
 export type SavedObjectsClientFactory = ({
   request,
-  includedHiddenTypes,
 }: {
   request: KibanaRequest;
-  includedHiddenTypes?: string[];
 }) => SavedObjectsClientContract;
 
 /**
@@ -66,7 +64,6 @@ export type SavedObjectsClientFactoryProvider = (
  */
 export interface SavedObjectsClientProviderOptions {
   excludedWrappers?: string[];
-  includedHiddenTypes?: string[];
 }
 
 /**
@@ -124,13 +121,14 @@ export class SavedObjectsClientProvider {
 
   getClient(
     request: KibanaRequest,
-    { includedHiddenTypes, excludedWrappers = [] }: SavedObjectsClientProviderOptions = {}
+    options: SavedObjectsClientProviderOptions = {}
   ): SavedObjectsClientContract {
     const client = this._clientFactory({
       request,
-      includedHiddenTypes,
     });
 
+    const excludedWrappers = options.excludedWrappers || [];
+
     return this._wrapperFactories
       .toPrioritizedArray()
       .reduceRight((clientToWrap, { id, factory }) => {