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

2
internal/pkg/image/initramfs_test.go
View File

@@ -14,7 +14,7 @@ func TestFindInitramfs(t *testing.T) {
conf := warewulfconf.Get()
temp, err := os.MkdirTemp(os.TempDir(), "ww-conf-*")
assert.NoError(t, err)
defer os.RemoveAll(temp)
defer func() { _ = os.RemoveAll(temp) }()
conf.Paths.WWChrootdir = temp
assert.NoError(t, os.MkdirAll(filepath.Join(RootFsDir("image"), "boot"), 0700))

5
internal/pkg/image/mountpoints.go
View File

@@ -23,9 +23,10 @@ func InitMountPnts(binds []string) (mounts []*warewulfconf.MountEntry) {
readonly := false
copy_ := false
if len(bind) >= 3 {
if bind[2] == "ro" {
switch bind[2] {
case "ro":
readonly = true
} else if bind[2] == "copy" {
case "copy":
copy_ = true
}
}

24
internal/pkg/image/syncuids_test.go
View File

@@ -20,9 +20,9 @@ func writeTempFile(t *testing.T, input string) string {
func makeSyncDB(t *testing.T, hostInput string, imageInput string) syncDB {
hostFileName := writeTempFile(t, hostInput)
defer os.Remove(hostFileName)
defer func() { _ = os.Remove(hostFileName) }()
imageFileName := writeTempFile(t, imageInput)
defer os.Remove(imageFileName)
defer func() { _ = os.Remove(imageFileName) }()
db := make(syncDB)
var err error
err = db.readFromHost(hostFileName)
@@ -34,7 +34,7 @@ func makeSyncDB(t *testing.T, hostInput string, imageInput string) syncDB {
func Test_readFromHost_single(t *testing.T) {
hostFileName := writeTempFile(t, `testuser:x:1001:1001::/home/testuser:/bin/bash`)
defer os.Remove(hostFileName)
defer func() { _ = os.Remove(hostFileName) }()
db := make(syncDB)
err := db.readFromHost(hostFileName)
@@ -50,7 +50,7 @@ func Test_readFromHost_multiple(t *testing.T) {
testuser1:x:1001:1001::/home/testuser:/bin/bash
testuser2:x:1002:1002::/home/testuser:/bin/bash
`)
defer os.Remove(hostFileName)
defer func() { _ = os.Remove(hostFileName) }()
db := make(syncDB)
err := db.readFromHost(hostFileName)
@@ -65,7 +65,7 @@ testuser2:x:1002:1002::/home/testuser:/bin/bash
func Test_readFromimage_single(t *testing.T) {
imageFileName := writeTempFile(t, `testuser:x:1001:1001::/home/testuser:/bin/bash`)
defer os.Remove(imageFileName)
defer func() { _ = os.Remove(imageFileName) }()
db := make(syncDB)
err := db.readFromimage(imageFileName)
@@ -81,7 +81,7 @@ func Test_readFromimage_multiple(t *testing.T) {
testuser1:x:1001:1001::/home/testuser:/bin/bash
testuser2:x:1002:1002::/home/testuser:/bin/bash
`)
defer os.Remove(imageFileName)
defer func() { _ = os.Remove(imageFileName) }()
db := make(syncDB)
err := db.readFromimage(imageFileName)
@@ -98,13 +98,13 @@ func Test_readFromBoth_multiple(t *testing.T) {
testuser1:x:1001:1001::/home/testuser:/bin/bash
testuser2:x:1002:1002::/home/testuser:/bin/bash
`)
defer os.Remove(imageFileName)
defer func() { _ = os.Remove(imageFileName) }()
hostFileName := writeTempFile(t, `
testuser1:x:2001:2001::/home/testuser:/bin/bash
testuser3:x:2003:2003::/home/testuser:/bin/bash
`)
defer os.Remove(hostFileName)
defer func() { _ = os.Remove(hostFileName) }()
db := make(syncDB)
var err error
@@ -150,13 +150,13 @@ func Test_getOnlyimageLines(t *testing.T) {
testuser1:x:1001:1001::/home/testuser:/bin/bash
testuser2:x:1002:1002::/home/testuser:/bin/bash
`)
defer os.Remove(imageFileName)
defer func() { _ = os.Remove(imageFileName) }()
hostFileName := writeTempFile(t, `
testuser1:x:2001:2001::/home/testuser:/bin/bash
testuser3:x:2003:2003::/home/testuser:/bin/bash
`)
defer os.Remove(hostFileName)
defer func() { _ = os.Remove(hostFileName) }()
db := make(syncDB)
var err error
@@ -265,7 +265,7 @@ func Test_malformed_passwd(t *testing.T) {
hostInput := `"testuser1:x:1001:1001::/home/testuser:/bin/bash"
asdf`
hostFileName := writeTempFile(t, hostInput)
defer os.Remove(hostFileName)
defer func() { _ = os.Remove(hostFileName) }()
db := make(syncDB)
err := db.readFromHost(hostFileName)
assert.NoError(t, err)
@@ -278,7 +278,7 @@ func Test_network_passwd(t *testing.T) {
+::::::
-::::::`
hostFileName := writeTempFile(t, hostInput)
defer os.Remove(hostFileName)
defer func() { _ = os.Remove(hostFileName) }()
db := make(syncDB)
err := db.readFromHost(hostFileName)
assert.NotContains(t, buf.String(), "parse error")

4
internal/pkg/image/syncuser.go
View File

@@ -160,7 +160,7 @@ func (db syncDB) read(fileName string, fromimage bool) error {
if file, err := os.Open(fileName); err != nil {
return err
} else {
defer file.Close()
defer func() { _ = file.Close() }()
fileScanner := bufio.NewScanner(file)
for fileScanner.Scan() {
line := fileScanner.Text()
@@ -293,7 +293,7 @@ func (db syncDB) getOnlyimageLines(fileName string) ([]string, error) {
if err != nil {
return nil, err
}
defer file.Close()
defer func() { _ = file.Close() }()
fileScanner := bufio.NewScanner(file)
var lines []string