Merge pull request #141 from gschei/fix-missing-mergeoption

phisco · web-flow · commit c3d4059c5c6f · 2024-08-12T13:19:57.000+02:00
fixed missing mergeoptions for CombineFromVariablesPatch
diff --git a/patches.go b/patches.go
@@ -189,7 +189,12 @@ func ApplyCombineFromVariablesPatch(p PatchInterface, from, to runtime.Object) e
 		return err
 	}
 
-	return errors.Wrap(patchFieldValueToObject(p.GetToFieldPath(), out, to, nil), "cannot patch to object")
+	mo, err := toMergeOption(p)
+	if err != nil {
+		return err
+	}
+
+	return errors.Wrap(patchFieldValueToObject(p.GetToFieldPath(), out, to, mo), "cannot patch to object")
 }
 
 // ApplyEnvironmentPatch applies a patch to or from the environment. Patches to

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,12 @@ func ApplyCombineFromVariablesPatch(p PatchInterface, from, to runtime.Object) e`
`189`	`189`	`return err`
`190`	`190`	`}`
`191`	`191`
`192`		`- return errors.Wrap(patchFieldValueToObject(p.GetToFieldPath(), out, to, nil), "cannot patch to object")`
	`192`	`+ mo, err := toMergeOption(p)`
	`193`	`+ if err != nil {`
	`194`	`+ return err`
	`195`	`+ }`
	`196`	`+`
	`197`	`+ return errors.Wrap(patchFieldValueToObject(p.GetToFieldPath(), out, to, mo), "cannot patch to object")`
`193`	`198`	`}`
`194`	`199`
`195`	`200`	`// ApplyEnvironmentPatch applies a patch to or from the environment. Patches to`