From 7a6b469eb774e29311323607699eceefff6dbcd5 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Fri, 24 Apr 2020 18:41:33 +0100
Subject: [PATCH] [ML] Fixing optional plugin dependency types

---
 .../public/application/contexts/kibana/kibana_context.ts  | 2 +-
 .../filebeat_config_flyout/filebeat_config_flyout.tsx     | 8 +++++---
 x-pack/plugins/ml/public/application/management/index.ts  | 7 +++++--
 .../ml/public/application/util/dependency_cache.ts        | 2 +-
 x-pack/plugins/ml/public/plugin.ts                        | 4 ++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
index 475e44af3669c..c65d872212ad6 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
@@ -15,7 +15,7 @@ import { LicenseManagementUIPluginSetup } from '../../../../../license_managemen
 
 interface StartPlugins {
   data: DataPublicPluginStart;
-  security: SecurityPluginSetup;
+  security?: SecurityPluginSetup;
   licenseManagement?: LicenseManagementUIPluginSetup;
 }
 export type StartServices = CoreStart & StartPlugins;
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config_flyout.tsx b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config_flyout.tsx
index 30fc74acbabf4..32b51c8b7d4ee 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config_flyout.tsx
@@ -55,9 +55,11 @@ export const FilebeatConfigFlyout: FC<Props> = ({
   } = useMlKibana();
 
   useEffect(() => {
-    security.authc.getCurrentUser().then(user => {
-      setUsername(user.username === undefined ? null : user.username);
-    });
+    if (security !== undefined) {
+      security.authc.getCurrentUser().then(user => {
+        setUsername(user.username === undefined ? null : user.username);
+      });
+    }
   }, []);
 
   useEffect(() => {
diff --git a/x-pack/plugins/ml/public/application/management/index.ts b/x-pack/plugins/ml/public/application/management/index.ts
index a6fe9e1d11953..6bc5c9b15074f 100644
--- a/x-pack/plugins/ml/public/application/management/index.ts
+++ b/x-pack/plugins/ml/public/application/management/index.ts
@@ -25,8 +25,11 @@ export function initManagementSection(
 ) {
   const licensing = pluginsSetup.licensing.license$.pipe(take(1));
   licensing.subscribe(license => {
-    if (license.check(PLUGIN_ID, MINIMUM_FULL_LICENSE).state === 'valid') {
-      const management = pluginsSetup.management;
+    const management = pluginsSetup.management;
+    if (
+      management !== undefined &&
+      license.check(PLUGIN_ID, MINIMUM_FULL_LICENSE).state === 'valid'
+    ) {
       const mlSection = management.sections.register({
         id: PLUGIN_ID,
         title: i18n.translate('xpack.ml.management.mlTitle', {
diff --git a/x-pack/plugins/ml/public/application/util/dependency_cache.ts b/x-pack/plugins/ml/public/application/util/dependency_cache.ts
index 934a0a5e9ae3a..f8dd2a37dd589 100644
--- a/x-pack/plugins/ml/public/application/util/dependency_cache.ts
+++ b/x-pack/plugins/ml/public/application/util/dependency_cache.ts
@@ -40,7 +40,7 @@ export interface DependencyCache {
   savedObjectsClient: SavedObjectsClientContract | null;
   application: ApplicationStart | null;
   http: HttpStart | null;
-  security: SecurityPluginSetup | null;
+  security: SecurityPluginSetup | undefined | null;
   i18n: I18nStart | null;
   urlGenerators: SharePluginStart['urlGenerators'] | null;
   mlConfig: MlConfigType | null;
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index b51be4d248683..e3b8441db432e 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -32,9 +32,9 @@ export interface MlStartDependencies {
   share: SharePluginStart;
 }
 export interface MlSetupDependencies {
-  security: SecurityPluginSetup;
+  security?: SecurityPluginSetup;
   licensing: LicensingPluginSetup;
-  management: ManagementSetup;
+  management?: ManagementSetup;
   usageCollection: UsageCollectionSetup;
   licenseManagement?: LicenseManagementUIPluginSetup;
   home: HomePublicPluginSetup;