utils: remove loadFactory

 - move filepath.Abs to libcontainer.New;
 - remove loadFactory.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

libcontainer/factory.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"regexp"
 
 	securejoin "github.com/cyphar/filepath-securejoin"
@@ -27,11 +28,15 @@ var idRegex = regexp.MustCompile(`^[\w+-\.]+$`)
 
 // New returns a linux based container factory based in the root directory.
 func New(root string) (*Factory, error) {
+	absRoot, err := filepath.Abs(root)
+	if err != nil {
+		return nil, err
+	}
 	if err := os.MkdirAll(root, 0o700); err != nil {
 		return nil, err
 	}
 	return &Factory{
-		Root: root,
+		Root: absRoot,
 	}, nil
 }
 

list.go

@@ -111,7 +111,7 @@ To list containers created using a non-default value for "--root":
 }
 
 func getContainers(context *cli.Context) ([]containerState, error) {
-	factory, err := loadFactory(context)
+	factory, err := libcontainer.New(context.GlobalString("root"))
 	if err != nil {
 		return nil, err
 	}

utils_linux.go

@@ -22,25 +22,14 @@ import (
 
 var errEmptyID = errors.New("container id cannot be empty")
 
-// loadFactory returns the configured factory instance for execing containers.
-func loadFactory(context *cli.Context) (*libcontainer.Factory, error) {
-	root := context.GlobalString("root")
-	abs, err := filepath.Abs(root)
-	if err != nil {
-		return nil, err
-	}
-
-	return libcontainer.New(abs)
-}
-
 // getContainer returns the specified container instance by loading it from state
 // with the default factory.
 func getContainer(context *cli.Context) (*libcontainer.Container, error) {
 	id := context.Args().First()
 	if id == "" {
 		return nil, errEmptyID
 	}
-	factory, err := loadFactory(context)
+	factory, err := libcontainer.New(context.GlobalString("root"))
 	if err != nil {
 		return nil, err
 	}
@@ -186,7 +175,7 @@ func createContainer(context *cli.Context, id string, spec *specs.Spec) (*libcon
 		return nil, err
 	}
 
-	factory, err := loadFactory(context)
+	factory, err := libcontainer.New(context.GlobalString("root"))
 	if err != nil {
 		return nil, err
 	}