[ML] Fixing optional plugin dependency types

jgowdyelastic · jgowdyelastic · commit 7a6b469eb774 · 2020-04-24T18:41:33.000+01:00
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import { LicenseManagementUIPluginSetup } from '../../../../../license_managemen`
`15`	`15`
`16`	`16`	`interface StartPlugins {`
`17`	`17`	`data: DataPublicPluginStart;`
`18`		`- security: SecurityPluginSetup;`
	`18`	`+ security?: SecurityPluginSetup;`
`19`	`19`	`licenseManagement?: LicenseManagementUIPluginSetup;`
`20`	`20`	`}`
`21`	`21`	`export type StartServices = CoreStart & StartPlugins;`