kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

check if entry has real value in recursive getter

Browse Source 
Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
Christian Goll
2023-10-06 14:59:12 +02:00
committed by Jonathon Anderson
parent fecdce6684
commit 539002088c
3 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/pkg/node/transformers.go
View File

@@ -72,8 +72,12 @@ func recursiveGetter(
// go over a simple map with strings
for sourceIter.Next() {
if !targetValue.Elem().Field(i).MapIndex(sourceIter.Key()).IsValid() {
str := getter((sourceIter.Value().Interface()).(*Entry))
targetValue.Elem().Field(i).SetMapIndex(sourceIter.Key(), reflect.ValueOf(str))
// Only write entries for which have real values. This matters for
// tags, as empty map elements can be created without this check
if ((sourceIter.Value().Interface()).(*Entry)).GotReal() {
str := getter((sourceIter.Value().Interface()).(*Entry))
targetValue.Elem().Field(i).SetMapIndex(sourceIter.Key(), reflect.ValueOf(str))
}
}
}
} else {
@@ -175,7 +179,7 @@ func recursiveSetter(source, target interface{}, nameArg string, setter func(*En
if targetValue.Elem().Field(i).IsZero() {
targetValue.Elem().Field(i).Set(reflect.MakeMap(targetType.Elem().Field(i).Type))
}
// delete a ap element which is only in the target
// delete a map element which is only in the target
if targetValue.Elem().Field(i).Len() > 0 && targetValue.Elem().Field(i).Len() < 0 {
sourceIter := sourceValueMatched.MapRange()
targetIter := targetValue.Elem().Field(i).MapRange()