Correctly type ILM's optional dependencies as optional and guard agai…

…nst their absence.
cjcenizal · Apr 10, 2020 · 24762dd · 24762dd
1 parent 36acb37
commit 24762dd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
@@ -25,8 +25,12 @@ import { defaultColdPhase, defaultWarmPhase, defaultHotPhase } from '../store/de
 
 export let trackUiMetric: (metricType: UiStatsMetricType, eventName: string) => void;
 
-export function init(usageCollection: UsageCollectionSetup): void {
-  trackUiMetric = usageCollection.reportUiStats.bind(usageCollection, UIM_APP_NAME);
+export function init(usageCollection: UsageCollectionSetup | undefined): void {
+  if (usageCollection) {
+    trackUiMetric = usageCollection.reportUiStats.bind(usageCollection, UIM_APP_NAME);
+  } else {
+    trackUiMetric = (metricType, eventName) => {};
+  }
 }
 
 export function getUiMetricsForPhases(phases: any): any {

diff --git a/x-pack/plugins/index_lifecycle_management/public/types.ts b/x-pack/plugins/index_lifecycle_management/public/types.ts
@@ -9,7 +9,7 @@ import { ManagementSetup } from '../../../../src/plugins/management/public';
 import { IndexManagementPluginSetup } from '../../index_management/public';
 
 export interface PluginsDependencies {
-  usageCollection: UsageCollectionSetup;
+  usageCollection?: UsageCollectionSetup;
   management: ManagementSetup;
   indexManagement?: IndexManagementPluginSetup;
 }

diff --git a/x-pack/plugins/index_lifecycle_management/server/plugin.ts b/x-pack/plugins/index_lifecycle_management/server/plugin.ts
@@ -75,7 +75,7 @@ export class IndexLifecycleManagementServerPlugin implements Plugin<void, void,
     });
 
     if (config.ui.enabled) {
-      if (indexManagement.indexDataEnricher) {
+      if (indexManagement && indexManagement.indexDataEnricher) {
         indexManagement.indexDataEnricher.add(indexLifecycleDataEnricher);
       }
     }

diff --git a/x-pack/plugins/index_lifecycle_management/server/types.ts b/x-pack/plugins/index_lifecycle_management/server/types.ts
@@ -14,7 +14,7 @@ import { isEsError } from './lib/is_es_error';
 
 export interface Dependencies {
   licensing: LicensingPluginSetup;
-  indexManagement: IndexManagementPluginSetup;
+  indexManagement?: IndexManagementPluginSetup;
 }
 
 export interface RouteDependencies {