From fd2fa9c027e6b4607db5617fdaa3000c9fa35cfe Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <janderson@ciq.co>
Date: Fri, 16 Sep 2022 22:39:51 +0000
Subject: [PATCH] Fix argument handling for overlay show rendering

Error logging for overlay show rendering incorrectly checked
the overlay name rather than the path to the file. It also
used wwlog (which goes to stderr) to output the render. This
commit replaces explicit args[] references with their named
equivalents from earlier in the function, correcting those
references along the way, and outputs the final render with
fmt.Print.
---
 internal/app/wwctl/overlay/show/main.go | 31 ++++++++++++-------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/internal/app/wwctl/overlay/show/main.go b/internal/app/wwctl/overlay/show/main.go
index 1e336383..3a6ee82b 100644
--- a/internal/app/wwctl/overlay/show/main.go
+++ b/internal/app/wwctl/overlay/show/main.go
@@ -46,7 +46,15 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 		fmt.Print(string(f))
 	} else {
-		var host node.NodeInfo
+		if !util.IsFile(overlayFile) {
+			wwlog.Debug("%s is not a file\n", overlayFile)
+			wwlog.Error("%s:%s is not a file\n", overlayName, fileName)
+			os.Exit(1)
+		}
+		if filepath.Ext(overlayFile) != ".ww" {
+			wwlog.Warn("%s lacks the '.ww' suffix, will not be rendered in an overlay\n", fileName)
+		}
+
 		nodeDB, err := node.New()
 		if err != nil {
 			wwlog.Error("Could not open node configuration: %s\n", err)
@@ -57,32 +65,24 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 			wwlog.Error("Could not get node list: %s\n", err)
 			os.Exit(1)
 		}
-		node := node.FilterByName(nodes, []string{NodeName})
-		if len(node) != 1 {
+		filteredNodes := node.FilterByName(nodes, []string{NodeName})
+		if len(filteredNodes) != 1 {
 			wwlog.Error("%v does not identify a single node\n", NodeName)
 			os.Exit(1)
 		}
-		host = node[0]
-
-		if !util.IsFile(args[0]) {
-			wwlog.Error("%s is not a file\n", args[0])
-		}
-		tstruct := overlay.InitStruct(host)
-		tstruct.BuildSource = args[0]
+		tstruct := overlay.InitStruct(filteredNodes[0])
+		tstruct.BuildSource = overlayFile
 		buffer, backupFile, writeFile, err := overlay.RenderTemplateFile(overlayFile, tstruct)
 		if err != nil {
 			return err
 		}
-		if filepath.Ext(args[0]) != ".ww" {
-			wwlog.Warn("%s has not the '.ww' so wont be rendered if in overlay\n", args[0])
-		}
 		var outBuffer bytes.Buffer
 		// search for magic file name comment
 		bufferScanner := bufio.NewScanner(bytes.NewReader(buffer.Bytes()))
 		bufferScanner.Split(overlay.ScanLines)
 		reg := regexp.MustCompile(`.*{{\s*/\*\s*file\s*["'](.*)["']\s*\*/\s*}}.*`)
 		foundFileComment := false
-		destFileName := strings.TrimSuffix(args[0], ".ww")
+		destFileName := strings.TrimSuffix(fileName, ".ww")
 		for bufferScanner.Scan() {
 			line := bufferScanner.Text()
 			filenameFromTemplate := reg.FindAllStringSubmatch(line, -1)
@@ -106,8 +106,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 			wwlog.Info("backupFile: %v\nwriteFile: %v\n", backupFile, writeFile)
 			wwlog.Info("Filename: %s\n\n", destFileName)
 		}
-		wwlog.Info("%s", outBuffer.String())
-
+		fmt.Print(outBuffer.String())
 	}
 	return nil
 }