Apply feedback

Author: jpbetz

merge/update.go

@@ -155,35 +155,6 @@ func (s *Updater) Update(liveObject, newObject *typed.TypedValue, version fieldp
 	return newObject, managers, nil
 }
 
-// reconcileManagedFieldsWithSchemaChanges reconciles the managed fields with any changes to the
-// object's schema since the managed fields were written.
-//
-// Supports:
-// - changing types from atomic to granular
-// - changing types from granular to atomic
-func (s *Updater) reconcileManagedFieldsWithSchemaChanges(liveObject *typed.TypedValue, managers fieldpath.ManagedFields) (fieldpath.ManagedFields, error) {
-	result := fieldpath.ManagedFields{}
-	for manager, versionedSet := range managers {
-		tv, err := s.Converter.Convert(liveObject, versionedSet.APIVersion())
-		if s.Converter.IsMissingVersionError(err) { // okay to skip, obsolete versions will be deleted automatically anyway
-			continue
-		}
-		if err != nil {
-			return nil, err
-		}
-		reconciled, err := typed.ReconcileFieldSetWithSchema(versionedSet.Set(), tv)
-		if err != nil {
-			return nil, err
-		}
-		if reconciled != nil {
-			result[manager] = fieldpath.NewVersionedSet(reconciled, versionedSet.APIVersion(), versionedSet.Applied())
-		} else {
-			result[manager] = versionedSet
-		}
-	}
-	return result, nil
-}
-
 // Apply should be called when Apply is run, given the current object as
 // well as the configuration that is applied. This will merge the object
 // and return it. If the object hasn't changed, nil is returned (the
@@ -327,3 +298,32 @@ func (s *Updater) addBackDanglingItems(merged, pruned *typed.TypedValue, lastSet
 	}
 	return merged.RemoveItems(mergedSet.Difference(prunedSet).Intersection(lastSet.Set())), nil
 }
+
+// reconcileManagedFieldsWithSchemaChanges reconciles the managed fields with any changes to the
+// object's schema since the managed fields were written.
+//
+// Supports:
+// - changing types from atomic to granular
+// - changing types from granular to atomic
+func (s *Updater) reconcileManagedFieldsWithSchemaChanges(liveObject *typed.TypedValue, managers fieldpath.ManagedFields) (fieldpath.ManagedFields, error) {
+	result := fieldpath.ManagedFields{}
+	for manager, versionedSet := range managers {
+		tv, err := s.Converter.Convert(liveObject, versionedSet.APIVersion())
+		if s.Converter.IsMissingVersionError(err) { // okay to skip, obsolete versions will be deleted automatically anyway
+			continue
+		}
+		if err != nil {
+			return nil, err
+		}
+		reconciled, err := typed.ReconcileFieldSetWithSchema(versionedSet.Set(), tv)
+		if err != nil {
+			return nil, err
+		}
+		if reconciled != nil {
+			result[manager] = fieldpath.NewVersionedSet(reconciled, versionedSet.APIVersion(), versionedSet.Applied())
+		} else {
+			result[manager] = versionedSet
+		}
+	}
+	return result, nil
+}

typed/reconcile_schema.go

@@ -183,7 +183,7 @@ func (v *reconcileWithSchemaWalker) visitListItems(t *schema.List, element *fiel
 	element.Members.Iterate(func(pe fieldpath.PathElement) {
 		handleElement(pe, true)
 	})
-	return nil
+	return errs
 }
 
 func (v *reconcileWithSchemaWalker) doList(t *schema.List) (errs ValidationErrors) {
@@ -227,7 +227,7 @@ func (v *reconcileWithSchemaWalker) visitMapItems(t *schema.Map, element *fieldp
 		handleElement(pe, true)
 	})
 
-	return nil
+	return errs
 }
 
 func (v *reconcileWithSchemaWalker) doMap(t *schema.Map) (errs ValidationErrors) {
@@ -253,26 +253,19 @@ func (v *reconcileWithSchemaWalker) doMap(t *schema.Map) (errs ValidationErrors)
 }
 
 func buildGranularFieldSet(path fieldpath.Path, value *TypedValue) (*fieldpath.Set, ValidationErrors) {
-	result := fieldpath.NewSet(path)
+
 	valueFieldSet, err := value.ToFieldSet()
 	if err != nil {
 		return nil, errorf("toFieldSet: %v", err)
 	}
-	if listValueFieldSet, ok := fieldSetAtPath(valueFieldSet, path); ok {
-		valueFieldSet = prefixWithPath(path, listValueFieldSet)
-		result = result.Union(valueFieldSet)
+	result := fieldpath.NewSet()
+	resultAtPath := descendToPath(result, path)
+	if valueFieldSetAtPath, ok := fieldSetAtPath(valueFieldSet, path); ok {
+		*resultAtPath = *valueFieldSetAtPath
 	}
 	return result, nil
 }
 
-func prefixWithPath(prefix fieldpath.Path, set *fieldpath.Set) *fieldpath.Set {
-	result := fieldpath.NewSet()
-	set.Iterate(func(path fieldpath.Path) {
-		result.Insert(append(prefix.Copy(), path...))
-	})
-	return result
-}
-
 func fieldSetAtPath(node *fieldpath.Set, path fieldpath.Path) (*fieldpath.Set, bool) {
 	ok := true
 	for _, pe := range path {
@@ -283,6 +276,13 @@ func fieldSetAtPath(node *fieldpath.Set, path fieldpath.Path) (*fieldpath.Set, b
 	return node, ok
 }
 
+func descendToPath(node *fieldpath.Set, path fieldpath.Path) *fieldpath.Set {
+	for _, pe := range path {
+		node = node.Children.Descend(pe)
+	}
+	return node
+}
+
 func typeRefAtPath(t *schema.Map, pe fieldpath.PathElement) (tr schema.TypeRef, errs ValidationErrors) {
 	tr = t.ElementType
 	if pe.FieldName != nil {