[Automatic Import] move base-fields into fields folder (elastic#193960)

(cherry picked from commit 0ee92df) # Conflicts: # x-pack/plugins/integration_assistant/server/integration_builder/fields.test.ts
haetamoudi · Sep 25, 2024 · bba5505 · bba5505
1 parent 24bec01
commit bba5505
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/x-pack/plugins/integration_assistant/server/integration_builder/fields.test.ts b/x-pack/plugins/integration_assistant/server/integration_builder/fields.test.ts
@@ -47,13 +47,10 @@ describe('createFieldMapping', () => {
 `;
 
     expect(Utils.createSync).toHaveBeenCalledWith(
-      `${dataStreamPath}/base-fields.yml`,
+      `${dataStreamPath}/fields/base-fields.yml`,
       mockedTemplate
     );
-    expect(Utils.createSync).toHaveBeenCalledWith(
-      `${dataStreamPath}/fields/fields.yml`,
-      expectedFields
-    );
+    expect(Utils.createSync).toHaveBeenCalledWith(`${dataStreamPath}/fields/fields.yml`, expectedFields);
   });
 
   it('Should create fields files even if docs value is empty', async () => {
@@ -63,12 +60,9 @@ describe('createFieldMapping', () => {
 `;
 
     expect(Utils.createSync).toHaveBeenCalledWith(
-      `${dataStreamPath}/base-fields.yml`,
+      `${dataStreamPath}/fields/base-fields.yml`,
       mockedTemplate
     );
-    expect(Utils.createSync).toHaveBeenCalledWith(
-      `${dataStreamPath}/fields/fields.yml`,
-      expectedFields
-    );
+    expect(Utils.createSync).toHaveBeenCalledWith(`${dataStreamPath}/fields/fields.yml`, expectedFields);
   });
 });
diff --git a/x-pack/plugins/integration_assistant/server/integration_builder/fields.ts b/x-pack/plugins/integration_assistant/server/integration_builder/fields.ts
@@ -15,12 +15,13 @@ export function createFieldMapping(
   specificDataStreamDir: string,
   docs: object[]
 ): void {
-  createBaseFields(specificDataStreamDir, packageName, dataStreamName);
-  createCustomFields(specificDataStreamDir, docs);
+  const dataStreamFieldsDir = `${specificDataStreamDir}/fields`;
+  createBaseFields(dataStreamFieldsDir, packageName, dataStreamName);
+  createCustomFields(dataStreamFieldsDir, docs);
 }
 
 function createBaseFields(
-  specificDataStreamDir: string,
+  dataStreamFieldsDir: string,
   packageName: string,
   dataStreamName: string
 ): void {
@@ -30,11 +31,11 @@ function createBaseFields(
     dataset: datasetName,
   });
 
-  createSync(`${specificDataStreamDir}/base-fields.yml`, baseFields);
+  createSync(`${dataStreamFieldsDir}/base-fields.yml`, baseFields);
 }
 
-function createCustomFields(specificDataStreamDir: string, pipelineResults: object[]): void {
+function createCustomFields(dataStreamFieldsDir: string, pipelineResults: object[]): void {
   const mergedResults = mergeSamples(pipelineResults);
   const fieldKeys = generateFields(mergedResults);
-  createSync(`${specificDataStreamDir}/fields/fields.yml`, fieldKeys);
+  createSync(`${dataStreamFieldsDir}/fields.yml`, fieldKeys);
 }