Fix boolean pointer handling
- Refactor field reflection for clarity - Update tests for clarity Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
@@ -1,6 +1,7 @@
|
||||
package node
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"reflect"
|
||||
"sort"
|
||||
@@ -44,11 +45,11 @@ func (nodeYml *NodeYaml) GetFields(node NodeConf) (output []NodeFields) {
|
||||
nodeMap := make(fieldMap)
|
||||
for _, p := range node.Profiles {
|
||||
if profile, ok := nodeYml.nodeProfiles[p]; ok {
|
||||
nodeMap.recursiveFields(profile, "", p)
|
||||
nodeMap.importFields(profile, "", p)
|
||||
}
|
||||
}
|
||||
rawNode, _ := nodeYml.GetNodeOnlyPtr(node.id)
|
||||
nodeMap.recursiveFields(rawNode, "", "")
|
||||
nodeMap.importFields(rawNode, "", "")
|
||||
for _, elem := range nodeMap {
|
||||
if elem.Value != "" {
|
||||
output = append(output, *elem)
|
||||
@@ -65,7 +66,7 @@ Get all the info out of ProfileConf. If emptyFields is set true, all fields are
|
||||
*/
|
||||
func (nodeYml *NodeYaml) GetFieldsProfile(profile ProfileConf) (output []NodeFields) {
|
||||
profileMap := make(fieldMap)
|
||||
profileMap.recursiveFields(&profile, "", "")
|
||||
profileMap.importFields(&profile, "", "")
|
||||
for _, elem := range profileMap {
|
||||
if elem.Value != "" {
|
||||
output = append(output, *elem)
|
||||
@@ -81,86 +82,98 @@ func (nodeYml *NodeYaml) GetFieldsProfile(profile ProfileConf) (output []NodeFie
|
||||
Internal function which travels through all fields of a NodeConf and for this
|
||||
reason needs to be called via interface{}
|
||||
*/
|
||||
func (fieldMap fieldMap) recursiveFields(obj interface{}, prefix string, source string) {
|
||||
valObj := reflect.ValueOf(obj)
|
||||
typeObj := reflect.TypeOf(obj)
|
||||
if valObj.IsNil() {
|
||||
func (fieldMap fieldMap) importFields(obj interface{}, prefix string, source string) {
|
||||
objValue := reflect.ValueOf(obj)
|
||||
objType := reflect.TypeOf(obj)
|
||||
if objValue.IsNil() {
|
||||
return
|
||||
}
|
||||
for i := 0; i < typeObj.Elem().NumField(); i++ {
|
||||
if valObj.Elem().Field(i).IsValid() {
|
||||
if !typeObj.Elem().Field(i).IsExported() {
|
||||
continue
|
||||
}
|
||||
switch typeObj.Elem().Field(i).Type.Kind() {
|
||||
case reflect.Map:
|
||||
mapIter := valObj.Elem().Field(i).MapRange()
|
||||
for mapIter.Next() {
|
||||
if mapIter.Value().Kind() == reflect.String {
|
||||
fieldMap[prefix+typeObj.Elem().Field(i).Name+"["+mapIter.Key().String()+"]"] = &NodeFields{
|
||||
Field: prefix + typeObj.Elem().Field(i).Name + "[" + mapIter.Key().String() + "]",
|
||||
Source: source,
|
||||
Value: mapIter.Value().String(),
|
||||
}
|
||||
} else {
|
||||
fieldMap.recursiveFields(mapIter.Value().Interface(), prefix+typeObj.Elem().Field(i).Name+"["+mapIter.Key().String()+"].", source)
|
||||
}
|
||||
}
|
||||
if valObj.Elem().Field(i).Len() == 0 {
|
||||
fieldMap[prefix+typeObj.Elem().Field(i).Name] = &NodeFields{
|
||||
Field: prefix + typeObj.Elem().Field(i).Name + "[]",
|
||||
}
|
||||
}
|
||||
case reflect.Struct:
|
||||
fieldMap.recursiveFields(valObj.Elem().Field(i).Addr().Interface(), "", source)
|
||||
case reflect.Ptr:
|
||||
if valObj.Elem().Field(i).Addr().IsValid() {
|
||||
fieldMap.recursiveFields(valObj.Elem().Field(i).Interface(), prefix+typeObj.Elem().Field(i).Name+".", source)
|
||||
}
|
||||
default:
|
||||
if _, ok := fieldMap[prefix+typeObj.Elem().Field(i).Name]; !ok {
|
||||
fieldMap[prefix+typeObj.Elem().Field(i).Name] = &NodeFields{
|
||||
Field: prefix + typeObj.Elem().Field(i).Name,
|
||||
for i := 0; i < objType.Elem().NumField(); i++ {
|
||||
fieldValue := objValue.Elem().Field(i)
|
||||
field := objType.Elem().Field(i)
|
||||
if !fieldValue.IsValid() || !field.IsExported() {
|
||||
continue
|
||||
}
|
||||
switch field.Type.Kind() {
|
||||
case reflect.Map:
|
||||
mapIter := fieldValue.MapRange()
|
||||
for mapIter.Next() {
|
||||
if mapIter.Value().Kind() == reflect.String {
|
||||
key := fmt.Sprintf("%s%s[%s]", prefix, field.Name, mapIter.Key().String())
|
||||
fieldMap[key] = &NodeFields{
|
||||
Field: key,
|
||||
Source: source,
|
||||
Value: mapIter.Value().String(),
|
||||
}
|
||||
} else {
|
||||
newPrefix := fmt.Sprintf("%s%s[%s].", prefix, field.Name, mapIter.Key().String())
|
||||
fieldMap.importFields(mapIter.Value().Interface(), newPrefix, source)
|
||||
}
|
||||
|
||||
switch typeObj.Elem().Field(i).Type {
|
||||
case reflect.TypeOf([]string{}):
|
||||
vals := (valObj.Elem().Field(i).Interface()).([]string)
|
||||
src_str := source
|
||||
if oldVal, ok := fieldMap[prefix+typeObj.Elem().Field(i).Name]; ok {
|
||||
if oldVal.Value != "" {
|
||||
if len(vals) > 0 {
|
||||
src_str = oldVal.Source + "+"
|
||||
} else {
|
||||
src_str = oldVal.Source
|
||||
}
|
||||
vals = append(vals, oldVal.Value)
|
||||
} else {
|
||||
src_str = oldVal.Source
|
||||
}
|
||||
}
|
||||
fieldMap[prefix+typeObj.Elem().Field(i).Name] = &NodeFields{
|
||||
Field: prefix + typeObj.Elem().Field(i).Name,
|
||||
Source: src_str,
|
||||
Value: strings.Join(vals, ","),
|
||||
}
|
||||
case reflect.TypeOf(net.IP{}):
|
||||
val := (valObj.Elem().Field(i).Interface()).(net.IP)
|
||||
if val != nil {
|
||||
fieldMap[prefix+typeObj.Elem().Field(i).Name].Set(source, val.String())
|
||||
}
|
||||
case reflect.TypeOf(true):
|
||||
val := (valObj.Elem().Field(i).Interface()).(bool)
|
||||
if val {
|
||||
fieldMap[prefix+typeObj.Elem().Field(i).Name].Set(source, strconv.FormatBool(val))
|
||||
}
|
||||
default:
|
||||
fieldMap[prefix+typeObj.Elem().Field(i).Name].Set(source, valObj.Elem().Field(i).String())
|
||||
}
|
||||
|
||||
}
|
||||
if fieldValue.Len() == 0 {
|
||||
key := fmt.Sprintf("%s%s[]", prefix, field.Name)
|
||||
fieldMap[key] = &NodeFields{
|
||||
Field: key,
|
||||
}
|
||||
}
|
||||
case reflect.Struct: // inherited fields from a sub-entity
|
||||
fieldMap.importFields(fieldValue.Addr().Interface(), "", source)
|
||||
case reflect.Ptr:
|
||||
if fieldValue.Addr().IsValid() {
|
||||
if field.Type.Elem().Kind() == reflect.Bool {
|
||||
fieldMap.importField(field, fieldValue, prefix, source)
|
||||
} else {
|
||||
newPrefix := fmt.Sprintf("%s%s.", prefix, field.Name)
|
||||
fieldMap.importFields(fieldValue.Interface(), newPrefix, source)
|
||||
}
|
||||
}
|
||||
default:
|
||||
fieldMap.importField(field, fieldValue, prefix, source)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (fieldMap fieldMap) importField(field reflect.StructField, fieldValue reflect.Value, prefix string, source string) {
|
||||
key := prefix + field.Name
|
||||
if _, ok := fieldMap[key]; !ok {
|
||||
fieldMap[key] = &NodeFields{
|
||||
Field: key,
|
||||
Source: source,
|
||||
}
|
||||
}
|
||||
|
||||
if field.Type == reflect.TypeOf([]string{}) {
|
||||
vals := (fieldValue.Interface()).([]string)
|
||||
src_str := source
|
||||
if oldVal, ok := fieldMap[key]; ok {
|
||||
if oldVal.Value != "" {
|
||||
if len(vals) > 0 {
|
||||
src_str = oldVal.Source + "+"
|
||||
} else {
|
||||
src_str = oldVal.Source
|
||||
}
|
||||
vals = append(vals, oldVal.Value)
|
||||
} else {
|
||||
src_str = oldVal.Source
|
||||
}
|
||||
}
|
||||
fieldMap[key] = &NodeFields{
|
||||
Field: key,
|
||||
Source: src_str,
|
||||
Value: strings.Join(vals, ","),
|
||||
}
|
||||
} else if field.Type == reflect.TypeOf(net.IP{}) {
|
||||
val := (fieldValue.Interface()).(net.IP)
|
||||
if val != nil {
|
||||
fieldMap[key].Set(source, val.String())
|
||||
}
|
||||
} else if field.Type.Kind() == reflect.Bool {
|
||||
fieldMap[key].Set(source, strconv.FormatBool(fieldValue.Bool()))
|
||||
} else if field.Type.Kind() == reflect.Pointer && field.Type.Elem().Kind() == reflect.Bool {
|
||||
if fieldValue.Elem().IsValid() {
|
||||
fieldMap[key].Set(source, strconv.FormatBool(fieldValue.Elem().Bool()))
|
||||
}
|
||||
} else {
|
||||
fieldMap[key].Set(source, fieldValue.String())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -231,7 +231,7 @@ func UnmarshalConf(obj interface{}, excludeList []string) (lines []string) {
|
||||
lines = append(lines, ymlStr...)
|
||||
}
|
||||
}
|
||||
if field.Type.Kind() == reflect.Ptr && field.Tag.Get("yaml") != "" {
|
||||
if field.Type.Kind() == reflect.Ptr && field.Type.Elem().Kind() == reflect.Struct && field.Tag.Get("yaml") != "" {
|
||||
typeLine := field.Tag.Get("yaml")
|
||||
if len(strings.Split(typeLine, ",")) > 1 {
|
||||
typeLine = strings.Split(typeLine, ",")[0] + ":"
|
||||
|
||||
Reference in New Issue
Block a user