tests/cmd/sd-helper: switch from configs to cgroups

kolyshkin · kolyshkin · commit 5a838ccbe01d · 2024-12-11T19:08:40.000-08:00
Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
diff --git a/tests/cmd/sd-helper/helper.go b/tests/cmd/sd-helper/helper.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/opencontainers/runc/libcontainer/cgroups"
 	"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
-	"github.com/opencontainers/runc/libcontainer/configs"
 )
 
 func usage() {
@@ -57,18 +56,18 @@ func main() {
 	}
 }
 
-func newManager(config *configs.Cgroup) (cgroups.Manager, error) {
+func newManager(config *cgroups.Cgroup) (cgroups.Manager, error) {
 	if cgroups.IsCgroup2UnifiedMode() {
 		return systemd.NewUnifiedManager(config, "")
 	}
 	return systemd.NewLegacyManager(config, nil)
 }
 
 func unitCommand(cmd, name, parent string) error {
-	podConfig := &configs.Cgroup{
+	podConfig := &cgroups.Cgroup{
 		Name:      name,
 		Parent:    parent,
-		Resources: &configs.Resources{},
+		Resources: &cgroups.Resources{},
 	}
 	pm, err := newManager(podConfig)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/opencontainers/runc/libcontainer/cgroups"`
`11`	`11`	`"github.com/opencontainers/runc/libcontainer/cgroups/systemd"`
`12`		`- "github.com/opencontainers/runc/libcontainer/configs"`
`13`	`12`	`)`
`14`	`13`
`15`	`14`	`func usage() {`
`@@ -57,18 +56,18 @@ func main() {`
`57`	`56`	`}`
`58`	`57`	`}`
`59`	`58`
`60`		`-func newManager(config *configs.Cgroup) (cgroups.Manager, error) {`
	`59`	`+func newManager(config *cgroups.Cgroup) (cgroups.Manager, error) {`
`61`	`60`	`if cgroups.IsCgroup2UnifiedMode() {`
`62`	`61`	`return systemd.NewUnifiedManager(config, "")`
`63`	`62`	`}`
`64`	`63`	`return systemd.NewLegacyManager(config, nil)`
`65`	`64`	`}`
`66`	`65`
`67`	`66`	`func unitCommand(cmd, name, parent string) error {`
`68`		`- podConfig := &configs.Cgroup{`
	`67`	`+ podConfig := &cgroups.Cgroup{`
`69`	`68`	`Name: name,`
`70`	`69`	`Parent: parent,`
`71`		`- Resources: &configs.Resources{},`
	`70`	`+ Resources: &cgroups.Resources{},`
`72`	`71`	`}`
`73`	`72`	`pm, err := newManager(podConfig)`
`74`	`73`	`if err != nil {`