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

refactor to overlay info

Browse Source
This commit is contained in:
Christian Goll
2025-11-12 19:30:24 +01:00
committed by Jonathon Anderson
parent d1d398d2ff
commit 983a359c00
7 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/pkg/overlay/overlay.go
View File

@@ -330,7 +330,11 @@ func (overlay Overlay) ParseCommentVars(file string) (retMap map[string]string)
re := regexp.MustCompile(`{{\s*/\*\s*(.*?):\s*(.*?)\s*\*/\s*}}`)
matches := re.FindAllStringSubmatch(string(content), -1)
wwlog.Debug("matches: %v len(%d:%d)", matches, len(matches), len(matches[0]))
if len(matches) > 0 {
wwlog.Debug("matches: %v len(%d:%d)", matches, len(matches), len(matches[0]))
} else {
wwlog.Debug("matches: [] len(0)")
}
for i := range matches {
if len(matches[i]) > 2 {
retMap[matches[i][1]] = matches[i][2]
@@ -361,9 +365,15 @@ func walkParseTree(node parse.Node, vars map[string]bool) {
case *parse.RangeNode:
walkParseTree(n.Pipe, vars)
walkParseTree(n.List, vars)
walkParseTree(n.ElseList, vars)
case *parse.WithNode:
walkParseTree(n.Pipe, vars)
walkParseTree(n.List, vars)
walkParseTree(n.ElseList, vars)
case *parse.TemplateNode:
walkParseTree(n.Pipe, vars)
case *parse.BreakNode, *parse.ContinueNode:
// No variables to extract
case *parse.PipeNode:
if n != nil {
for _, cmd := range n.Cmds {