Keeping functions immutable

elastic · Apr 30, 2020 · 22b4a69 · 22b4a69
1 parent 5301a3f
commit 22b4a69
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 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
@@ -93,7 +93,7 @@ test('tests processing text field with multi fields', () => {
   const fields: Field[] = safeLoad(textWithMultiFieldsLiteralYml);
   const processedFields = processFields(fields);
   const mappings = generateMappings(processedFields);
-  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(textWithMultiFieldsMapping));
+  expect(mappings).toEqual(textWithMultiFieldsMapping);
 });
 
 test('tests processing keyword field with multi fields', () => {
@@ -127,7 +127,7 @@ test('tests processing keyword field with multi fields', () => {
   const fields: Field[] = safeLoad(keywordWithMultiFieldsLiteralYml);
   const processedFields = processFields(fields);
   const mappings = generateMappings(processedFields);
-  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(keywordWithMultiFieldsMapping));
+  expect(mappings).toEqual(keywordWithMultiFieldsMapping);
 });
 
 test('tests processing keyword field with multi fields with analyzed text field', () => {
@@ -159,7 +159,7 @@ test('tests processing keyword field with multi fields with analyzed text field'
   const fields: Field[] = safeLoad(keywordWithAnalyzedMultiFieldsLiteralYml);
   const processedFields = processFields(fields);
   const mappings = generateMappings(processedFields);
-  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(keywordWithAnalyzedMultiFieldsMapping));
+  expect(mappings).toEqual(keywordWithAnalyzedMultiFieldsMapping);
 });
 
 test('tests processing object field with no other attributes', () => {
@@ -177,7 +177,7 @@ test('tests processing object field with no other attributes', () => {
   const fields: Field[] = safeLoad(objectFieldLiteralYml);
   const processedFields = processFields(fields);
   const mappings = generateMappings(processedFields);
-  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(objectFieldMapping));
+  expect(mappings).toEqual(objectFieldMapping);
 });
 
 test('tests processing object field with enabled set to false', () => {
@@ -197,7 +197,7 @@ test('tests processing object field with enabled set to false', () => {
   const fields: Field[] = safeLoad(objectFieldEnabledFalseLiteralYml);
   const processedFields = processFields(fields);
   const mappings = generateMappings(processedFields);
-  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(objectFieldEnabledFalseMapping));
+  expect(mappings).toEqual(objectFieldEnabledFalseMapping);
 });
 
 test('tests processing object field with dynamic set to false', () => {
@@ -217,7 +217,7 @@ test('tests processing object field with dynamic set to false', () => {
   const fields: Field[] = safeLoad(objectFieldDynamicFalseLiteralYml);
   const processedFields = processFields(fields);
   const mappings = generateMappings(processedFields);
-  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(objectFieldDynamicFalseMapping));
+  expect(mappings).toEqual(objectFieldDynamicFalseMapping);
 });
 
 test('tests processing object field with dynamic set to true', () => {
@@ -237,7 +237,7 @@ test('tests processing object field with dynamic set to true', () => {
   const fields: Field[] = safeLoad(objectFieldDynamicTrueLiteralYml);
   const processedFields = processFields(fields);
   const mappings = generateMappings(processedFields);
-  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(objectFieldDynamicTrueMapping));
+  expect(mappings).toEqual(objectFieldDynamicTrueMapping);
 });
 
 test('tests processing object field with dynamic set to strict', () => {
@@ -257,7 +257,7 @@ test('tests processing object field with dynamic set to strict', () => {
   const fields: Field[] = safeLoad(objectFieldDynamicStrictLiteralYml);
   const processedFields = processFields(fields);
   const mappings = generateMappings(processedFields);
-  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(objectFieldDynamicStrictMapping));
+  expect(mappings).toEqual(objectFieldDynamicStrictMapping);
 });
 
 test('tests processing object field with property', () => {
@@ -282,7 +282,7 @@ test('tests processing object field with property', () => {
   const fields: Field[] = safeLoad(objectFieldWithPropertyLiteralYml);
   const processedFields = processFields(fields);
   const mappings = generateMappings(processedFields);
-  expect(JSON.stringify(mappings)).toEqual(JSON.stringify(objectFieldWithPropertyMapping));
+  expect(mappings).toEqual(objectFieldWithPropertyMapping);
 });
 
 test('tests processing object field with property, reverse order', () => {

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
@@ -71,13 +71,14 @@ export function generateMappings(fields: Field[]): IndexTemplateMappings {
 
       switch (type) {
         case 'group':
-          fieldProps = generateMappings(field.fields!);
-          attemptAddDynamicAndEnabled(fieldProps, field);
+          fieldProps = { ...generateMappings(field.fields!), ...generateDynamicAndEnabled(field) };
           break;
         case 'group-nested':
-          fieldProps = generateMappings(field.fields!);
-          fieldProps.type = 'nested';
-          attemptAddNestedProps(fieldProps, field);
+          fieldProps = {
+            ...generateMappings(field.fields!),
+            ...generateNestedProps(field),
+            type: 'nested',
+          };
           break;
         case 'integer':
           fieldProps.type = 'long';
@@ -101,12 +102,10 @@ export function generateMappings(fields: Field[]): IndexTemplateMappings {
           }
           break;
         case 'object':
-          fieldProps.type = 'object';
-          attemptAddDynamicAndEnabled(fieldProps, field);
+          fieldProps = { ...fieldProps, ...generateDynamicAndEnabled(field), type: 'object' };
           break;
         case 'nested':
-          fieldProps.type = 'nested';
-          attemptAddNestedProps(fieldProps, field);
+          fieldProps = { ...fieldProps, ...generateNestedProps(field), type: 'nested' };
           break;
         case 'array':
           // this assumes array fields were validated in an earlier step
@@ -133,24 +132,27 @@ export function generateMappings(fields: Field[]): IndexTemplateMappings {
   return { properties: props };
 }
 
-function attemptAddDynamicAndEnabled(props: Properties, field: Field) {
+function generateDynamicAndEnabled(field: Field) {
+  const props: Properties = {};
   if (field.hasOwnProperty('enabled')) {
     props.enabled = field.enabled;
   }
   if (field.hasOwnProperty('dynamic')) {
     props.dynamic = field.dynamic;
   }
+  return props;
 }
 
-function attemptAddNestedProps(props: Properties, field: Field) {
-  attemptAddDynamicAndEnabled(props, field);
+function generateNestedProps(field: Field) {
+  const props = generateDynamicAndEnabled(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;
   }
+  return props;
 }
 
 function generateMultiFields(fields: Fields): MultiFields {