Refactor spec generation in libpod into a function

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #386
Approved by: baude

3 files changed, 193 insertions, 230 deletions

diff --git a/libpod/container.go b/libpod/container.go
index 57b894b26..831e4e886 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -643,3 +643,15 @@ func (c *Container) RWSize() (int64, error) {
 	}
 	return c.rwSize()
 }
+
+// Hostname gets the container's hostname
+func (c *Container) Hostname() string {
+	if c.config.Spec.Hostname != "" {
+		return c.config.Spec.Hostname
+	}
+
+	if len(c.ID()) < 11 {
+		return c.ID()
+	}
+	return c.ID()[:12]
+}
diff --git a/libpod/container_api.go b/libpod/container_api.go
index 149197470..2dfb166ec 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -6,17 +6,12 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"time"
 
 	"github.com/docker/docker/daemon/caps"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/term"
-	spec "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/pkg/errors"
 	"github.com/projectatomic/libpod/libpod/driver"
-	crioAnnotations "github.com/projectatomic/libpod/pkg/annotations"
-	"github.com/projectatomic/libpod/pkg/chrootuser"
 	"github.com/projectatomic/libpod/pkg/inspect"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -91,194 +86,19 @@ func (c *Container) Init() (err error) {
 		return errors.Wrapf(err, "unable to copy /etc/hosts to container space")
 	}
 
-	if c.Spec().Hostname == "" {
-		id := c.ID()
-		if len(c.ID()) > 11 {
-			id = c.ID()[:12]
-		}
-		c.config.Spec.Hostname = id
-	}
-	runDirHostname, err := c.generateEtcHostname(c.config.Spec.Hostname)
+	runDirHostname, err := c.generateEtcHostname(c.Hostname())
 	if err != nil {
 		return errors.Wrapf(err, "unable to generate hostname file for container")
 	}
 
