From 336577c221d0add3eccada4f46360d4605a4c0e5 Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <janderson@ciq.com>
Date: Tue, 5 Nov 2024 10:32:13 -0700
Subject: [PATCH] Fix linter errors

Capture and generate warnings for boolean conversion errors.

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
---
 internal/pkg/upgrade/node.go      | 16 +++++++++++-----
 internal/pkg/upgrade/node_test.go |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/internal/pkg/upgrade/node.go b/internal/pkg/upgrade/node.go
index 363b6a22..d93a34c8 100644
--- a/internal/pkg/upgrade/node.go
+++ b/internal/pkg/upgrade/node.go
@@ -16,6 +16,12 @@ func logIgnore(name string, value interface{}, reason string) {
 	wwlog.Warn("ignore: %s: %v (%s)", name, value, reason)
 }
 
+func warnError(err error) {
+	if err != nil {
+		wwlog.Warn("%w", err)
+	}
+}
+
 func Parse(data []byte) (nodesYaml *NodesYaml, err error) {
 	nodesYaml = new(NodesYaml)
 	if err = yaml.Unmarshal(data, nodesYaml); err != nil {
@@ -113,7 +119,7 @@ func (this *Node) Upgrade(addDefaults bool) (upgraded *node.Node) {
 		logIgnore("Disabled", this.Disabled, "obsolete")
 	}
 	if this.Discoverable != "" {
-		upgraded.Discoverable.Set(this.Discoverable)
+		warnError(upgraded.Discoverable.Set(this.Discoverable))
 	}
 	if this.Disks != nil {
 		for name, disk := range this.Disks {
@@ -156,7 +162,7 @@ func (this *Node) Upgrade(addDefaults bool) (upgraded *node.Node) {
 		upgraded.Ipmi.UserName = this.IpmiUserName
 	}
 	if upgraded.Ipmi.Write == "" {
-		upgraded.Ipmi.Write.Set(this.IpmiWrite)
+		warnError(upgraded.Ipmi.Write.Set(this.IpmiWrite))
 	}
 	upgraded.Ipxe = this.Ipxe
 	if this.Kernel != nil {
@@ -335,7 +341,7 @@ func (this *Profile) Upgrade(addDefaults bool) (upgraded *node.Profile) {
 		upgraded.Ipmi.UserName = this.IpmiUserName
 	}
 	if upgraded.Ipmi.Write == "" {
-		upgraded.Ipmi.Write.Set(this.IpmiWrite)
+		warnError(upgraded.Ipmi.Write.Set(this.IpmiWrite))
 	}
 	upgraded.Ipxe = this.Ipxe
 	if this.Kernel != nil {
@@ -447,7 +453,7 @@ func (this *IpmiConf) Upgrade() (upgraded *node.IpmiConf) {
 		delete(upgraded.Tags, tag)
 	}
 	upgraded.UserName = this.UserName
-	upgraded.Write.Set(this.Write)
+	warnError(upgraded.Write.Set(this.Write))
 	return
 }
 
@@ -506,7 +512,7 @@ func (this *NetDev) Upgrade(addDefaults bool) (upgraded *node.NetDev) {
 			}
 		}
 	}
-	upgraded.OnBoot.Set(this.OnBoot)
+	warnError(upgraded.OnBoot.Set(this.OnBoot))
 	upgraded.Prefix = net.ParseIP(this.Prefix)
 	if this.Tags != nil {
 		for key, value := range this.Tags {
diff --git a/internal/pkg/upgrade/node_test.go b/internal/pkg/upgrade/node_test.go
index ae4bec8a..334199ed 100644
--- a/internal/pkg/upgrade/node_test.go
+++ b/internal/pkg/upgrade/node_test.go
@@ -616,7 +616,7 @@ func Test_UpgradeNodesYaml(t *testing.T) {
 			legacy, err := Parse([]byte(tt.legacyYaml))
 			assert.NoError(t, err)
 			upgraded := legacy.Upgrade(tt.addDefaults)
-			upgradedYaml, err := upgraded.Dump()
+			upgradedYaml, _ := upgraded.Dump()
 			assert.Equal(t, strings.TrimSpace(tt.upgradedYaml), strings.TrimSpace(string(upgradedYaml)))
 		})
 	}