podmanv2 container exists|wait

enable container exists and wait for podmanv2

Signed-off-by: Brent Baude <bbaude@redhat.com>

12 files changed, 142 insertions, 96 deletions

diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go
index 1899b98f7..e688e4fd3 100644
--- a/pkg/domain/entities/containers.go
+++ b/pkg/domain/entities/containers.go
@@ -1 +1,15 @@
 package entities
+
+import "time"
+
+type WaitOptions struct {
+	Condition string
+	Interval  time.Duration
+	Latest    bool
+}
+
+type WaitReport struct {
+	Id       string
+	Error    error
+	ExitCode int32
+}
diff --git a/pkg/domain/entities/engine.go b/pkg/domain/entities/engine.go
index a1096f1f1..08ef1df92 100644
--- a/pkg/domain/entities/engine.go
+++ b/pkg/domain/entities/engine.go
@@ -1,7 +1,6 @@
 package entities
 
 import (
-	"net/url"
 	"os/user"
 	"path/filepath"
 
@@ -20,11 +19,13 @@ func (m EngineMode) String() string {
 	return string(m)
 }
 
+// FIXME: merge EngineOptions and EngineFlags
 type EngineOptions struct {
-	Uri        *url.URL
+	Uri        string
 	Identities []string
-	FlagSet    pflag.FlagSet
+	FlagSet    *pflag.FlagSet
 	Flags      EngineFlags
+	EngineMode EngineMode
 }
 
 type EngineFlags struct {
@@ -58,8 +59,6 @@ type EngineFlags struct {
 	Port                 int
 	IdentityFile         string
 	IgnoreHosts          bool
-
-	EngineMode EngineMode
 }
 
 func NewEngineOptions() (EngineFlags, error) {
diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go
index d08f37d44..53f8f88f5 100644
--- a/pkg/domain/entities/engine_container.go
+++ b/pkg/domain/entities/engine_container.go
@@ -5,22 +5,12 @@ import (
 )
 
 type ContainerEngine interface {
-	ContainerRuntime
-	PodRuntime
-	VolumeRuntime
-}
-
-type ContainerRuntime interface {
 	ContainerDelete(ctx context.Context, opts ContainerDeleteOptions) (*ContainerDeleteReport, error)
 	ContainerPrune(ctx context.Context) (*ContainerPruneReport, error)
-}
-
-type PodRuntime interface {
+	ContainerExists(ctx context.Context, nameOrId string) (bool, error)
+	ContainerWait(ctx context.Context, namesOrIds []string, options WaitOptions) ([]WaitReport, error)
 	PodDelete(ctx context.Context, opts PodPruneOptions) (*PodDeleteReport, error)
 	PodPrune(ctx context.Context) (*PodPruneReport, error)
-}
-
-type VolumeRuntime interface {
 	VolumeDelete(ctx context.Context, opts VolumeDeleteOptions) (*VolumeDeleteReport, error)
 	VolumePrune(ctx context.Context) (*VolumePruneReport, error)
 }
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
new file mode 100644
index 000000000..618e9a111
--- /dev/null
+++ b/pkg/domain/infra/abi/containers.go
@@ -0,0 +1,71 @@
+// +build ABISupport
+
+package abi
+
+import (
+	"context"
+
+	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/adapter/shortcuts"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
+)
+
+// TODO: Should return *entities.ContainerExistsReport, error
+func (ic *ContainerEngine) ContainerExists(ctx context.Context, nameOrId string) (bool, error) {
+	_, err := ic.Libpod.LookupContainer(nameOrId)
+	if err != nil && errors.Cause(err) != define.ErrNoSuchCtr {
+		return false, err
+	}
+	return err == nil, nil
+}
+
+func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []string, options entities.WaitOptions) ([]entities.WaitReport, error) {
+	var (
+		responses []entities.WaitReport
+	)
+	condition, err := define.StringToContainerStatus(options.Condition)
+	if err != nil {
+		return nil, err
+	}
+
+	ctrs, err := shortcuts.GetContainersByContext(false, options.Latest, namesOrIds, ic.Libpod)
+	if err != nil {
+		return nil, err
+	}
+	for _, c := range ctrs {
+		response := entities.WaitReport{Id: c.ID()}
+		exitCode, err := c.WaitForConditionWithInterval(options.Interval, condition)
+		if err != nil {
+			response.Error = err
+		} else {
+			response.ExitCode = exitCode
+		}
+		responses = append(responses, response)
+	}
+	return responses, nil
+}
+
+func (ic *ContainerEngine) ContainerDelete(ctx context.Context, opts entities.ContainerDeleteOptions) (*entities.ContainerDeleteReport, error) {
+	panic("implement me")
+}
+
+func (ic *ContainerEngine) ContainerPrune(ctx context.Context) (*entities.ContainerPruneReport, error) {
+	panic("implement me")
+}
+
+func (ic *ContainerEngine) PodDelete(ctx context.Context, opts entities.PodPruneOptions) (*entities.PodDeleteReport, error) {
+	panic("implement me")
+}
+
+func (ic *ContainerEngine) PodPrune(ctx context.Context) (*entities.PodPruneReport, error) {
+	panic("implement me")
+}
+
+func (ic *ContainerEngine) VolumeDelete(ctx context.Context, opts entities.VolumeDeleteOptions) (*entities.VolumeDeleteReport, error) {
+	panic("implement me")
+}
+
+func (ic *ContainerEngine) VolumePrune(ctx context.Context) (*entities.VolumePruneReport, error) {
+	panic("implement me")
+}
diff --git a/pkg/domain/infra/abi/runtime.go b/pkg/domain/infra/abi/runtime.go
index 479a69586..b53fb6d3a 100644
--- a/pkg/domain/infra/abi/runtime.go
+++ b/pkg/domain/infra/abi/runtime.go
@@ -4,7 +4,6 @@ package abi
 
 import (
 	"github.com/containers/libpod/libpod"
-	"github.com/containers/libpod/pkg/domain/entities"
 )
 
 // Image-related runtime linked against libpod library
@@ -14,6 +13,5 @@ type ImageEngine struct {
 
 // Container-related runtime linked against libpod library
 type ContainerEngine struct {
-	entities.ContainerEngine
 	Libpod *libpod.Runtime
 }
diff --git a/pkg/domain/infra/runtime_abi.go b/pkg/domain/infra/runtime_abi.go
index de996f567..31f832423 100644
--- a/pkg/domain/infra/runtime_abi.go
+++ b/pkg/domain/infra/runtime_abi.go
@@ -8,32 +8,31 @@ import (
 
 	"github.com/containers/libpod/pkg/bindings"
 	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/domain/infra/abi"
 	"github.com/containers/libpod/pkg/domain/infra/tunnel"
 )
 
 // NewContainerEngine factory provides a libpod runtime for container-related operations
-func NewContainerEngine(mode entities.EngineMode, opts entities.EngineOptions) (entities.ContainerEngine, error) {
-	switch mode {
+func NewContainerEngine(opts entities.EngineOptions) (entities.ContainerEngine, error) {
+	switch opts.EngineMode {
 	case entities.ABIMode:
 		r, err := NewLibpodRuntime(opts.FlagSet, opts.Flags)
-		return &abi.ContainerEngine{ContainerEngine: r}, err
+		return r, err
 	case entities.TunnelMode:
-		ctx, err := bindings.NewConnection(context.Background(), opts.Uri.String(), opts.Identities...)
+		ctx, err := bindings.NewConnection(context.Background(), opts.Uri, opts.Identities...)
 		return &tunnel.ContainerEngine{ClientCxt: ctx}, err
 	}
-	return nil, fmt.Errorf("runtime mode '%v' is not supported", mode)
+	return nil, fmt.Errorf("runtime mode '%v' is not supported", opts.EngineMode)
 }
 
 // NewContainerEngine factory provides a libpod runtime for image-related operations
-func NewImageEngine(mode entities.EngineMode, opts entities.EngineOptions) (entities.ImageEngine, error) {
-	switch mode {
+func NewImageEngine(opts entities.EngineOptions) (entities.ImageEngine, error) {
+	switch opts.EngineMode {
 	case entities.ABIMode:
 		r, err := NewLibpodImageRuntime(opts.FlagSet, opts.Flags)
 		return r, err
 	case entities.TunnelMode:
-		ctx, err := bindings.NewConnection(context.Background(), opts.Uri.String(), opts.Identities...)
+		ctx, err := bindings.NewConnection(context.Background(), opts.Uri, opts.Identities...)
 		return &tunnel.ImageEngine{ClientCxt: ctx}, err
 	}
-	return nil, fmt.Errorf("runtime mode '%v' is not supported", mode)
+	return nil, fmt.Errorf("runtime mode '%v' is not supported", opts.EngineMode)
 }
diff --git a/pkg/domain/infra/runtime_image_proxy.go b/pkg/domain/infra/runtime_image_proxy.go
index 480e7c8d7..d2e66c08c 100644
--- a/pkg/domain/infra/runtime_image_proxy.go
+++ b/pkg/domain/infra/runtime_image_proxy.go
@@ -12,14 +12,10 @@ import (
 
 // ContainerEngine Image Proxy will be EOL'ed after podmanV2 is separated from libpod repo
 
-func NewLibpodImageRuntime(flags pflag.FlagSet, opts entities.EngineFlags) (entities.ImageEngine, error) {
+func NewLibpodImageRuntime(flags *pflag.FlagSet, opts entities.EngineFlags) (entities.ImageEngine, error) {
 	r, err := GetRuntime(context.Background(), flags, opts)
 	if err != nil {
 		return nil, err
 	}
 	return &abi.ImageEngine{Libpod: r}, nil
 }
-
-func (ir *runtime) ShutdownImageRuntime(force bool) error {
-	return ir.Libpod.Shutdown(force)
-}
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go
index b42c52b6e..b835152bf 100644
--- a/pkg/domain/infra/runtime_libpod.go
+++ b/pkg/domain/infra/runtime_libpod.go
@@ -26,7 +26,7 @@ type engineOpts struct {
 }
 
 // GetRuntimeMigrate gets a libpod runtime that will perform a migration of existing containers
-func GetRuntimeMigrate(ctx context.Context, fs flag.FlagSet, ef entities.EngineFlags, newRuntime string) (*libpod.Runtime, error) {
+func GetRuntimeMigrate(ctx context.Context, fs *flag.FlagSet, ef entities.EngineFlags, newRuntime string) (*libpod.Runtime, error) {
 	return getRuntime(ctx, fs, &engineOpts{
 		name:     newRuntime,
 		renumber: false,
@@ -38,7 +38,7 @@ func GetRuntimeMigrate(ctx context.Context, fs flag.FlagSet, ef entities.EngineF
 }
 
 // GetRuntimeDisableFDs gets a libpod runtime that will disable sd notify
-func GetRuntimeDisableFDs(ctx context.Context, fs flag.FlagSet, ef entities.EngineFlags) (*libpod.Runtime, error) {
+func GetRuntimeDisableFDs(ctx context.Context, fs *flag.FlagSet, ef entities.EngineFlags) (*libpod.Runtime, error) {
 	return getRuntime(ctx, fs, &engineOpts{
 		renumber: false,
 		migrate:  false,
@@ -49,7 +49,7 @@ func GetRuntimeDisableFDs(ctx context.Context, fs flag.FlagSet, ef entities.Engi
 }
 
 // GetRuntimeRenumber gets a libpod runtime that will perform a lock renumber
-func GetRuntimeRenumber(ctx context.Context, fs flag.FlagSet, ef entities.EngineFlags) (*libpod.Runtime, error) {
+func GetRuntimeRenumber(ctx context.Context, fs *flag.FlagSet, ef entities.EngineFlags) (*libpod.Runtime, error) {
 	return getRuntime(ctx, fs, &engineOpts{
 		renumber: true,
 		migrate:  false,
@@ -60,7 +60,7 @@ func GetRuntimeRenumber(ctx context.Context, fs flag.FlagSet, ef entities.Engine
 }
 
 // GetRuntime generates a new libpod runtime configured by command line options
-func GetRuntime(ctx context.Context, flags flag.FlagSet, ef entities.EngineFlags) (*libpod.Runtime, error) {
+func GetRuntime(ctx context.Context, flags *flag.FlagSet, ef entities.EngineFlags) (*libpod.Runtime, error) {
 	return getRuntime(ctx, flags, &engineOpts{
 		renumber: false,
 		migrate:  false,
@@ -71,7 +71,7 @@ func GetRuntime(ctx context.Context, flags flag.FlagSet, ef entities.EngineFlags
 }
 
 // GetRuntimeNoStore generates a new libpod runtime configured by command line options
-func GetRuntimeNoStore(ctx context.Context, fs flag.FlagSet, ef entities.EngineFlags) (*libpod.Runtime, error) {
+func GetRuntimeNoStore(ctx context.Context, fs *flag.FlagSet, ef entities.EngineFlags) (*libpod.Runtime, error) {
 	return getRuntime(ctx, fs, &engineOpts{
 		renumber: false,
 		migrate:  false,
@@ -81,7 +81,7 @@ func GetRuntimeNoStore(ctx context.Context, fs flag.FlagSet, ef entities.EngineF
 	})
 }
 
-func getRuntime(ctx context.Context, fs flag.FlagSet, opts *engineOpts) (*libpod.Runtime, error) {
+func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpod.Runtime, error) {
 	options := []libpod.RuntimeOption{}
 	storageOpts := storage.StoreOptions{}
 	storageSet := false
diff --git a/pkg/domain/infra/runtime_proxy.go b/pkg/domain/infra/runtime_proxy.go
index d17b8efa1..4095ae6e2 100644
--- a/pkg/domain/infra/runtime_proxy.go
+++ b/pkg/domain/infra/runtime_proxy.go
@@ -5,50 +5,17 @@ package infra
 import (
 	"context"
 
-	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/containers/libpod/pkg/domain/infra/abi"
 	flag "github.com/spf13/pflag"
 )
 
 // ContainerEngine Proxy will be EOL'ed after podmanV2 is separated from libpod repo
 
-type runtime struct {
-	entities.ContainerEngine
-	Libpod *libpod.Runtime
-}
-
-func NewLibpodRuntime(flags flag.FlagSet, opts entities.EngineFlags) (entities.ContainerEngine, error) {
+func NewLibpodRuntime(flags *flag.FlagSet, opts entities.EngineFlags) (entities.ContainerEngine, error) {
 	r, err := GetRuntime(context.Background(), flags, opts)
 	if err != nil {
 		return nil, err
 	}
-	return &runtime{Libpod: r}, nil
-}
-
-func (r *runtime) ShutdownRuntime(force bool) error {
-	return r.Libpod.Shutdown(force)
-}
-
-func (r *runtime) ContainerDelete(ctx context.Context, opts entities.ContainerDeleteOptions) (*entities.ContainerDeleteReport, error) {
-	panic("implement me")
-}
-
-func (r *runtime) ContainerPrune(ctx context.Context) (*entities.ContainerPruneReport, error) {
-	panic("implement me")
-}
-
-func (r *runtime) PodDelete(ctx context.Context, opts entities.PodPruneOptions) (*entities.PodDeleteReport, error) {
-	panic("implement me")
-}
-
-func (r *runtime) PodPrune(ctx context.Context) (*entities.PodPruneReport, error) {
-	panic("implement me")
-}
-
-func (r *runtime) VolumeDelete(ctx context.Context, opts entities.VolumeDeleteOptions) (*entities.VolumeDeleteReport, error) {
-	panic("implement me")
-}
-
-func (r *runtime) VolumePrune(ctx context.Context) (*entities.VolumePruneReport, error) {
-	panic("implement me")
+	return &abi.ContainerEngine{Libpod: r}, nil
 }
diff --git a/pkg/domain/infra/runtime_tunnel.go b/pkg/domain/infra/runtime_tunnel.go
index 8a606deaf..5816ef0c0 100644
--- a/pkg/domain/infra/runtime_tunnel.go
+++ b/pkg/domain/infra/runtime_tunnel.go
@@ -11,25 +11,25 @@ import (
 	"github.com/containers/libpod/pkg/domain/infra/tunnel"
 )
 
-func NewContainerEngine(mode entities.EngineMode, opts entities.EngineOptions) (entities.ContainerEngine, error) {
-	switch mode {
+func NewContainerEngine(opts entities.EngineOptions) (entities.ContainerEngine, error) {
+	switch opts.EngineMode {
 	case entities.ABIMode:
 		return nil, fmt.Errorf("direct runtime not supported")
 	case entities.TunnelMode:
-		ctx, err := bindings.NewConnection(context.Background(), opts.Uri.String(), opts.Identities...)
+		ctx, err := bindings.NewConnection(context.Background(), opts.Uri, opts.Identities...)
 		return &tunnel.ContainerEngine{ClientCxt: ctx}, err
 	}
-	return nil, fmt.Errorf("runtime mode '%v' is not supported", mode)
+	return nil, fmt.Errorf("runtime mode '%v' is not supported", opts.EngineMode)
 }
 
 // NewImageEngine factory provides a libpod runtime for image-related operations
-func NewImageEngine(mode entities.EngineMode, opts entities.EngineOptions) (entities.ImageEngine, error) {
-	switch mode {
+func NewImageEngine(opts entities.EngineOptions) (entities.ImageEngine, error) {
+	switch opts.EngineMode {
 	case entities.ABIMode:
 		return nil, fmt.Errorf("direct image runtime not supported")
 	case entities.TunnelMode:
-		ctx, err := bindings.NewConnection(context.Background(), opts.Uri.String(), opts.Identities...)
+		ctx, err := bindings.NewConnection(context.Background(), opts.Uri, opts.Identities...)
 		return &tunnel.ImageEngine{ClientCxt: ctx}, err
 	}
-	return nil, fmt.Errorf("runtime mode '%v' is not supported", mode)
+	return nil, fmt.Errorf("runtime mode '%v' is not supported", opts.EngineMode)
 }
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
new file mode 100644
index 000000000..84b6f2906
--- /dev/null
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -0,0 +1,24 @@
+package tunnel
+
+import (
+	"context"
+
+	"github.com/containers/libpod/pkg/bindings/containers"
+	"github.com/containers/libpod/pkg/domain/entities"
+)
+
+func (ic *ContainerEngine) ContainerExists(ctx context.Context, nameOrId string) (bool, error) {
+	return containers.Exists(ctx, nameOrId)
+}
+
+func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []string, options entities.WaitOptions) ([]entities.WaitReport, error) {
+	return nil, nil
+}
+
+func (r *ContainerEngine) ContainerDelete(ctx context.Context, opts entities.ContainerDeleteOptions) (*entities.ContainerDeleteReport, error) {
+	panic("implement me")
+}
+
+func (r *ContainerEngine) ContainerPrune(ctx context.Context) (*entities.ContainerPruneReport, error) {
+	panic("implement me")
+}
diff --git a/pkg/domain/infra/tunnel/runtime.go b/pkg/domain/infra/tunnel/runtime.go
index af433a6d9..eb9b34e4a 100644
--- a/pkg/domain/infra/tunnel/runtime.go
+++ b/pkg/domain/infra/tunnel/runtime.go
@@ -16,18 +16,6 @@ type ContainerEngine struct {
 	ClientCxt context.Context
 }
 
-func (r *ContainerEngine) Shutdown(force bool) error {
-	return nil
-}
-
-func (r *ContainerEngine) ContainerDelete(ctx context.Context, opts entities.ContainerDeleteOptions) (*entities.ContainerDeleteReport, error) {
-	panic("implement me")
-}
-
-func (r *ContainerEngine) ContainerPrune(ctx context.Context) (*entities.ContainerPruneReport, error) {
-	panic("implement me")
-}
-
 func (r *ContainerEngine) PodDelete(ctx context.Context, opts entities.PodPruneOptions) (*entities.PodDeleteReport, error) {
 	panic("implement me")
 }