Merge pull request #5581 from baude/v2containers

podmanv2 add core container commands

3 files changed, 304 insertions, 3 deletions

diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index cdcd77246..47deb010a 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -4,11 +4,16 @@ package abi
 
 import (
 	"context"
+	"io/ioutil"
+	"strings"
 
+	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/adapter/shortcuts"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/pkg/signal"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 // TODO: Should return *entities.ContainerExistsReport, error
@@ -41,8 +46,198 @@ func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []strin
 	return responses, nil
 }
 
-func (ic *ContainerEngine) ContainerDelete(ctx context.Context, opts entities.ContainerDeleteOptions) (*entities.ContainerDeleteReport, error) {
-	panic("implement me")
+func (ic *ContainerEngine) ContainerPause(ctx context.Context, namesOrIds []string, options entities.PauseUnPauseOptions) ([]*entities.PauseUnpauseReport, error) {
+	var (
+		ctrs   []*libpod.Container
+		err    error
+		report []*entities.PauseUnpauseReport
+	)
+	if options.All {
+		ctrs, err = ic.Libpod.GetAllContainers()
+	} else {
+		ctrs, err = shortcuts.GetContainersByContext(false, false, namesOrIds, ic.Libpod)
+	}
+	if err != nil {
+		return nil, err
+	}
+	for _, c := range ctrs {
+		err := c.Pause()
+		report = append(report, &entities.PauseUnpauseReport{Id: c.ID(), Err: err})
+	}
+	return report, nil
+}
+
+func (ic *ContainerEngine) ContainerUnpause(ctx context.Context, namesOrIds []string, options entities.PauseUnPauseOptions) ([]*entities.PauseUnpauseReport, error) {
+	var (
+		ctrs   []*libpod.Container
+		err    error
+		report []*entities.PauseUnpauseReport
+	)
+	if options.All {
+		ctrs, err = ic.Libpod.GetAllContainers()
+	} else {
+		ctrs, err = shortcuts.GetContainersByContext(false, false, namesOrIds, ic.Libpod)
+	}
+	if err != nil {
+		return nil, err
+	}
+	for _, c := range ctrs {
+		err := c.Unpause()
+		report = append(report, &entities.PauseUnpauseReport{Id: c.ID(), Err: err})
+	}
+	return report, nil
+}
+func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []string, options entities.StopOptions) ([]*entities.StopReport, error) {
+	var (
+		reports []*entities.StopReport
+	)
+	names := namesOrIds
+	for _, cidFile := range options.CIDFiles {
+		content, err := ioutil.ReadFile(cidFile)
+		if err != nil {
+			return nil, errors.Wrap(err, "error reading CIDFile")
+		}
+		id := strings.Split(string(content), "\n")[0]
+		names = append(names, id)
+	}
+	ctrs, err := shortcuts.GetContainersByContext(options.All, options.Latest, names, ic.Libpod)
+	if err != nil && !(options.Ignore && errors.Cause(err) == define.ErrNoSuchCtr) {
+		return nil, err
+	}
+	for _, con := range ctrs {
+		report := entities.StopReport{Id: con.ID()}
+		err = con.StopWithTimeout(options.Timeout)
+		if err != nil {
+			// These first two are considered non-fatal under the right conditions
+			if errors.Cause(err) == define.ErrCtrStopped {
+				logrus.Debugf("Container %s is already stopped", con.ID())
+				reports = append(reports, &report)
+				continue
+
+			} else if options.All && errors.Cause(err) == define.ErrCtrStateInvalid {
+				logrus.Debugf("Container %s is not running, could not stop", con.ID())
+				reports = append(reports, &report)
+				continue
+			}
+			report.Err = err
+			reports = append(reports, &report)
+			continue
+		}
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) ContainerKill(ctx context.Context, namesOrIds []string, options entities.KillOptions) ([]*entities.KillReport, error) {
+	var (
+		reports []*entities.KillReport
+	)
+	sig, err := signal.ParseSignalNameOrNumber(options.Signal)
+	if err != nil {
+		return nil, err
+	}
+	ctrs, err := shortcuts.GetContainersByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, con := range ctrs {
+		reports = append(reports, &entities.KillReport{
+			Id:  con.ID(),
+			Err: con.Kill(uint(sig)),
+		})
+	}
+	return reports, nil
+}
+func (ic *ContainerEngine) ContainerRestart(ctx context.Context, namesOrIds []string, options entities.RestartOptions) ([]*entities.RestartReport, error) {
+	var (
+		reports []*entities.RestartReport
+	)
+	ctrs, err := shortcuts.GetContainersByContext(options.All, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, con := range ctrs {
+		timeout := con.StopTimeout()
+		if options.Timeout != nil {
+			timeout = *options.Timeout
+		}
+		reports = append(reports, &entities.RestartReport{
+			Id:  con.ID(),
+			Err: con.RestartWithTimeout(ctx, timeout),
+		})
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string, options entities.RmOptions) ([]*entities.RmReport, error) {
+	var (
+		reports []*entities.RmReport
+	)
+	if options.Storage {
+		for _, ctr := range namesOrIds {
+			report := entities.RmReport{Id: ctr}
+			if err := ic.Libpod.RemoveStorageContainer(ctr, options.Force); err != nil {
+				report.Err = err
+			}
+			reports = append(reports, &report)
+		}
+		return reports, nil
+	}
+
+	names := namesOrIds
+	for _, cidFile := range options.CIDFiles {
+		content, err := ioutil.ReadFile(cidFile)
+		if err != nil {
+			return nil, errors.Wrap(err, "error reading CIDFile")
+		}
+		id := strings.Split(string(content), "\n")[0]
+		names = append(names, id)
+	}
+
+	ctrs, err := shortcuts.GetContainersByContext(options.All, options.Latest, names, ic.Libpod)
+	if err != nil && !(options.Ignore && errors.Cause(err) == define.ErrNoSuchCtr) {
+		// Failed to get containers. If force is specified, get the containers ID
+		// and evict them
+		if !options.Force {
+			return nil, err
+		}
+
+		for _, ctr := range namesOrIds {
+			logrus.Debugf("Evicting container %q", ctr)
+			report := entities.RmReport{Id: ctr}
+			id, err := ic.Libpod.EvictContainer(ctx, ctr, options.Volumes)
+			if err != nil {
+				if options.Ignore && errors.Cause(err) == define.ErrNoSuchCtr {
+					logrus.Debugf("Ignoring error (--allow-missing): %v", err)
+					reports = append(reports, &report)
+					continue
+				}
+				report.Err = errors.Wrapf(err, "Failed to evict container: %q", id)
+				reports = append(reports, &report)
+				continue
+			}
+			reports = append(reports, &report)
+		}
+		return reports, nil
+	}
+
+	for _, c := range ctrs {
+		report := entities.RmReport{Id: c.ID()}
+		err := ic.Libpod.RemoveContainer(ctx, c, options.Force, options.Volumes)
+		if err != nil {
+			if options.Ignore && errors.Cause(err) == define.ErrNoSuchCtr {
+				logrus.Debugf("Ignoring error (--allow-missing): %v", err)
+				reports = append(reports, &report)
+				continue
+			}
+			logrus.Debugf("Failed to remove container %s: %s", c.ID(), err.Error())
+			report.Err = err
+			reports = append(reports, &report)
+			continue
+		}
+		reports = append(reports, &report)
+	}
+	return reports, nil
 }
 
 func (ic *ContainerEngine) ContainerPrune(ctx context.Context) (*entities.ContainerPruneReport, error) {
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 8bf74126d..21f62df6b 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -40,3 +40,108 @@ func (r *ContainerEngine) ContainerDelete(ctx context.Context, opts entities.Con
 func (r *ContainerEngine) ContainerPrune(ctx context.Context) (*entities.ContainerPruneReport, error) {
 	panic("implement me")
 }
+func (ic *ContainerEngine) ContainerPause(ctx context.Context, namesOrIds []string, options entities.PauseUnPauseOptions) ([]*entities.PauseUnpauseReport, error) {
+	var (
+		reports []*entities.PauseUnpauseReport
+	)
+	ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
+	if err != nil {
+		return nil, err
+	}
+	for _, c := range ctrs {
+		err := containers.Pause(ic.ClientCxt, c.ID)
+		reports = append(reports, &entities.PauseUnpauseReport{Id: c.ID, Err: err})
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) ContainerUnpause(ctx context.Context, namesOrIds []string, options entities.PauseUnPauseOptions) ([]*entities.PauseUnpauseReport, error) {
+	var (
+		reports []*entities.PauseUnpauseReport
+	)
+	ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
+	if err != nil {
+		return nil, err
+	}
+	for _, c := range ctrs {
+		err := containers.Unpause(ic.ClientCxt, c.ID)
+		reports = append(reports, &entities.PauseUnpauseReport{Id: c.ID, Err: err})
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []string, options entities.StopOptions) ([]*entities.StopReport, error) {
+	var (
+		reports []*entities.StopReport
+	)
+	ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
+	if err != nil {
+		return nil, err
+	}
+	for _, c := range ctrs {
+		report := entities.StopReport{Id: c.ID}
+		report.Err = containers.Stop(ic.ClientCxt, c.ID, &options.Timeout)
+		// TODO we need to associate errors returned by http with common
+		// define.errors so that we can equity tests. this will allow output
+		// to be the same as the native client
+		reports = append(reports, &report)
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) ContainerKill(ctx context.Context, namesOrIds []string, options entities.KillOptions) ([]*entities.KillReport, error) {
+	var (
+		reports []*entities.KillReport
+	)
+	ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
+	if err != nil {
+		return nil, err
+	}
+	for _, c := range ctrs {
+		reports = append(reports, &entities.KillReport{
+			Id:  c.ID,
+			Err: containers.Kill(ic.ClientCxt, c.ID, options.Signal),
+		})
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) ContainerRestart(ctx context.Context, namesOrIds []string, options entities.RestartOptions) ([]*entities.RestartReport, error) {
+	var (
+		reports []*entities.RestartReport
+		timeout *int
+	)
+	if options.Timeout != nil {
+		t := int(*options.Timeout)
+		timeout = &t
+	}
+	ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
+	if err != nil {
+		return nil, err
+	}
+	for _, c := range ctrs {
+		reports = append(reports, &entities.RestartReport{
+			Id:  c.ID,
+			Err: containers.Restart(ic.ClientCxt, c.ID, timeout),
+		})
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string, options entities.RmOptions) ([]*entities.RmReport, error) {
+	var (
+		reports []*entities.RmReport
+	)
+	ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
+	if err != nil {
+		return nil, err
+	}
+	// TODO there is no endpoint for container eviction.  Need to discuss
+	for _, c := range ctrs {
+		reports = append(reports, &entities.RmReport{
+			Id:  c.ID,
+			Err: containers.Remove(ic.ClientCxt, c.ID, &options.Force, &options.Volumes),
+		})
+	}
+	return reports, nil
+}
diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go
index d5a3224c2..11fca5278 100644
--- a/pkg/domain/infra/tunnel/helpers.go
+++ b/pkg/domain/infra/tunnel/helpers.go
@@ -2,6 +2,7 @@ package tunnel
 
 import (
 	"context"
+	"strings"
 
 	"github.com/containers/libpod/pkg/api/handlers/libpod"
 	"github.com/containers/libpod/pkg/bindings"
@@ -27,7 +28,7 @@ func getContainersByContext(contextWithConnection context.Context, all bool, nam
 	for _, id := range namesOrIds {
 		var found bool
 		for _, con := range c {
-			if id == con.ID || util.StringInSlice(id, con.Names) {
+			if id == con.ID || strings.HasPrefix(con.ID, id) || util.StringInSlice(id, con.Names) {
 				cons = append(cons, con)
 				found = true
 				break