mirror/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-03-31 13:01:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28188 from mtrmac/sprintf-split

Browse Source 
Don’t use `strings.Split(fmt.Sprintf("--a b …", …), " ")`
This commit is contained in:
Paul Holzinger
2026-03-04 12:01:12 +01:00
committed by GitHub
parent de80190295 b2d381c7a2
commit d2a0cef55c
4 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/common_test.go
View File

@@ -1314,9 +1314,9 @@ func (p *PodmanTestIntegration) makeOptions(args []string, options PodmanExecOpt
return args
}
var debug string
podmanOptions := []string{}
if _, ok := os.LookupEnv("E2E_DEBUG"); ok {
debug = "--log-level=debug --syslog=true "
podmanOptions = append(podmanOptions, "--log-level=debug", "--syslog=true")
}
eventsType := "file"
@@ -1324,8 +1324,16 @@ func (p *PodmanTestIntegration) makeOptions(args []string, options PodmanExecOpt
eventsType = "none"
}
podmanOptions := strings.Split(fmt.Sprintf("%s--root %s --runroot %s --runtime %s --conmon %s --network-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend %s",
debug, p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.NetworkConfigDir, p.CgroupManager, p.TmpDir, eventsType), " ")
podmanOptions = append(podmanOptions,
"--root", p.Root,
"--runroot", p.RunRoot,
"--runtime", p.OCIRuntime,
"--conmon", p.ConmonBinary,
"--network-config-dir", p.NetworkConfigDir,
"--cgroup-manager", p.CgroupManager,
"--tmpdir", p.TmpDir,
"--events-backend", eventsType,
)
podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
if !options.NoCache {

12
test/e2e/libpod_suite_remote_test.go
View File

@@ -122,8 +122,16 @@ func (p *PodmanTestIntegration) StopRemoteService() {
// getRemoteOptions assembles all the podman main options
func getRemoteOptions(p *PodmanTestIntegration, args []string) []string {
networkDir := p.NetworkConfigDir
podmanOptions := strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --network-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend %s",
p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, networkDir, p.CgroupManager, p.TmpDir, "file"), " ")
podmanOptions := []string{
"--root", p.Root,
"--runroot", p.RunRoot,
"--runtime", p.OCIRuntime,
"--conmon", p.ConmonBinary,
"--network-config-dir", networkDir,
"--cgroup-manager", p.CgroupManager,
"--tmpdir", p.TmpDir,
"--events-backend", "file",
}
podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
podmanOptions = append(podmanOptions, args...)