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

only show options with lopt

Browse Source
This commit is contained in:
Christian Goll
2022-09-19 18:57:56 +02:00
parent c3416de3cb
commit a4fbe428e2
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/app/wwctl/node/edit/main.go
View File

@@ -45,7 +45,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
} }
defer os.Remove(file.Name()) defer os.Remove(file.Name())
nodeConf := node.NewConf() nodeConf := node.NewConf()
yamlTemplate := nodeConf.UnmarshalConf([]string{"tagsdel"}) yamlTemplate := nodeConf.UnmarshalConf([]string{"tagsdel", "default", "profiles"})
for { for {
_ = file.Truncate(0) _ = file.Truncate(0)
_, _ = file.Seek(0, 0) _, _ = file.Seek(0, 0)

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

@@ -454,18 +454,20 @@ func (nodeConf *NodeConf) UnmarshalConf(excludeList []string) (lines []string) {
for i := 0; i < nodeInfoVal.Elem().NumField(); i++ { for i := 0; i < nodeInfoVal.Elem().NumField(); i++ {
if nodeInfoType.Elem().Field(i).Tag.Get("lopt") != "" { if nodeInfoType.Elem().Field(i).Tag.Get("lopt") != "" {
if ymlStr, ok := getYamlString(nodeInfoType.Elem().Field(i), excludeList); ok { if ymlStr, ok := getYamlString(nodeInfoType.Elem().Field(i), excludeList); ok {
lines = append(lines, ymlStr) lines = append(lines, ymlStr...)
} }
} else if nodeInfoType.Elem().Field(i).Type.Kind() == reflect.Ptr { } else if nodeInfoType.Elem().Field(i).Type.Kind() == reflect.Ptr {
nestType := reflect.TypeOf(nodeInfoVal.Elem().Field(i).Interface()) nestType := reflect.TypeOf(nodeInfoVal.Elem().Field(i).Interface())
if ymlStr, ok := getYamlString(nodeInfoType.Elem().Field(i), excludeList); ok { if ymlStr, ok := getYamlString(nodeInfoType.Elem().Field(i), excludeList); ok {
lines = append(lines, ymlStr) lines = append(lines, ymlStr...)
} }
for j := 0; j < nestType.Elem().NumField(); j++ { for j := 0; j < nestType.Elem().NumField(); j++ {
if nestType.Elem().Field(j).Tag.Get("lopt") != "" && if nestType.Elem().Field(j).Tag.Get("lopt") != "" &&
!util.InSlice(excludeList, nestType.Elem().Field(j).Tag.Get("lopt")) { !util.InSlice(excludeList, nestType.Elem().Field(j).Tag.Get("lopt")) {
if ymlStr, ok := getYamlString(nestType.Elem().Field(j), excludeList); ok { if ymlStr, ok := getYamlString(nestType.Elem().Field(j), excludeList); ok {
lines = append(lines, " "+ymlStr) for _, str := range ymlStr {
lines = append(lines, " "+str)
}
} }
} }
} }
@@ -482,13 +484,16 @@ func (nodeConf *NodeConf) UnmarshalConf(excludeList []string) (lines []string) {
} }
} }
if ymlStr, ok := getYamlString(nodeInfoType.Elem().Field(i), excludeList); ok { if ymlStr, ok := getYamlString(nodeInfoType.Elem().Field(i), excludeList); ok {
lines = append(lines, ymlStr+":", " "+key+":") lines = append(lines, ymlStr[0]+":", " "+key+":")
netType := reflect.TypeOf(netMap[key]) netType := reflect.TypeOf(netMap[key])
for j := 0; j < netType.Elem().NumField(); j++ { for j := 0; j < netType.Elem().NumField(); j++ {
if ymlStr, ok := getYamlString(netType.Elem().Field(j), excludeList); ok { if ymlStr, ok := getYamlString(netType.Elem().Field(j), excludeList); ok {
lines = append(lines, " "+ymlStr) for _, str := range ymlStr {
lines = append(lines, " "+str)
} }
} }
}
} }
} }
} }
@@ -498,22 +503,25 @@ func (nodeConf *NodeConf) UnmarshalConf(excludeList []string) (lines []string) {
/* /*
Get the string of the yaml tag Get the string of the yaml tag
*/ */
func getYamlString(myType reflect.StructField, excludeList []string) (string, bool) { func getYamlString(myType reflect.StructField, excludeList []string) ([]string, bool) {
ymlStr := myType.Tag.Get("yaml") ymlStr := myType.Tag.Get("yaml")
if len(strings.Split(ymlStr, ",")) > 1 { if len(strings.Split(ymlStr, ",")) > 1 {
ymlStr = strings.Split(ymlStr, ",")[0] ymlStr = strings.Split(ymlStr, ",")[0]
} }
if util.InSlice(excludeList, ymlStr) { if util.InSlice(excludeList, ymlStr) {
return "", false return []string{""}, false
} else if myType.Tag.Get("lopt") == "" && myType.Type.Kind() == reflect.String {
return []string{""}, false
} }
if myType.Type.Kind() == reflect.String { if myType.Type.Kind() == reflect.String {
ymlStr += ": string" ymlStr += ": string"
return []string{ymlStr}, true
} else if myType.Type == reflect.TypeOf([]string{}) { } else if myType.Type == reflect.TypeOf([]string{}) {
ymlStr += ": {string}" return []string{ymlStr + ":", " - string"}, true
} else if myType.Type == reflect.TypeOf(map[string]string{}) { } else if myType.Type == reflect.TypeOf(map[string]string{}) {
ymlStr += ": {key: value}" return []string{ymlStr + ":", " key: value"}, true
} else if myType.Type.Kind() == reflect.Ptr { } else if myType.Type.Kind() == reflect.Ptr {
ymlStr += ":" return []string{ymlStr + ":"}, true
} }
return ymlStr, true return []string{ymlStr}, true
} }