fix: implement merger for PercentageSize

shanduur · shanduur · commit 3aa153992a8a · 2026-02-06T09:28:59.000+01:00
Fixing issue when PercentageSize is used and instead of calling Merge it was trying to merge individual unexported fields. Signed-off-by: Mateusz Urbanek <mateusz.urbanek@siderolabs.com> (cherry picked from commit 1fec5b2)
diff --git a/pkg/machinery/config/types/block/percentage_size.go b/pkg/machinery/config/types/block/percentage_size.go
@@ -80,3 +80,16 @@ func (ps *PercentageSize) UnmarshalText(text []byte) error {
 func (ps PercentageSize) IsZero() bool {
 	return ps.value == nil && ps.raw == nil
 }
+
+// Merge implements merger interface.
+func (ps *PercentageSize) Merge(other any) error {
+	otherPS, ok := other.(PercentageSize)
+	if !ok {
+		return fmt.Errorf("cannot merge %T with %T", ps, other)
+	}
+
+	ps.raw = otherPS.raw
+	ps.value = otherPS.value
+
+	return nil
+}
