diff --git a/go.mod b/go.mod index 77051d0a854..d602dac8f26 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/containers/gvisor-tap-vsock v0.8.7 github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 github.com/containers/ocicrypt v1.2.1 - github.com/containers/psgo v1.9.1-0.20251104204210-533b50b1c2d9 + github.com/containers/psgo v1.10.0 github.com/containers/winquit v1.1.0 github.com/coreos/go-systemd/v22 v22.6.0 github.com/crc-org/vfkit v0.6.1 diff --git a/go.sum b/go.sum index 6c488c32c5c..10ecdeb1dc5 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,8 @@ github.com/containers/luksy v0.0.0-20250910190358-2cf5bc928957 h1:WxixhZ0typ8o66 github.com/containers/luksy v0.0.0-20250910190358-2cf5bc928957/go.mod h1:fGPsLPRi1etbHfe5o6sdx6ajsW810tI43uyF6ugmP/o= github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM= github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ= -github.com/containers/psgo v1.9.1-0.20251104204210-533b50b1c2d9 h1:1xzk3KbGOn6wZ7cIZapLcyQeRXrDuG7x389wTn8IzkU= -github.com/containers/psgo v1.9.1-0.20251104204210-533b50b1c2d9/go.mod h1:e44fw+1A7eJH1y0eWAo3P7sjfftXDlfF4AY498h+svQ= +github.com/containers/psgo v1.10.0 h1:r9cEzAMVRtC0sw4ayIPjbd9EgF9pPaTCqKgDHhS0D/8= +github.com/containers/psgo v1.10.0/go.mod h1:e44fw+1A7eJH1y0eWAo3P7sjfftXDlfF4AY498h+svQ= github.com/containers/winquit v1.1.0 h1:jArun04BNDQvt2W0Y78kh9TazN2EIEMG5Im6/JY7+pE= github.com/containers/winquit v1.1.0/go.mod h1:PsPeZlnbkmGGIToMPHF1zhWjBUkd8aHjMOr/vFcPxw8= github.com/coreos/go-oidc/v3 v3.14.1 h1:9ePWwfdwC4QKRlCXsJGou56adA/owXczOzwKdOumLqk= diff --git a/vendor/github.com/containers/psgo/.golangci.yml b/vendor/github.com/containers/psgo/.golangci.yml index a098068fe93..67b43bd7bfc 100644 --- a/vendor/github.com/containers/psgo/.golangci.yml +++ b/vendor/github.com/containers/psgo/.golangci.yml @@ -1,6 +1,12 @@ -# For documentation, see https://golangci-lint.run/usage/configuration/ - +version: "2" linters: enable: - errorlint +formatters: + enable: - gofumpt + +# Show all issues at once so it is visible how much must be fixed +issues: + max-issues-per-linter: 0 + max-same-issues: 0 diff --git a/vendor/github.com/containers/psgo/internal/dev/tty.go b/vendor/github.com/containers/psgo/internal/dev/tty.go index 863767f7529..c58fa40295e 100644 --- a/vendor/github.com/containers/psgo/internal/dev/tty.go +++ b/vendor/github.com/containers/psgo/internal/dev/tty.go @@ -73,7 +73,7 @@ func TTYs() (*[]TTY, error) { if err != nil { return nil, err } - defer devDir.Close() + defer devDir.Close() //nolint:errcheck devices := []string{} devTTYs, err := devDir.Readdirnames(0) @@ -91,7 +91,7 @@ func TTYs() (*[]TTY, error) { if err != nil { return nil, err } - defer devPTSDir.Close() + defer devPTSDir.Close() //nolint:errcheck devPTSs, err := devPTSDir.Readdirnames(0) if err != nil { diff --git a/vendor/github.com/containers/psgo/internal/host/host_nocgo.go b/vendor/github.com/containers/psgo/internal/host/host_nocgo.go index 89e85e009d3..e3d5d9e1e29 100644 --- a/vendor/github.com/containers/psgo/internal/host/host_nocgo.go +++ b/vendor/github.com/containers/psgo/internal/host/host_nocgo.go @@ -1,5 +1,4 @@ //go:build !cgo -// +build !cgo // Copyright 2018 psgo authors // diff --git a/vendor/github.com/containers/psgo/internal/proc/ns.go b/vendor/github.com/containers/psgo/internal/proc/ns.go index 1983512f864..f382fb60fbc 100644 --- a/vendor/github.com/containers/psgo/internal/proc/ns.go +++ b/vendor/github.com/containers/psgo/internal/proc/ns.go @@ -47,7 +47,7 @@ func ReadMappings(path string) ([]idtools.IDMap, error) { if err != nil { return nil, err } - defer file.Close() + defer file.Close() //nolint:errcheck var mappings []idtools.IDMap diff --git a/vendor/github.com/containers/psgo/internal/proc/pids.go b/vendor/github.com/containers/psgo/internal/proc/pids.go index 2687396e155..c2cbffe298d 100644 --- a/vendor/github.com/containers/psgo/internal/proc/pids.go +++ b/vendor/github.com/containers/psgo/internal/proc/pids.go @@ -31,7 +31,7 @@ func GetPIDs() ([]string, error) { if err != nil { return nil, err } - defer procDir.Close() + defer procDir.Close() //nolint:errcheck // extract string slice of all directories in procDir pidDirs, err := procDir.Readdirnames(0) @@ -74,7 +74,7 @@ func getPIDsFromCgroupV1(pid string) ([]string, error) { if err != nil { return nil, err } - defer f.Close() + defer f.Close() //nolint:errcheck scanner := bufio.NewScanner(f) cgroupPath := "" @@ -109,7 +109,7 @@ func getPIDsFromCgroupV1(pid string) ([]string, error) { return nil, err } } - defer f.Close() + defer f.Close() //nolint:errcheck pids := []string{} scanner = bufio.NewScanner(f) @@ -128,7 +128,7 @@ func getPIDsFromCgroupV2(pid string) ([]string, error) { if err != nil { return nil, err } - defer f.Close() + defer f.Close() //nolint:errcheck scanner := bufio.NewScanner(f) cgroupSlice := "" @@ -152,7 +152,7 @@ func getPIDsFromCgroupV2(pid string) ([]string, error) { if err != nil { return nil, err } - defer f.Close() + defer f.Close() //nolint:errcheck pids := []string{} scanner = bufio.NewScanner(f) diff --git a/vendor/github.com/containers/psgo/psgo.go b/vendor/github.com/containers/psgo/psgo.go index 696b9f74585..7df7f36b309 100644 --- a/vendor/github.com/containers/psgo/psgo.go +++ b/vendor/github.com/containers/psgo/psgo.go @@ -425,7 +425,7 @@ func JoinNamespaceAndProcessInfoWithOptions(pid string, descriptors []string, op dataErr = err return } - defer fd.Close() + defer fd.Close() //nolint:errcheck // create a new mountns on the current thread if err = unix.Unshare(unix.CLONE_NEWNS); err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index 27b15354646..78262ea358d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -156,7 +156,7 @@ github.com/containers/ocicrypt/keywrap/pkcs7 github.com/containers/ocicrypt/spec github.com/containers/ocicrypt/utils github.com/containers/ocicrypt/utils/keyprovider -# github.com/containers/psgo v1.9.1-0.20251104204210-533b50b1c2d9 +# github.com/containers/psgo v1.10.0 ## explicit; go 1.24.0 github.com/containers/psgo github.com/containers/psgo/internal/capabilities