forked from siderolabs/talos
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: implement strategic merge machine config patching
This format is much easier to understand when compared to JSON patches, it allows for more patch validation, and it should provide better user experience. This just implements the config merge, but it doesn't yet hook it up to any CLI utility, so no user-facing docs. Signed-off-by: Andrey Smirnov <[email protected]>
- Loading branch information
Showing
15 changed files
with
1,150 additions
and
11 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,170 @@ | ||
// This Source Code Form is subject to the terms of the Mozilla Public | ||
// License, v. 2.0. If a copy of the MPL was not distributed with this | ||
// file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
||
package merge | ||
|
||
import ( | ||
"fmt" | ||
"reflect" | ||
"strings" | ||
) | ||
|
||
// Merge two config trees together. | ||
// | ||
// Data in the left is replaced with data in the right unless it's zero value. | ||
// | ||
// This function is not supposed to be a generic merge function. | ||
// It is specifically fine-tuned to merge Talos machine configuration. | ||
// | ||
// Rules: | ||
// - if it is a simple value (int, float, string, etc.), it's merged into the left unless it's zero value, but boolean false is always merged. | ||
// - if it is a pointer, merged dereferencing the pointer unless the right is nil | ||
// - if it is a slice, merged by concatenating the right to the left. | ||
// - if the `merge:"replace"` struct tag is defined, a slice is replaced with the value of the right (unless it's zero value.) | ||
// - slices of `[]byte` are always replaced | ||
// - if it is a map, for each key value is merged recursively. | ||
// - if it is a struct, merge is performed for each field of the struct. | ||
// - if the type implements 'merger' interface, Merge function is called to handle the merge process. | ||
// - merger interface should be implemented on the pointer to the type. | ||
func Merge(left, right interface{}) error { | ||
return merge(reflect.ValueOf(left), reflect.ValueOf(right), false) | ||
} | ||
|
||
type merger interface { | ||
Merge(other interface{}) error | ||
} | ||
|
||
var ( | ||
zeroValue reflect.Value | ||
mergerType = reflect.TypeOf((*merger)(nil)).Elem() | ||
) | ||
|
||
//nolint:gocyclo,cyclop | ||
func merge(vl, vr reflect.Value, replace bool) error { | ||
tl, tr := vl.Type(), vr.Type() | ||
|
||
if tl != tr { | ||
return fmt.Errorf("merge type mismatch left %v right %v", tl, tr) | ||
} | ||
|
||
if reflect.PointerTo(tl).Implements(mergerType) { | ||
return vl.Addr().Interface().(merger).Merge(vr.Interface()) | ||
} | ||
|
||
switch tl.Kind() { //nolint:exhaustive | ||
case reflect.Pointer: | ||
if vr.IsZero() { | ||
return nil | ||
} | ||
|
||
if vl.IsZero() { | ||
vl.Set(vr) | ||
|
||
return nil | ||
} | ||
|
||
return merge(vl.Elem(), vr.Elem(), replace) | ||
case reflect.Slice: | ||
if vr.IsZero() { | ||
return nil | ||
} | ||
|
||
if !vl.CanSet() { | ||
return fmt.Errorf("merge not possible, left %v is not settable", vl) | ||
} | ||
|
||
if replace || tl.Elem().Kind() == reflect.Uint8 { | ||
vl.Set(vr) | ||
|
||
return nil | ||
} | ||
|
||
if vl.IsNil() && vr.Len() == 0 { | ||
vl.Set(reflect.MakeSlice(tl, 0, 0)) | ||
} else { | ||
vl.Set(reflect.AppendSlice(reflect.MakeSlice(tl, 0, 0), reflect.AppendSlice(vl, vr))) | ||
} | ||
case reflect.Map: | ||
if vr.IsZero() { | ||
return nil | ||
} | ||
|
||
if replace { | ||
vl.Set(vr) | ||
|
||
return nil | ||
} | ||
|
||
if vl.IsNil() { | ||
vl.Set(reflect.MakeMap(tl)) | ||
} | ||
|
||
for _, k := range vr.MapKeys() { | ||
if vl.MapIndex(k) != zeroValue { | ||
v := reflect.New(tl.Elem()).Elem() | ||
v.Set(vl.MapIndex(k)) | ||
|
||
if err := merge(v, vr.MapIndex(k), false); err != nil { | ||
return err | ||
} | ||
|
||
vl.SetMapIndex(k, v) | ||
} else { | ||
vl.SetMapIndex(k, vr.MapIndex(k)) | ||
} | ||
} | ||
case reflect.Struct: | ||
if replace { | ||
vl.Set(vr) | ||
|
||
return nil | ||
} | ||
|
||
for i := 0; i < tl.NumField(); i++ { | ||
var replace bool | ||
|
||
structTag := tl.Field(i).Tag.Get("merge") | ||
for _, value := range strings.Split(structTag, ",") { | ||
if value == "replace" { | ||
replace = true | ||
} | ||
} | ||
|
||
fl := vl.FieldByIndex(tl.Field(i).Index) | ||
fr := vr.FieldByIndex(tr.Field(i).Index) | ||
|
||
if err := merge(fl, fr, replace); err != nil { | ||
return fmt.Errorf("merge field %v.%v: %v", tl, tl.Field(i).Name, err) | ||
} | ||
} | ||
case | ||
reflect.String, | ||
reflect.Int, | ||
reflect.Uint, | ||
reflect.Int8, | ||
reflect.Int16, | ||
reflect.Int32, | ||
reflect.Int64, | ||
reflect.Uint8, | ||
reflect.Uint16, | ||
reflect.Uint32, | ||
reflect.Uint64, | ||
reflect.Float32, | ||
reflect.Float64, | ||
reflect.Bool: | ||
if !vl.CanSet() { | ||
return fmt.Errorf("merge not possible, left %v is not settable", vl) | ||
} | ||
|
||
if tl.Kind() != reflect.Bool && vr.IsZero() { | ||
return nil | ||
} | ||
|
||
vl.Set(vr) | ||
default: | ||
return fmt.Errorf("merge not implemented for %v", tl.Kind()) | ||
} | ||
|
||
return nil | ||
} |
Oops, something went wrong.