From 2c7741bba335aa3d91fc073ac88cfebc57263efb Mon Sep 17 00:00:00 2001
From: Sonja Krause-Harder <sonja.krause-harder@elastic.co>
Date: Wed, 29 Apr 2020 15:36:39 +0200
Subject: [PATCH] [EPM] Handle object type fields with properties in mappings
 (#64745)

* Generate correct mapping for object type field with properties

* Add test for fields definition in reverse order
---
 .../elasticsearch/template/template.test.ts   | 50 +++++++++++++++++++
 .../server/services/epm/fields/field.test.ts  | 31 ++++++++++++
 .../server/services/epm/fields/field.ts       | 10 +++-
 3 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.test.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.test.ts
index 1a73c9581a2de..3679c577ee571 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.test.ts
@@ -259,3 +259,53 @@ test('tests processing object field with dynamic set to strict', () => {
   const mappings = generateMappings(processedFields);
   expect(JSON.stringify(mappings)).toEqual(JSON.stringify(objectFieldDynamicStrictMapping));
 });
+
+test('tests processing object field with property', () => {
+  const objectFieldWithPropertyLiteralYml = `
+- name: a
+  type: object
+- name: a.b
+  type: keyword
+  `;
+  const objectFieldWithPropertyMapping = {
+    properties: {
+      a: {
+        properties: {
+          b: {
+            ignore_above: 1024,
+            type: 'keyword',
+          },
+        },
+      },
+    },
+  };
+  const fields: Field[] = safeLoad(objectFieldWithPropertyLiteralYml);
+  const processedFields = processFields(fields);
+  const mappings = generateMappings(processedFields);
+  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(objectFieldWithPropertyMapping));
+});
+
+test('tests processing object field with property, reverse order', () => {
+  const objectFieldWithPropertyReversedLiteralYml = `
+- name: a.b
+  type: keyword
+- name: a
+  type: object
+  `;
+  const objectFieldWithPropertyReversedMapping = {
+    properties: {
+      a: {
+        properties: {
+          b: {
+            ignore_above: 1024,
+            type: 'keyword',
+          },
+        },
+      },
+    },
+  };
+  const fields: Field[] = safeLoad(objectFieldWithPropertyReversedLiteralYml);
+  const processedFields = processFields(fields);
+  const mappings = generateMappings(processedFields);
+  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(objectFieldWithPropertyReversedMapping));
+});
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/fields/field.test.ts b/x-pack/plugins/ingest_manager/server/services/epm/fields/field.test.ts
index e3aef6077dbc3..42989bb1e3ac9 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/fields/field.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/fields/field.test.ts
@@ -179,4 +179,35 @@ describe('processFields', () => {
       JSON.stringify(mixedFieldsExpanded)
     );
   });
+
+  const objectFieldWithProperty = [
+    {
+      name: 'a',
+      type: 'object',
+      dynamic: true,
+    },
+    {
+      name: 'a.b',
+      type: 'keyword',
+    },
+  ];
+
+  const objectFieldWithPropertyExpanded = [
+    {
+      name: 'a',
+      type: 'group',
+      dynamic: true,
+      fields: [
+        {
+          name: 'b',
+          type: 'keyword',
+        },
+      ],
+    },
+  ];
+  test('correctly handles properties of object type fields', () => {
+    expect(JSON.stringify(processFields(objectFieldWithProperty))).toEqual(
+      JSON.stringify(objectFieldWithPropertyExpanded)
+    );
+  });
 });
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/fields/field.ts b/x-pack/plugins/ingest_manager/server/services/epm/fields/field.ts
index 9c9843e0454ab..edf7624d3f0d5 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/fields/field.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/fields/field.ts
@@ -108,7 +108,15 @@ function dedupFields(fields: Fields): Fields {
       return f.name === field.name;
     });
     if (found) {
-      if (found.type === 'group' && field.type === 'group' && found.fields && field.fields) {
+      if (
+        (found.type === 'group' || found.type === 'object') &&
+        field.type === 'group' &&
+        field.fields
+      ) {
+        if (!found.fields) {
+          found.fields = [];
+        }
+        found.type = 'group';
         found.fields = dedupFields(found.fields.concat(field.fields));
       } else {
         // only 'group' fields can be merged in this way