1 files changed, 91 insertions, 69 deletions

diff --git a/pkg/adapter/runtime_remote.go b/pkg/adapter/runtime_remote.go
index 29b43e9b0..6c53d0c62 100644
--- a/pkg/adapter/runtime_remote.go
+++ b/pkg/adapter/runtime_remote.go
@@ -5,12 +5,12 @@ package adapter
 import (
 	"bufio"
 	"context"
-	"encoding/json"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
 	"strings"
+	"text/template"
 	"time"
 
 	"github.com/containers/buildah/imagebuildah"
@@ -19,6 +19,7 @@ import (
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/cmd/podman/varlink"
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/events"
 	"github.com/containers/libpod/libpod/image"
 	"github.com/containers/libpod/utils"
 	"github.com/containers/storage/pkg/archive"
@@ -49,14 +50,13 @@ func GetRuntime(c *cliconfig.PodmanCommand) (*LocalRuntime, error) {
 	if err != nil {
 		return nil, err
 	}
-	rr := RemoteRuntime{
-		Conn:   conn,
-		Remote: true,
-	}
-	foo := LocalRuntime{
-		&rr,
-	}
-	return &foo, nil
+
+	return &LocalRuntime{
+		&RemoteRuntime{
+			Conn:   conn,
+			Remote: true,
+		},
+	}, nil
 }
 
 // Shutdown is a bogus wrapper for compat with the libpod runtime
@@ -315,66 +315,6 @@ func (ci *ContainerImage) History(ctx context.Context) ([]*image.History, error)
 	return imageHistories, nil
 }
 
-// LookupContainer gets basic information about container over a varlink
-// connection and then translates it to a *Container
-func (r *LocalRuntime) LookupContainer(idOrName string) (*Container, error) {
-	state, err := r.ContainerState(idOrName)
-	if err != nil {
-		return nil, err
-	}
-	config := r.Config(idOrName)
-	if err != nil {
-		return nil, err
-	}
-
-	rc := remoteContainer{
-		r,
-		config,
-		state,
-	}
-
-	c := Container{
-		rc,
-	}
-	return &c, nil
-}
-
-func (r *LocalRuntime) GetLatestContainer() (*Container, error) {
-	return nil, libpod.ErrNotImplemented
-}
-
-// ContainerState returns the "state" of the container.
-func (r *LocalRuntime) ContainerState(name string) (*libpod.ContainerState, error) { //no-lint
-	reply, err := iopodman.ContainerStateData().Call(r.Conn, name)
-	if err != nil {
-		return nil, err
-	}
-	data := libpod.ContainerState{}
-	if err := json.Unmarshal([]byte(reply), &data); err != nil {
-		return nil, err
-	}
-	return &data, err
-
-}
-
-// Config returns a container config
-func (r *LocalRuntime) Config(name string) *libpod.ContainerConfig {
-	// TODO the Spec being returned is not populated.  Matt and I could not figure out why.  Will defer
-	// further looking into it for after devconf.
-	// The libpod function for this has no errors so we are kind of in a tough
-	// spot here.  Logging the errors for now.
-	reply, err := iopodman.ContainerConfig().Call(r.Conn, name)
-	if err != nil {
-		logrus.Error("call to container.config failed")
-	}
-	data := libpod.ContainerConfig{}
-	if err := json.Unmarshal([]byte(reply), &data); err != nil {
-		logrus.Error("failed to unmarshal container inspect data")
-	}
-	return &data
-
-}
-
 // PruneImages is the wrapper call for a remote-client to prune images
 func (r *LocalRuntime) PruneImages(all bool) ([]string, error) {
 	return iopodman.ImagesPrune().Call(r.Conn, all)
@@ -808,3 +748,85 @@ func IsImageNotFound(err error) bool {
 	}
 	return false
 }
+
+// HealthCheck executes a container's healthcheck over a varlink connection
+func (r *LocalRuntime) HealthCheck(c *cliconfig.HealthCheckValues) (libpod.HealthCheckStatus, error) {
+	return -1, libpod.ErrNotImplemented
+}
+
+// JoinOrCreateRootlessPod joins the specified pod if it is running or it creates a new user namespace
+// if the pod is stopped
+func (r *LocalRuntime) JoinOrCreateRootlessPod(pod *Pod) (bool, int, error) {
+	// Nothing to do in the remote case
+	return true, 0, nil
+}
+
+// Events monitors libpod/podman events over a varlink connection
+func (r *LocalRuntime) Events(c *cliconfig.EventValues) error {
+	var more uint64
+	if c.Stream {
+		more = uint64(varlink.More)
+	}
+	reply, err := iopodman.GetEvents().Send(r.Conn, more, c.Filter, c.Since, c.Until)
+	if err != nil {
+		return errors.Wrapf(err, "unable to obtain events")
+	}
+
+	w := bufio.NewWriter(os.Stdout)
+	tmpl, err := template.New("events").Parse(c.Format)
+	if err != nil {
+		return err
+	}
+
+	for {
+		returnedEvent, flags, err := reply()
+		if err != nil {
+			// When the error handling is back into podman, we can flip this to a better way to check
+			// for problems. For now, this works.
+			return err
+		}
+		if returnedEvent.Time == "" && returnedEvent.Status == "" && returnedEvent.Type == "" {
+			// We got a blank event return, signals end of stream in certain cases
+			break
+		}
+		eTime, err := time.Parse(time.RFC3339Nano, returnedEvent.Time)
+		if err != nil {
+			return errors.Wrapf(err, "unable to parse time of event %s", returnedEvent.Time)
+		}
+		eType, err := events.StringToType(returnedEvent.Type)
+		if err != nil {
+			return err
+		}
+		eStatus, err := events.StringToStatus(returnedEvent.Status)
+		if err != nil {
+			return err
+		}
+		event := events.Event{
+			ID:     returnedEvent.Id,
+			Image:  returnedEvent.Image,
+			Name:   returnedEvent.Name,
+			Status: eStatus,
+			Time:   eTime,
+			Type:   eType,
+		}
+		if len(c.Format) > 0 {
+			if err := tmpl.Execute(w, event); err != nil {
+				return err
+			}
+		} else {
+			if _, err := w.Write([]byte(event.ToHumanReadable())); err != nil {
+				return err
+			}
+		}
+		if _, err := w.Write([]byte("\n")); err != nil {
+			return err
+		}
+		if err := w.Flush(); err != nil {
+			return err
+		}
+		if flags&varlink.Continues == 0 {
+			break
+		}
+	}
+	return nil
+}