shim: Move creation of ShimParams structure into each agent

In order to avoid increasing the number of parameters passed to the
shim preparation function, this commit moves the preparation of the
ShimParams structure to each agent implementation.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>

hyperstart_agent.go

@@ -27,6 +27,7 @@ import (
 
 	proxyClient "github.com/clearcontainers/proxy/client"
 	"github.com/containers/virtcontainers/pkg/hyperstart"
+	ns "github.com/containers/virtcontainers/pkg/nsenter"
 	"github.com/sirupsen/logrus"
 	"github.com/vishvananda/netlink"
 )
@@ -314,7 +315,22 @@ func (h *hyper) exec(pod *Pod, c Container, cmd Cmd) (*Process, error) {
 		Process:   *hyperProcess,
 	}
 
-	process, err := prepareAndStartShim(pod, h.shim, c.id, token, h.state.URL, cmd)
+	shimParams := ShimParams{
+		Container: c.id,
+		Token:     token,
+		URL:       h.state.URL,
+		Console:   cmd.Console,
+		Terminal:  cmd.Interactive,
+		Detach:    cmd.Detach,
+		EnterNS:   []ns.Namespace{
+			{
+				Path: pod.networkNS.NetNsPath,
+				Type: ns.NSTypeNet,
+			},
+		},
+	}
+
+	process, err := startShimWrapper(*pod, h.shim, shimParams)
 	if err != nil {
 		return nil, err
 	}
@@ -488,7 +504,22 @@ func (h *hyper) createContainer(pod *Pod, c *Container) (*Process, error) {
 		return nil, err
 	}
 
-	return prepareAndStartShim(pod, h.shim, c.id, token, h.state.URL, c.config.Cmd)
+	shimParams := ShimParams{
+		Container: c.id,
+		Token:     token,
+		URL:       h.state.URL,
+		Console:   c.config.Cmd.Console,
+		Terminal:  c.config.Cmd.Interactive,
+		Detach:    c.config.Cmd.Detach,
+		EnterNS:   []ns.Namespace{
+			{
+				Path: pod.networkNS.NetNsPath,
+				Type: ns.NSTypeNet,
+			},
+		},
+	}
+
+	return startShimWrapper(*pod, h.shim, shimParams)
 }
 
 // startContainer is the agent Container starting implementation for hyperstart.

kata_agent.go

@@ -28,6 +28,7 @@ import (
 	"syscall"
 
 	vcAnnotations "github.com/containers/virtcontainers/pkg/annotations"
+	ns "github.com/containers/virtcontainers/pkg/nsenter"
 	"github.com/containers/virtcontainers/pkg/uuid"
 	kataclient "github.com/kata-containers/agent/protocols/client"
 	"github.com/kata-containers/agent/protocols/grpc"
@@ -297,7 +298,22 @@ func (k *kataAgent) exec(pod *Pod, c Container, cmd Cmd) (*Process, error) {
 		return nil, err
 	}
 
-	return prepareAndStartShim(pod, k.shim, c.id, req.ExecId, k.state.URL, cmd)
+	shimParams := ShimParams{
+		Container: c.id,
+		Token:     req.ExecId,
+		URL:       k.state.URL,
+		Console:   cmd.Console,
+		Terminal:  cmd.Interactive,
+		Detach:    cmd.Detach,
+		EnterNS:   []ns.Namespace{
+			{
+				Path: pod.networkNS.NetNsPath,
+				Type: ns.NSTypeNet,
+			},
+		},
+	}
+
+	return startShimWrapper(*pod, k.shim, shimParams)
 }
 
 func (k *kataAgent) generateInterfacesAndRoutes(networkNS NetworkNamespace) ([]*grpc.Interface, []*grpc.Route, error) {
@@ -671,7 +687,22 @@ func (k *kataAgent) createContainer(pod *Pod, c *Container) (*Process, error) {
 		return nil, err
 	}
 
-	return prepareAndStartShim(pod, k.shim, c.id, req.ExecId, k.state.URL, c.config.Cmd)
+	shimParams := ShimParams{
+		Container: c.id,
+		Token:     req.ExecId,
+		URL:       k.state.URL,
+		Console:   c.config.Cmd.Console,
+		Terminal:  c.config.Cmd.Interactive,
+		Detach:    c.config.Cmd.Detach,
+		EnterNS:   []ns.Namespace{
+			{
+				Path: pod.networkNS.NetNsPath,
+				Type: ns.NSTypeNet,
+			},
+		},
+	}
+
+	return startShimWrapper(*pod, k.shim, shimParams)
 }
 
 func (k *kataAgent) startContainer(pod Pod, c *Container) error {

shim.go

@@ -154,28 +154,13 @@ func stopShim(pid int) error {
 	return nil
 }
 
-func prepareAndStartShim(pod *Pod, shim shim, cid, token, url string, cmd Cmd) (*Process, error) {
+func startShimWrapper(pod Pod, shim shim, params ShimParams) (*Process, error) {
 	process := &Process{
-		Token:     token,
+		Token:     params.Token,
 		StartTime: time.Now().UTC(),
 	}
 
-	shimParams := ShimParams{
-		Container: cid,
-		Token:     token,
-		URL:       url,
-		Console:   cmd.Console,
-		Terminal:  cmd.Interactive,
-		Detach:    cmd.Detach,
-		EnterNS:   []ns.Namespace{
-			{
-				Path: pod.networkNS.NetNsPath,
-				Type: ns.NSTypeNet,
-			},
-		},
-	}
-
-	pid, err := shim.start(*pod, shimParams)
+	pid, err := shim.start(pod, params)
 	if err != nil {
 		return nil, err
 	}