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

Update linter for golang v1.25 compatibility

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2026-03-10 19:55:51 -06:00
committed by Christian Goll
parent 019408d076
commit 081d2ec61e
48 changed files with 156 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/pkg/config/root.go
View File

@@ -234,7 +234,7 @@ func (config *WarewulfYaml) Dump() ([]byte, error) {
return buf.Bytes(), err
}
func (config *WarewulfYaml) PersistToFile(configFile string) error {
func (config *WarewulfYaml) PersistToFile(configFile string) (err error) {
out, dumpErr := config.Dump()
if dumpErr != nil {
wwlog.Error("%s", dumpErr)
@@ -245,7 +245,11 @@ func (config *WarewulfYaml) PersistToFile(configFile string) error {
wwlog.Error("%s", err)
return err
}
defer file.Close()
defer func() {
if cerr := file.Close(); cerr != nil && err == nil {
err = cerr
}
}()
_, err = file.WriteString(string(out))
if err != nil {
return err

2
internal/pkg/config/root_test.go
View File

@@ -305,7 +305,7 @@ func TestInitializedFromFile(t *testing.T) {
example_warewulf_conf := ""
tempWarewulfConf, warewulfConfErr := os.CreateTemp("", "warewulf.conf-")
assert.NoError(t, warewulfConfErr)
defer os.Remove(tempWarewulfConf.Name())
defer func() { _ = os.Remove(tempWarewulfConf.Name()) }()
_, warewulfConfErr = tempWarewulfConf.Write([]byte(example_warewulf_conf))
assert.NoError(t, warewulfConfErr)
assert.NoError(t, tempWarewulfConf.Sync())

2
internal/pkg/config/util.go
View File

@@ -10,7 +10,7 @@ func GetOutboundIP() net.IP {
if err != nil {
return nil
}
defer conn.Close()
defer func() { _ = conn.Close() }()
localAddr := conn.LocalAddr().(*net.UDPAddr)
return localAddr.IP
}