-	// Save OCI spec to disk
-	g := generate.NewFromSpec(c.config.Spec)
-	// If network namespace was requested, add it now
-	if c.config.CreateNetNS {
-		g.AddOrReplaceLinuxNamespace(spec.NetworkNamespace, c.state.NetNS.Path())
-	}
-	// Remove default /etc/shm mount
-	g.RemoveMount("/dev/shm")
-	// Mount ShmDir from host into container
-	shmMnt := spec.Mount{
-		Type:        "bind",
-		Source:      c.config.ShmDir,
-		Destination: "/dev/shm",
-		Options:     []string{"rw", "bind"},
-	}
-	g.AddMount(shmMnt)
-	// Bind mount resolv.conf
-	resolvMnt := spec.Mount{
-		Type:        "bind",
-		Source:      runDirResolv,
-		Destination: "/etc/resolv.conf",
-		Options:     []string{"rw", "bind"},
-	}
-	g.AddMount(resolvMnt)
-	// Bind mount hosts
-	hostsMnt := spec.Mount{
-		Type:        "bind",
-		Source:      runDirHosts,
-		Destination: "/etc/hosts",
-		Options:     []string{"rw", "bind"},
-	}
-	g.AddMount(hostsMnt)
-	// Bind hostname
-	hostnameMnt := spec.Mount{
-		Type:        "bind",
-		Source:      runDirHostname,
-		Destination: "/etc/hostname",
-		Options:     []string{"rw", "bind"},
-	}
-	g.AddMount(hostnameMnt)
-
-	// Bind builtin image volumes
-	if c.config.ImageVolumes {
-		if err = c.addImageVolumes(&g); err != nil {
-			return errors.Wrapf(err, "error mounting image volumes")
-		}
-	}
-
-	if c.config.User != "" {
-		if !c.state.Mounted {
-			return errors.Wrapf(ErrCtrStateInvalid, "container %s must be mounted in order to translate User field", c.ID())
-		}
-		uid, gid, err := chrootuser.GetUser(c.state.Mountpoint, c.config.User)
-		if err != nil {
-			return err
-		}
-		// User and Group must go together
-		g.SetProcessUID(uid)
-		g.SetProcessGID(gid)
-	}
-
-	// Add shared namespaces from other containers
-	if c.config.IPCNsCtr != "" {
-		ipcCtr, err := c.runtime.state.Container(c.config.IPCNsCtr)
-		if err != nil {
-			return err
-		}
-
-		nsPath, err := ipcCtr.NamespacePath(IPCNS)
-		if err != nil {
-			return err
-		}
-
-		if err := g.AddOrReplaceLinuxNamespace(spec.IPCNamespace, nsPath); err != nil {
-			return err
-		}
-	}
-	if c.config.MountNsCtr != "" {
-		mountCtr, err := c.runtime.state.Container(c.config.MountNsCtr)
-		if err != nil {
-			return err
-		}
-
-		nsPath, err := mountCtr.NamespacePath(MountNS)
-		if err != nil {
-			return err
-		}
-
-		if err := g.AddOrReplaceLinuxNamespace(spec.MountNamespace, nsPath); err != nil {
-			return err
-		}
-	}
-	if c.config.NetNsCtr != "" {
-		netCtr, err := c.runtime.state.Container(c.config.NetNsCtr)
-		if err != nil {
-			return err
-		}
-
-		nsPath, err := netCtr.NamespacePath(NetNS)
-		if err != nil {
-			return err
-		}
-
-		if err := g.AddOrReplaceLinuxNamespace(spec.NetworkNamespace, nsPath); err != nil {
-			return err
-		}
-	}
-	if c.config.PIDNsCtr != "" {
-		pidCtr, err := c.runtime.state.Container(c.config.PIDNsCtr)
-		if err != nil {
-			return err
-		}
-
-		nsPath, err := pidCtr.NamespacePath(PIDNS)
-		if err != nil {
-			return err
-		}
-
-		if err := g.AddOrReplaceLinuxNamespace(string(spec.PIDNamespace), nsPath); err != nil {
-			return err
-		}
-	}
-	if c.config.UserNsCtr != "" {
-		userCtr, err := c.runtime.state.Container(c.config.UserNsCtr)
-		if err != nil {
-			return err
-		}
-
-		nsPath, err := userCtr.NamespacePath(UserNS)
-		if err != nil {
-			return err
-		}
-
-		if err := g.AddOrReplaceLinuxNamespace(spec.UserNamespace, nsPath); err != nil {
-			return err
-		}
-	}
-	if c.config.UTSNsCtr != "" {
-		utsCtr, err := c.runtime.state.Container(c.config.UTSNsCtr)
-		if err != nil {
-			return err
-		}
-
-		nsPath, err := utsCtr.NamespacePath(UTSNS)
-		if err != nil {
-			return err
-		}
-
-		if err := g.AddOrReplaceLinuxNamespace(spec.UTSNamespace, nsPath); err != nil {
-			return err
-		}
-	}
-	if c.config.CgroupNsCtr != "" {
-		cgroupCtr, err := c.runtime.state.Container(c.config.CgroupNsCtr)
-		if err != nil {
-			return err
-		}
-
-		nsPath, err := cgroupCtr.NamespacePath(CgroupNS)
-		if err != nil {
-			return err
-		}
-
-		if err := g.AddOrReplaceLinuxNamespace(spec.CgroupNamespace, nsPath); err != nil {
-			return err
-		}
+	// Generate the OCI spec
+	spec, err := c.generateSpec(runDirResolv, runDirHosts, runDirHostname)
+	if err != nil {
+		return err
 	}
+	c.runningSpec = spec
 
-	c.runningSpec = g.Spec()
-	c.runningSpec.Root.Path = c.state.Mountpoint
-	c.runningSpec.Annotations[crioAnnotations.Created] = c.config.CreatedTime.Format(time.RFC3339Nano)
-	c.runningSpec.Annotations["org.opencontainers.image.stopSignal"] = fmt.Sprintf("%d", c.config.StopSignal)
-
-	// Set the hostname in the env variables
-	c.runningSpec.Process.Env = append(c.runningSpec.Process.Env, fmt.Sprintf("HOSTNAME=%s", c.config.Spec.Hostname))
-
+	// Save the OCI spec to disk
 	fileJSON, err := json.Marshal(c.runningSpec)
 	if err != nil {
 		return errors.Wrapf(err, "error exporting runtime spec for container %s to JSON", c.ID())
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index e22d36f99..3709e4138 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -20,6 +20,8 @@ import (
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
+	crioAnnotations "github.com/projectatomic/libpod/pkg/annotations"
+	"github.com/projectatomic/libpod/pkg/chrootuser"
 	"github.com/sirupsen/logrus"
 	"github.com/ulule/deepcopier"
 	"golang.org/x/sys/unix"
@@ -273,49 +275,6 @@ func (c *Container) export(path string) error {
 	return err
 }
 
-func (c *Container) addImageVolumes(g *generate.Generator) error {
-	mountPoint := c.state.Mountpoint
-	if !c.state.Mounted {
-		return errors.Wrapf(ErrInternal, "container is not mounted")
-	}
-
-	imageStorage, err := c.runtime.getImage(c.config.RootfsImageID)
-	if err != nil {
-		return err
-	}
-	imageData, err := c.runtime.getImageInspectInfo(*imageStorage)
-	if err != nil {
-		return err
-	}
-
-	for k := range imageData.ContainerConfig.Volumes {
-		mount := spec.Mount{
-			Destination: k,
-			Type:        "bind",
-			Options:     []string{"rbind", "rw"},
-		}
-		if MountExists(g.Mounts(), k) {
-			continue
-		}
-		volumePath := filepath.Join(c.config.StaticDir, "volumes", k)
-		if _, err := os.Stat(volumePath); os.IsNotExist(err) {
-			if err = os.MkdirAll(volumePath, 0755); err != nil {
-				return errors.Wrapf(err, "error creating directory %q for volume %q in container %q", volumePath, k, c.ID)
-			}
-			if err = label.Relabel(volumePath, c.config.MountLabel, false); err != nil {
-				return errors.Wrapf(err, "error relabeling directory %q for volume %q in container %q", volumePath, k, c.ID)
-			}
-			srcPath := filepath.Join(mountPoint, k)
-			if err = chrootarchive.NewArchiver(nil).CopyWithTar(srcPath, volumePath); err != nil && !os.IsNotExist(err) {
-				return errors.Wrapf(err, "error populating directory %q for volume %q in container %q using contents of %q", volumePath, k, c.ID, srcPath)
-			}
-			mount.Source = volumePath
-		}
-		g.AddMount(mount)
-	}
-	return nil
-}
-
 // Get path of artifact with a given name for this container
 func (c *Container) getArtifactPath(name string) string {
 	return filepath.Join(c.config.StaticDir, artifactsDir, name)
@@ -588,3 +547,175 @@ func (c *Container) generateHosts() (string, error) {
 func (c *Container) generateEtcHostname(hostname string) (string, error) {
 	return c.WriteStringToRundir("hostname", hostname)
 }
+
+// Generate spec for a container
+func (c *Container) generateSpec(resolvPath, hostsPath, hostnamePath string) (*spec.Spec, error) {
+	g := generate.NewFromSpec(c.config.Spec)
+
+	// If network namespace was requested, add it now
+	if c.config.CreateNetNS {
+		g.AddOrReplaceLinuxNamespace(spec.NetworkNamespace, c.state.NetNS.Path())
+	}
+	// Remove default /etc/shm mount
+	g.RemoveMount("/dev/shm")
+	// Mount ShmDir from host into container
+	shmMnt := spec.Mount{
+		Type:        "bind",
+		Source:      c.config.ShmDir,
+		Destination: "/dev/shm",
+		Options:     []string{"rw", "bind"},
+	}
+	g.AddMount(shmMnt)
+	// Bind mount resolv.conf
+	resolvMnt := spec.Mount{
+		Type:        "bind",
+		Source:      resolvPath,
+		Destination: "/etc/resolv.conf",
+		Options:     []string{"rw", "bind"},
+	}
+	g.AddMount(resolvMnt)
+	// Bind mount hosts
+	hostsMnt := spec.Mount{
+		Type:        "bind",
+		Source:      hostsPath,
+		Destination: "/etc/hosts",
+		Options:     []string{"rw", "bind"},
+	}
+	g.AddMount(hostsMnt)
+	// Bind hostname
+	hostnameMnt := spec.Mount{
+		Type:        "bind",
+		Source:      hostnamePath,
+		Destination: "/etc/hostname",
+		Options:     []string{"rw", "bind"},
+	}
+	g.AddMount(hostnameMnt)
+
+	// Bind builtin image volumes
+	if c.config.ImageVolumes {
+		if err := c.addImageVolumes(&g); err != nil {
+			return nil, errors.Wrapf(err, "error mounting image volumes")
+		}
+	}
+
+	if c.config.User != "" {
+		if !c.state.Mounted {
+			return nil, errors.Wrapf(ErrCtrStateInvalid, "container %s must be mounted in order to translate User field", c.ID())
+		}
+		uid, gid, err := chrootuser.GetUser(c.state.Mountpoint, c.config.User)
+		if err != nil {
+			return nil, err
+		}
+		// User and Group must go together
+		g.SetProcessUID(uid)
+		g.SetProcessGID(gid)
+	}
+
+	// Add shared namespaces from other containers
+	if c.config.IPCNsCtr != "" {
+		if err := c.addNamespaceContainer(&g, IPCNS, c.config.IPCNsCtr, spec.IPCNamespace); err != nil {
+			return nil, err
+		}
+	}
+	if c.config.MountNsCtr != "" {
+		if err := c.addNamespaceContainer(&g, MountNS, c.config.MountNsCtr, spec.MountNamespace); err != nil {
+			return nil, err
+		}
+	}
+	if c.config.NetNsCtr != "" {
+		if err := c.addNamespaceContainer(&g, NetNS, c.config.NetNsCtr, spec.NetworkNamespace); err != nil {
+			return nil, err
+		}
+	}
+	if c.config.PIDNsCtr != "" {
+		if err := c.addNamespaceContainer(&g, PIDNS, c.config.PIDNsCtr, string(spec.PIDNamespace)); err != nil {
+			return nil, err
+		}
+	}
+	if c.config.UserNsCtr != "" {
+		if err := c.addNamespaceContainer(&g, UserNS, c.config.UserNsCtr, spec.UserNamespace); err != nil {
+			return nil, err
+		}
+	}
+	if c.config.UTSNsCtr != "" {
+		if err := c.addNamespaceContainer(&g, UTSNS, c.config.UTSNsCtr, spec.UTSNamespace); err != nil {
+			return nil, err
+		}
+	}
+	if c.config.CgroupNsCtr != "" {
+		if err := c.addNamespaceContainer(&g, CgroupNS, c.config.CgroupNsCtr, spec.CgroupNamespace); err != nil {
+			return nil, err
+		}
+	}
+
+	g.SetRootPath(c.state.Mountpoint)
+	g.AddAnnotation(crioAnnotations.Created, c.config.CreatedTime.Format(time.RFC3339Nano))
+	g.AddAnnotation("org.opencontainers.image.stopSignal", fmt.Sprintf("%d", c.config.StopSignal))
+
+	g.SetHostname(c.Hostname())
+	g.AddProcessEnv("HOSTNAME", g.Spec().Hostname)
+
+	return g.Spec(), nil
+}
+
+// Add an existing container's namespace to the spec
+func (c *Container) addNamespaceContainer(g *generate.Generator, ns LinuxNS, nsCtrID string, specNS string) error {
+	nsCtr, err := c.runtime.state.Container(nsCtrID)
+	if err != nil {
+		return err
+	}
+
+	nsPath, err := nsCtr.NamespacePath(ns)
+	if err != nil {
+		return err
+	}
+
+	if err := g.AddOrReplaceLinuxNamespace(specNS, nsPath); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (c *Container) addImageVolumes(g *generate.Generator) error {
+	mountPoint := c.state.Mountpoint
+	if !c.state.Mounted {
+		return errors.Wrapf(ErrInternal, "container is not mounted")
+	}
+
+	imageStorage, err := c.runtime.getImage(c.config.RootfsImageID)
+	if err != nil {
+		return err
+	}
+	imageData, err := c.runtime.getImageInspectInfo(*imageStorage)
+	if err != nil {
+		return err
+	}
+
+	for k := range imageData.ContainerConfig.Volumes {
+		mount := spec.Mount{
+			Destination: k,
+			Type:        "bind",
+			Options:     []string{"rbind", "rw"},
+		}
+		if MountExists(g.Mounts(), k) {
+			continue
+		}
+		volumePath := filepath.Join(c.config.StaticDir, "volumes", k)
+		if _, err := os.Stat(volumePath); os.IsNotExist(err) {
+			if err = os.MkdirAll(volumePath, 0755); err != nil {
+				return errors.Wrapf(err, "error creating directory %q for volume %q in container %q", volumePath, k, c.ID)
+			}
+			if err = label.Relabel(volumePath, c.config.MountLabel, false); err != nil {
+				return errors.Wrapf(err, "error relabeling directory %q for volume %q in container %q", volumePath, k, c.ID)
+			}
+			srcPath := filepath.Join(mountPoint, k)
+			if err = chrootarchive.NewArchiver(nil).CopyWithTar(srcPath, volumePath); err != nil && !os.IsNotExist(err) {
+				return errors.Wrapf(err, "error populating directory %q for volume %q in container %q using contents of %q", volumePath, k, c.ID, srcPath)
+			}
+			mount.Source = volumePath
+		}
+		g.AddMount(mount)
+	}
+	return nil
+}