Adding nested type to switch and more tests

elastic · Apr 29, 2020 · 5301a3f · 5301a3f
1 parent 4dd19a3
commit 5301a3f
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 8 deletions.
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
@@ -367,3 +367,31 @@ test('tests processing nested field with property, nested field first', () => {
   const mappings = generateMappings(processedFields);
   expect(mappings).toEqual(expectedMapping);
 });
+
+test('tests processing nested leaf field with properties', () => {
+  const nestedYaml = `
+  - name: a
+    type: object
+    dynamic: false
+  - name: a.b
+    type: nested
+    enabled: false
+    `;
+  const expectedMapping = {
+    properties: {
+      a: {
+        dynamic: false,
+        properties: {
+          b: {
+            enabled: false,
+            type: 'nested',
+          },
+        },
+      },
+    },
+  };
+  const fields: Field[] = safeLoad(nestedYaml);
+  const processedFields = processFields(fields);
+  const mappings = generateMappings(processedFields);
+  expect(mappings).toEqual(expectedMapping);
+});
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
@@ -77,14 +77,7 @@ export function generateMappings(fields: Field[]): IndexTemplateMappings {
         case 'group-nested':
           fieldProps = generateMappings(field.fields!);
           fieldProps.type = 'nested';
-          attemptAddDynamicAndEnabled(fieldProps, field);
-
-          if (field.hasOwnProperty('include_in_parent')) {
-            fieldProps.include_in_parent = field.include_in_parent;
-          }
-          if (field.hasOwnProperty('include_in_root')) {
-            fieldProps.include_in_root = field.include_in_root;
-          }
+          attemptAddNestedProps(fieldProps, field);
           break;
         case 'integer':
           fieldProps.type = 'long';
@@ -111,6 +104,10 @@ export function generateMappings(fields: Field[]): IndexTemplateMappings {
           fieldProps.type = 'object';
           attemptAddDynamicAndEnabled(fieldProps, field);
           break;
+        case 'nested':
+          fieldProps.type = 'nested';
+          attemptAddNestedProps(fieldProps, field);
+          break;
         case 'array':
           // this assumes array fields were validated in an earlier step
           // adding an array field with no object_type would result in an error
@@ -145,6 +142,17 @@ function attemptAddDynamicAndEnabled(props: Properties, field: Field) {
   }
 }
 
+function attemptAddNestedProps(props: Properties, field: Field) {
+  attemptAddDynamicAndEnabled(props, field);
+
+  if (field.hasOwnProperty('include_in_parent')) {
+    props.include_in_parent = field.include_in_parent;
+  }
+  if (field.hasOwnProperty('include_in_root')) {
+    props.include_in_root = field.include_in_root;
+  }
+}
+
 function generateMultiFields(fields: Fields): MultiFields {
   const multiFields: MultiFields = {};
   if (fields) {