podmanv2 enable remote wait

enable remote container wait with condition

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

4 files changed, 66 insertions, 9 deletions

diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go
index 45ce1f1fb..0e1208b3b 100644
--- a/pkg/domain/entities/containers.go
+++ b/pkg/domain/entities/containers.go
@@ -1,9 +1,13 @@
 package entities
 
-import "time"
+import (
+	"time"
+
+	"github.com/containers/libpod/libpod/define"
+)
 
 type WaitOptions struct {
-	Condition string
+	Condition define.ContainerStatus
 	Interval  time.Duration
 	Latest    bool
 }
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 2332c2874..cdcd77246 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -24,18 +24,13 @@ func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []strin
 	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)
+		exitCode, err := c.WaitForConditionWithInterval(options.Interval, options.Condition)
 		if err != nil {
 			response.Error = err
 		} else {
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index d2d93d51b..8bf74126d 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -13,7 +13,24 @@ func (ic *ContainerEngine) ContainerExists(ctx context.Context, nameOrId string)
 }
 
 func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []string, options entities.WaitOptions) ([]entities.WaitReport, error) {
-	return nil, nil
+	var (
+		responses []entities.WaitReport
+	)
+	cons, err := getContainersByContext(ic.ClientCxt, false, namesOrIds)
+	if err != nil {
+		return nil, err
+	}
+	for _, c := range cons {
+		response := entities.WaitReport{Id: c.ID}
+		exitCode, err := containers.Wait(ic.ClientCxt, c.ID, &options.Condition)
+		if err != nil {
+			response.Error = err
+		} else {
+			response.ExitCode = exitCode
+		}
+		responses = append(responses, response)
+	}
+	return responses, nil
 }
 
 func (r *ContainerEngine) ContainerDelete(ctx context.Context, opts entities.ContainerDeleteOptions) (*entities.ContainerDeleteReport, error) {
diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go
new file mode 100644
index 000000000..d5a3224c2
--- /dev/null
+++ b/pkg/domain/infra/tunnel/helpers.go
@@ -0,0 +1,41 @@
+package tunnel
+
+import (
+	"context"
+
+	"github.com/containers/libpod/pkg/api/handlers/libpod"
+	"github.com/containers/libpod/pkg/bindings"
+	"github.com/containers/libpod/pkg/bindings/containers"
+	"github.com/containers/libpod/pkg/util"
+	"github.com/pkg/errors"
+)
+
+func getContainersByContext(contextWithConnection context.Context, all bool, namesOrIds []string) ([]libpod.ListContainer, error) {
+	var (
+		cons []libpod.ListContainer
+	)
+	if all && len(namesOrIds) > 0 {
+		return nil, errors.New("cannot lookup containers and all")
+	}
+	c, err := containers.List(contextWithConnection, nil, &bindings.PTrue, nil, nil, nil, &bindings.PTrue)
+	if err != nil {
+		return nil, err
+	}
+	if all {
+		return c, err
+	}
+	for _, id := range namesOrIds {
+		var found bool
+		for _, con := range c {
+			if id == con.ID || util.StringInSlice(id, con.Names) {
+				cons = append(cons, con)
+				found = true
+				break
+			}
+		}
+		if !found {
+			return nil, errors.Errorf("unable to find container %q", id)
+		}
+	}
+	return cons, nil
+}