From 121948d69ee0566ed41214b5506bdfde91c2ea0f Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 22 May 2026 12:25:21 -0700 Subject: [PATCH] pkg/rootless: modernize Using modernize (aka go fix) from Go 1.26.3, implement the following changes: > pkg/rootless/rootless_linux.go:319:30: fmtappendf: Replace []byte(fmt.Sprintf...) with fmt.Appendf (modernize) > err = os.WriteFile(uidMap, []byte(fmt.Sprintf("%d %d 1\n", 0, os.Geteuid())), 0o666) > ^ > pkg/rootless/rootless_linux.go:339:30: fmtappendf: Replace []byte(fmt.Sprintf...) with fmt.Appendf (modernize) > err = os.WriteFile(gidMap, []byte(fmt.Sprintf("%d %d 1\n", 0, os.Getegid())), 0o666) > ^ > pkg/rootless/rootless_linux.go:381:6: rangeint: for loop can be modernized using range over int (modernize) > for sig := 0; sig < numSig; sig++ { > ^ > pkg/rootless/rootless_linux.go:432:24: stringsseq: Ranging over SplitSeq is more efficient (modernize) > for _, entry := range bytes.Split(data, []byte{0}) { > ^ Signed-off-by: Kir Kolyshkin --- pkg/rootless/rootless_linux.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index 4d2af38808..fbcefad27e 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -316,7 +316,7 @@ func becomeRootInUserNS(stateDir string) (_ bool, _ int, retErr error) { } logrus.Debugf("write setgroups file exited with 0") - err = os.WriteFile(uidMap, []byte(fmt.Sprintf("%d %d 1\n", 0, os.Geteuid())), 0o666) + err = os.WriteFile(uidMap, fmt.Appendf(nil, "%d %d 1\n", 0, os.Geteuid()), 0o666) if err != nil { return false, -1, fmt.Errorf("cannot write uid_map: %w", err) } @@ -336,7 +336,7 @@ func becomeRootInUserNS(stateDir string) (_ bool, _ int, retErr error) { gidsMapped = err == nil } if !gidsMapped { - err = os.WriteFile(gidMap, []byte(fmt.Sprintf("%d %d 1\n", 0, os.Getegid())), 0o666) + err = os.WriteFile(gidMap, fmt.Appendf(nil, "%d %d 1\n", 0, os.Getegid()), 0o666) if err != nil { return false, -1, fmt.Errorf("cannot write gid_map: %w", err) } @@ -378,7 +378,7 @@ func becomeRootInUserNS(stateDir string) (_ bool, _ int, retErr error) { func waitAndProxySignalsToChild(pid C.int) (bool, int, error) { signals := []os.Signal{} - for sig := 0; sig < numSig; sig++ { + for sig := range numSig { if sig == int(unix.SIGTSTP) { continue } @@ -429,7 +429,7 @@ func isPauseProcess(pid int) bool { if err != nil { return false } - for _, entry := range bytes.Split(data, []byte{0}) { + for entry := range bytes.SplitSeq(data, []byte{0}) { if string(entry) == "_PODMAN_PAUSE=1" { return true }