From 50ac264ab57d9201720d69f10533ef392be0bf37 Mon Sep 17 00:00:00 2001
From: Mario Rodriguez Molins <mario.rodriguez@elastic.co>
Date: Fri, 13 Dec 2024 17:47:13 +0100
Subject: [PATCH] Do not add as exception fields leaf objects

---
 internal/fields/exception_fields.go |  2 +-
 internal/fields/mappings.go         | 14 +++++++-------
 internal/fields/mappings_test.go    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/internal/fields/exception_fields.go b/internal/fields/exception_fields.go
index e09e0c91c..b28cf8d98 100644
--- a/internal/fields/exception_fields.go
+++ b/internal/fields/exception_fields.go
@@ -38,7 +38,6 @@ func (v *Validator) listExceptionFieldsMapElement(root string, elem common.MapSt
 		default:
 			if skipLeafOfObject(root, name, v.specVersion, v.Schema) {
 				// Till some versions we skip some validations on leaf of objects, check if it is the case.
-				all = append(all, root)
 				break
 			}
 
@@ -124,6 +123,7 @@ func (v *Validator) parseExceptionField(key string, definition FieldDefinition,
 				return v.parseExceptionField(key, definition, val)
 			case definition.Type == "object" && definition.ObjectType == "":
 				// Legacy mapping, ambiguous definition not allowed by recent versions of the spec, ignore it.
+				logger.Warnf("Skip legacy mapping: object field without \"object_type\" parameter: %q", key)
 				return []string{key}
 			}
 
diff --git a/internal/fields/mappings.go b/internal/fields/mappings.go
index 2692eed6b..474a986b7 100644
--- a/internal/fields/mappings.go
+++ b/internal/fields/mappings.go
@@ -451,7 +451,7 @@ func getMappingDefinitionsField(field string, definition map[string]any) (map[st
 	anyValue := definition[field]
 	object, ok := anyValue.(map[string]any)
 	if !ok {
-		return nil, fmt.Errorf("unexpected type found for %s: %T ", field, anyValue)
+		return nil, fmt.Errorf("unexpected type found for %q: %T ", field, anyValue)
 	}
 	return object, nil
 }
@@ -493,22 +493,22 @@ func (v *MappingValidator) compareMappings(path string, preview, actual map[stri
 	}
 
 	if slices.Contains(v.exceptionFields, path) {
-		logger.Warnf("Found exception field, skip its validation: %s", path)
+		logger.Warnf("Found exception field, skip its validation: %q", path)
 		return nil
 	}
 
 	if isObjectFullyDynamic(actual) {
-		logger.Debugf("Dynamic object found but no fields ingested under path: %s.*", path)
+		logger.Debugf("Dynamic object found but no fields ingested under path: \"%s.*\"", path)
 		return nil
 	}
 
 	if isObject(actual) {
 		if isObjectFullyDynamic(preview) {
 			// TODO: Skip for now, it should be required to compare with dynamic templates
-			logger.Debugf("Pending to validate with the dynamic templates defined the path: %s", path)
+			logger.Debugf("Pending to validate with the dynamic templates defined the path: %q", path)
 			return nil
 		} else if !isObject(preview) {
-			errs = append(errs, fmt.Errorf("not found properties in preview mappings for path: %s", path))
+			errs = append(errs, fmt.Errorf("not found properties in preview mappings for path: %q", path))
 			return errs.Unique()
 		}
 		previewProperties, err := getMappingDefinitionsField("properties", preview)
@@ -531,7 +531,7 @@ func (v *MappingValidator) compareMappings(path string, preview, actual map[stri
 	containsMultifield := isMultiFields(actual)
 	if containsMultifield {
 		if !isMultiFields(preview) {
-			errs = append(errs, fmt.Errorf("not found multi_fields in preview mappings for path: %s", path))
+			errs = append(errs, fmt.Errorf("not found multi_fields in preview mappings for path: %q", path))
 			return errs.Unique()
 		}
 		previewFields, err := getMappingDefinitionsField("fields", preview)
@@ -604,7 +604,7 @@ func (v *MappingValidator) validateMappingsNotInPreview(currentPath string, chil
 
 	for fieldPath, object := range flattenFields {
 		if slices.Contains(v.exceptionFields, fieldPath) {
-			logger.Warnf("Found exception field, skip its validation: %s", fieldPath)
+			logger.Warnf("Found exception field, skip its validation: %q", fieldPath)
 			return nil
 		}
 
diff --git a/internal/fields/mappings_test.go b/internal/fields/mappings_test.go
index 39ff17d09..334fc4d6b 100644
--- a/internal/fields/mappings_test.go
+++ b/internal/fields/mappings_test.go
@@ -307,7 +307,7 @@ func TestComparingMappings(t *testing.T) {
 			},
 			schema: []FieldDefinition{},
 			expectedErrors: []string{
-				`not found multi_fields in preview mappings for path: foo`,
+				`not found multi_fields in preview mappings for path: "foo"`,
 			},
 		},
 		{