address PR review comments

elastic · Jul 14, 2020 · b47704b · b47704b
1 parent 3e53625
commit b47704b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -130,7 +130,7 @@ export class ClusterClientAdapter {
 
   public async queryEventsBySavedObject(
     index: string,
-    namespace: string | undefined, // TODO - add term clause for namespace
+    namespace: string | undefined,
     type: string,
     id: string,
     { page, per_page: perPage, start, end, sort_field, sort_order }: FindOptionsType

diff --git a/x-pack/plugins/event_log/server/es/context.test.ts b/x-pack/plugins/event_log/server/es/context.test.ts
@@ -4,13 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { createEsContext } from './context';
 import { LegacyClusterClient, Logger } from 'src/core/server';
 import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-
-import { createEsContext } from './context';
-jest.mock('../lib/../../../../package.json', () => ({
-  version: '1.2.3',
-}));
+jest.mock('../lib/../../../../package.json', () => ({ version: '1.2.3' }));
 type EsClusterClient = Pick<jest.Mocked<LegacyClusterClient>, 'callAsInternalUser' | 'asScoped'>;
 
 let logger: Logger;

diff --git a/x-pack/plugins/event_log/server/event_log_client.ts b/x-pack/plugins/event_log/server/event_log_client.ts
@@ -90,7 +90,7 @@ export class EventLogClient implements IEventLogClient {
     const findOptions = findOptionsSchema.validate(options ?? {});
 
     const space = await this.spacesService?.getActiveSpace(this.request);
-    const namespace = space?.id === 'default' ? undefined : space?.id;
+    const namespace = space && this.spacesService?.spaceIdToNamespace(space.id);
 
     // verify the user has the required permissions to view this saved object
     await this.savedObjectsClient.get(type, id);

diff --git a/x-pack/plugins/event_log/server/plugin.ts b/x-pack/plugins/event_log/server/plugin.ts
@@ -41,7 +41,7 @@ const ACTIONS = {
 };
 
 interface PluginSetupDeps {
-  spaces: SpacesPluginSetup;
+  spaces?: SpacesPluginSetup;
 }
 
 export class Plugin implements CorePlugin<IEventLogService, IEventLogClientService> {

diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log.ts
@@ -73,7 +73,6 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
           actions: ['execute', 'execute-action', 'new-instance', 'resolved-instance'],
         });
       });
-      // console.log(JSON.stringify(events, null, 4));
 
       // make sure the counts of the # of events per type are as expected
       const executeEvents = getEventsByAction(events, 'execute');