hoist the require statement a little higher

Author: spalger

x-pack/plugins/security_solution/server/search_strategy/index_fields/index.test.ts

@@ -12,10 +12,13 @@ import { mockAuditbeatIndexField, mockFilebeatIndexField, mockPacketbeatIndexFie
 describe('Index Fields', () => {
   describe('formatIndexFields', () => {
     test('Basic functionality', async () => {
+      const { fieldsBeat } = await import('../../utils/beat_schema/fields');
+
       expect(
         sortBy(
           'name',
           await formatIndexFields(
+            fieldsBeat,
             [mockAuditbeatIndexField, mockFilebeatIndexField, mockPacketbeatIndexField],
             ['auditbeat', 'filebeat', 'packetbeat']
           )
@@ -166,7 +169,10 @@ describe('Index Fields', () => {
 
   describe('formatFirstFields', () => {
     test('Basic functionality', async () => {
+      const { fieldsBeat } = await import('../../utils/beat_schema/fields');
+
       const fields = await formatFirstFields(
+        fieldsBeat,
         [mockAuditbeatIndexField, mockFilebeatIndexField, mockPacketbeatIndexField],
         ['auditbeat', 'filebeat', 'packetbeat']
       );

x-pack/plugins/security_solution/server/search_strategy/index_fields/index.ts

@@ -19,6 +19,11 @@ export const securitySolutionIndexFieldsProvider = (): ISearchStrategy<
   IndexFieldsStrategyRequest,
   IndexFieldsStrategyResponse
 > => {
+  // require the fields once we actually need them, rather than ahead of time, and pass
+  // them to createFieldItem to reduce the amount of work done as much as possible
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const beatFields: BeatFields = require('../../utils/beat_schema/fields').fieldsBeat;
+
   return {
     search: async (context, request) => {
       const { elasticsearch } = context.core;
@@ -40,6 +45,7 @@ export const securitySolutionIndexFieldsProvider = (): ISearchStrategy<
 
       if (!request.onlyCheckIfIndicesExist) {
         indexFields = await formatIndexFields(
+          beatFields,
           responsesIndexFields.filter((rif) => rif !== false) as FieldDescriptor[][],
           dedupeIndices
         );
@@ -151,16 +157,12 @@ export const createFieldItem = (
  * @param indexesAlias The index aliases such as filebeat-*
  */
 export const formatFirstFields = async (
+  beatFields: BeatFields,
   responsesIndexFields: FieldDescriptor[][],
   indexesAlias: string[]
 ): Promise<IndexField[]> => {
   return new Promise((resolve) => {
     setTimeout(() => {
-      // require the fields once we actually need them, rather than ahead of time, and pass
-      // them to createFieldItem to reduce the amount of work done as much as possible
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const beatFields: BeatFields = require('../../utils/beat_schema/fields').fieldsBeat;
-
       resolve(
         responsesIndexFields.reduce(
           (accumulator: IndexField[], indexFields: FieldDescriptor[], indexesAliasIdx: number) => {
@@ -229,10 +231,11 @@ export const formatSecondFields = async (fields: IndexField[]): Promise<IndexFie
  * @param indexesAlias The index alias
  */
 export const formatIndexFields = async (
+  beatFields: BeatFields,
   responsesIndexFields: FieldDescriptor[][],
   indexesAlias: string[]
 ): Promise<IndexField[]> => {
-  const fields = await formatFirstFields(responsesIndexFields, indexesAlias);
+  const fields = await formatFirstFields(beatFields, responsesIndexFields, indexesAlias);
   const secondFields = await formatSecondFields(fields);
   return secondFields;
 };