Merge branch 'master' into data/allow-custom-formatting

elastic · Jul 13, 2020 · 54fa2fe · 54fa2fe
2 parents 1b6e9e8 + e1253ed
commit 54fa2fe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/x-pack/plugins/security_solution/kibana.json b/x-pack/plugins/security_solution/kibana.json
@@ -11,7 +11,6 @@
     "embeddable",
     "features",
     "home",
-    "ingestManager",
     "taskManager",
     "inspector",
     "licensing",
@@ -21,6 +20,7 @@
   ],
   "optionalPlugins": [
     "encryptedSavedObjects",
+    "ingestManager",
     "ml",
     "newsfeed",
     "security",
@@ -33,6 +33,7 @@
   "requiredBundles": [
     "kibanaUtils",
     "esUiShared",
-    "kibanaReact"
+    "kibanaReact",
+    "ingestManager"
   ]
 }
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -324,10 +324,12 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
 
   public start(core: CoreStart, plugins: StartPlugins) {
     KibanaServices.init({ ...core, ...plugins, kibanaVersion: this.kibanaVersion });
-    plugins.ingestManager.registerPackageConfigComponent(
-      'endpoint',
-      ConfigureEndpointPackageConfig
-    );
+    if (plugins.ingestManager) {
+      plugins.ingestManager.registerPackageConfigComponent(
+        'endpoint',
+        ConfigureEndpointPackageConfig
+      );
+    }
 
     return {};
   }

diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
@@ -32,7 +32,7 @@ export interface StartPlugins {
   data: DataPublicPluginStart;
   embeddable: EmbeddableStart;
   inspector: InspectorStart;
-  ingestManager: IngestManagerStart;
+  ingestManager?: IngestManagerStart;
   newsfeed?: NewsfeedStart;
   triggers_actions_ui: TriggersActionsStart;
   uiActions: UiActionsStart;

diff --git a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.test.ts b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.test.ts
@@ -8,14 +8,14 @@ import { httpServerMock } from '../../../../../src/core/server/mocks';
 import { EndpointAppContextService } from './endpoint_app_context_services';
 
 describe('test endpoint app context services', () => {
-  // it('should return undefined on getAgentService if dependencies are not enabled', async () => {
-  //   const endpointAppContextService = new EndpointAppContextService();
-  //   expect(endpointAppContextService.getAgentService()).toEqual(undefined);
-  // });
-  // it('should return undefined on getManifestManager if dependencies are not enabled', async () => {
-  //   const endpointAppContextService = new EndpointAppContextService();
-  //   expect(endpointAppContextService.getManifestManager()).toEqual(undefined);
-  // });
+  it('should return undefined on getAgentService if dependencies are not enabled', async () => {
+    const endpointAppContextService = new EndpointAppContextService();
+    expect(endpointAppContextService.getAgentService()).toEqual(undefined);
+  });
+  it('should return undefined on getManifestManager if dependencies are not enabled', async () => {
+    const endpointAppContextService = new EndpointAppContextService();
+    expect(endpointAppContextService.getManifestManager()).toEqual(undefined);
+  });
   it('should throw error on getScopedSavedObjectsClient if start is not called', async () => {
     const endpointAppContextService = new EndpointAppContextService();
     expect(() =>