Removing IDX from code not covered by elastic#52354

simianhacker · Dec 9, 2019 · e1f3dc4 · e1f3dc4
1 parent b140259
commit e1f3dc4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/create_timerange_with_interval.ts
@@ -5,7 +5,6 @@
  */
 
 import { uniq } from 'lodash';
-import { idx } from '@kbn/elastic-idx';
 import { RequestHandlerContext } from 'kibana/server';
 import { InfraSnapshotRequestOptions } from './types';
 import { InfraTimerangeInput } from '../../../public/graphql/types';
@@ -45,7 +44,7 @@ const aggregationsToModules = (aggregations: SnapshotModel): string[] => {
     Object.values(aggregations)
       .reduce((modules, agg) => {
         if (SnapshotModelMetricAggRT.is(agg)) {
-          return modules.concat(Object.values(agg).map(a => idx(a, _ => _.field)));
+          return modules.concat(Object.values(agg).map(a => a?.field));
         }
         return modules;
       }, [] as Array<string | undefined>)

diff --git a/x-pack/legacy/plugins/infra/server/lib/snapshot/query_helpers.ts b/x-pack/legacy/plugins/infra/server/lib/snapshot/query_helpers.ts
@@ -5,7 +5,6 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { idx } from '@kbn/elastic-idx';
 import { findInventoryModel, findInventoryFields } from '../../../common/inventory_models/index';
 import { InfraSnapshotRequestOptions } from './types';
 import { getIntervalInSeconds } from '../../utils/get_interval_in_seconds';
@@ -48,7 +47,7 @@ export const getMetricsSources = (options: InfraSnapshotRequestOptions) => {
 
 export const getMetricsAggregations = (options: InfraSnapshotRequestOptions): SnapshotModel => {
   const model = findInventoryModel(options.nodeType);
-  const aggregation = idx(model, _ => _.metrics.snapshot[options.metric.type]);
+  const aggregation = model.metrics.snapshot?.[options.metric.type];
   if (!SnapshotModelRT.is(aggregation)) {
     throw new Error(
       i18n.translate('xpack.infra.snapshot.missingSnapshotMetricError', {