config: Fix doc finding logic

node/config/doc_util.go

@@ -0,0 +1,44 @@
+package config
+
+import (
+	"fmt"
+	"strings"
+)
+
+func findDoc(root interface{}, section, name string) *DocField {
+	rt := fmt.Sprintf("%T", root)[len("*config."):]
+
+	doc := findDocSect(rt, section, name)
+	if doc != nil {
+		return doc
+	}
+
+	return findDocSect("Common", section, name)
+}
+
+func findDocSect(root string, section, name string) *DocField {
+	path := strings.Split(section, ".")
+
+	docSection := Doc[root]
+	for _, e := range path {
+		if docSection == nil {
+			return nil
+		}
+
+		for _, field := range docSection {
+			if field.Name == e {
+				docSection = Doc[field.Type]
+				break
+			}
+
+		}
+	}
+
+	for _, df := range docSection {
+		if df.Name == name {
+			return &df
+		}
+	}
+
+	return nil
+}

node/config/load.go

@@ -86,7 +86,7 @@ func ConfigUpdate(cfgCur, cfgDef interface{}, comment bool) ([]byte, error) {
 		nodeLines := strings.Split(nodeStr, "\n")
 		var outLines []string
 
-		sectionRx := regexp.MustCompile(`[\[.]([^.]+)]`)
+		sectionRx := regexp.MustCompile(`\[(.+)]`)
 		var section string
 
 		for i, line := range nodeLines {
@@ -106,30 +106,24 @@ func ConfigUpdate(cfgCur, cfgDef interface{}, comment bool) ([]byte, error) {
 				}
 			}
 
-			pad := strings.Repeat(" ", len(line) - len(strings.TrimLeftFunc(line, unicode.IsSpace)))
+			pad := strings.Repeat(" ", len(line)-len(strings.TrimLeftFunc(line, unicode.IsSpace)))
 
 			// see if we have docs for this field
 			{
 				lf := strings.Fields(line)
 				if len(lf) > 1 {
-					var doc *DocField
-					for _, df := range Doc[section] {
-						if df.Name == lf[0] {
-							doc = &df
-							break
-						}
-					}
+					doc := findDoc(cfgCur, section, lf[0])
 
 					if doc != nil {
 						// found docfield, emit doc comment
 						if len(doc.Comment) > 0 {
 							for _, docLine := range strings.Split(doc.Comment, "\n") {
-								outLines = append(outLines, pad + "# " + docLine)
+								outLines = append(outLines, pad+"# "+docLine)
 							}
-							outLines = append(outLines, pad + "#")
+							outLines = append(outLines, pad+"#")
 						}
 
-						outLines = append(outLines, pad + "# type: " + doc.Type)
+						outLines = append(outLines, pad+"# type: "+doc.Type)
 					}
 				}
 			}