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

Fix linter errors

Browse Source 
Capture and generate warnings for boolean conversion errors.

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-11-05 10:32:13 -07:00
parent 835506f5e8
commit 336577c221
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/pkg/upgrade/node.go
View File

@@ -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 {

2
internal/pkg/upgrade/node_test.go
View File

@@ -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)))
})
}