Podman V2 birth

remote podman v1 and replace with podman v2.

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

6 files changed, 0 insertions, 498 deletions

diff --git a/cmd/podmanV2/system/events.go b/cmd/podmanV2/system/events.go
deleted file mode 100644
index 95e6a5576..000000000
--- a/cmd/podmanV2/system/events.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package system
-
-import (
-	"bufio"
-	"context"
-	"html/template"
-	"os"
-
-	"github.com/containers/buildah/pkg/formats"
-	"github.com/containers/libpod/cmd/podmanV2/registry"
-	"github.com/containers/libpod/libpod/events"
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-)
-
-var (
-	eventsDescription = "Monitor podman events"
-	eventsCommand     = &cobra.Command{
-		Use:   "events",
-		Args:  cobra.NoArgs,
-		Short: "Show podman events",
-		Long:  eventsDescription,
-		RunE:  eventsCmd,
-		Example: `podman events
-  podman events --filter event=create
-  podman events --since 1h30s`,
-	}
-)
-
-var (
-	eventOptions entities.EventsOptions
-	eventFormat  string
-)
-
-func init() {
-	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
-		Command: eventsCommand,
-	})
-	flags := eventsCommand.Flags()
-	flags.StringArrayVar(&eventOptions.Filter, "filter", []string{}, "filter output")
-	flags.StringVar(&eventFormat, "format", "", "format the output using a Go template")
-	flags.BoolVar(&eventOptions.Stream, "stream", true, "stream new events; for testing only")
-	flags.StringVar(&eventOptions.Since, "since", "", "show all events created since timestamp")
-	flags.StringVar(&eventOptions.Until, "until", "", "show all events until timestamp")
-	_ = flags.MarkHidden("stream")
-}
-
-func eventsCmd(cmd *cobra.Command, args []string) error {
-	var (
-		err         error
-		eventsError error
-		tmpl        *template.Template
-	)
-	if eventFormat != formats.JSONString {
-		tmpl, err = template.New("events").Parse(eventFormat)
-		if err != nil {
-			return err
-		}
-	}
-	if len(eventOptions.Since) > 0 || len(eventOptions.Until) > 0 {
-		eventOptions.FromStart = true
-	}
-	eventChannel := make(chan *events.Event)
-	eventOptions.EventChan = eventChannel
-
-	go func() {
-		eventsError = registry.ContainerEngine().Events(context.Background(), eventOptions)
-	}()
-	if eventsError != nil {
-		return eventsError
-	}
-
-	w := bufio.NewWriter(os.Stdout)
-	for event := range eventChannel {
-		switch {
-		case eventFormat == formats.JSONString:
-			jsonStr, err := event.ToJSONString()
-			if err != nil {
-				return errors.Wrapf(err, "unable to format json")
-			}
-			if _, err := w.Write([]byte(jsonStr)); err != nil {
-				return err
-			}
-		case len(eventFormat) > 0:
-			if err := tmpl.Execute(w, event); err != nil {
-				return err
-			}
-		default:
-			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
-		}
-	}
-	return nil
-}
diff --git a/cmd/podmanV2/system/info.go b/cmd/podmanV2/system/info.go
deleted file mode 100644
index 6b0c6a13b..000000000
--- a/cmd/podmanV2/system/info.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package system
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"text/template"
-
-	"github.com/containers/libpod/cmd/podmanV2/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v2"
-)
-
-var (
-	infoDescription = `Display information pertaining to the host, current storage stats, and build of podman.
-
-  Useful for the user and when reporting issues.
-`
-	infoCommand = &cobra.Command{
-		Use:     "info",
-		Args:    cobra.NoArgs,
-		Long:    infoDescription,
-		Short:   "Display podman system information",
-		RunE:    info,
-		Example: `podman info`,
-	}
-)
-
-var (
-	inFormat string
-	debug    bool
-)
-
-func init() {
-	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
-		Command: infoCommand,
-	})
-	flags := infoCommand.Flags()
-	flags.BoolVarP(&debug, "debug", "D", false, "Display additional debug information")
-	flags.StringVarP(&inFormat, "format", "f", "", "Change the output format to JSON or a Go template")
-}
-
-func info(cmd *cobra.Command, args []string) error {
-	info, err := registry.ContainerEngine().Info(registry.GetContext())
-	if err != nil {
-		return err
-	}
-
-	if inFormat == "json" {
-		b, err := json.MarshalIndent(info, "", "  ")
-		if err != nil {
-			return err
-		}
-		fmt.Println(string(b))
-		return nil
-	}
-	if !cmd.Flag("format").Changed {
-		b, err := yaml.Marshal(info)
-		if err != nil {
-			return err
-		}
-		fmt.Println(string(b))
-		return nil
-	}
-	tmpl, err := template.New("info").Parse(inFormat)
-	if err != nil {
-		return err
-	}
-	err = tmpl.Execute(os.Stdout, info)
-	return err
-}
diff --git a/cmd/podmanV2/system/service.go b/cmd/podmanV2/system/service.go
deleted file mode 100644
index 5573f7039..000000000
--- a/cmd/podmanV2/system/service.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package system
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/containers/libpod/cmd/podmanV2/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/containers/libpod/pkg/rootless"
-	"github.com/containers/libpod/pkg/systemd"
-	"github.com/containers/libpod/pkg/util"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-)
-
-var (
-	srvDescription = `Run an API service
-
-Enable a listening service for API access to Podman commands.
-`
-
-	srvCmd = &cobra.Command{
-		Use:   "service [flags] [URI]",
-		Args:  cobra.MaximumNArgs(1),
-		Short: "Run API service",
-		Long:  srvDescription,
-		RunE:  service,
-		Example: `podman system service --time=0 unix:///tmp/podman.sock
-  podman system service --varlink --time=0 unix:///tmp/podman.sock`,
-	}
-
-	srvArgs = struct {
-		Timeout int64
-		Varlink bool
-	}{}
-)
-
-func init() {
-	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode},
-		Command: srvCmd,
-		Parent:  systemCmd,
-	})
-
-	flags := srvCmd.Flags()
-	flags.Int64VarP(&srvArgs.Timeout, "time", "t", 5, "Time until the service session expires in seconds.  Use 0 to disable the timeout")
-	flags.Int64Var(&srvArgs.Timeout, "timeout", 5, "Time until the service session expires in seconds.  Use 0 to disable the timeout")
-	flags.BoolVar(&srvArgs.Varlink, "varlink", false, "Use legacy varlink service instead of REST")
-
-	_ = flags.MarkDeprecated("varlink", "valink API is deprecated.")
-}
-
-func service(cmd *cobra.Command, args []string) error {
-	apiURI, err := resolveApiURI(args)
-	if err != nil {
-		return err
-	}
-	logrus.Infof("using API endpoint: \"%s\"", apiURI)
-
-	opts := entities.ServiceOptions{
-		URI:     apiURI,
-		Timeout: time.Duration(srvArgs.Timeout) * time.Second,
-		Command: cmd,
-	}
-
-	if srvArgs.Varlink {
-		return registry.ContainerEngine().VarlinkService(registry.GetContext(), opts)
-	}
-
-	logrus.Warn("This function is EXPERIMENTAL")
-	fmt.Fprintf(os.Stderr, "This function is EXPERIMENTAL.\n")
-	return registry.ContainerEngine().RestService(registry.GetContext(), opts)
-}
-
-func resolveApiURI(_url []string) (string, error) {
-
-	// When determining _*THE*_ listening endpoint --
-	// 1) User input wins always
-	// 2) systemd socket activation
-	// 3) rootless honors XDG_RUNTIME_DIR
-	// 4) if varlink -- adapter.DefaultVarlinkAddress
-	// 5) lastly adapter.DefaultAPIAddress
-
-	if _url == nil {
-		if v, found := os.LookupEnv("PODMAN_SOCKET"); found {
-			_url = []string{v}
-		}
-	}
-
-	switch {
-	case len(_url) > 0:
-		return _url[0], nil
-	case systemd.SocketActivated():
-		logrus.Info("using systemd socket activation to determine API endpoint")
-		return "", nil
-	case rootless.IsRootless():
-		xdg, err := util.GetRuntimeDir()
-		if err != nil {
-			return "", err
-		}
-
-		socketName := "podman.sock"
-		if srvArgs.Varlink {
-			socketName = "io.podman"
-		}
-		socketDir := filepath.Join(xdg, "podman", socketName)
-		if _, err := os.Stat(filepath.Dir(socketDir)); err != nil {
-			if os.IsNotExist(err) {
-				if err := os.Mkdir(filepath.Dir(socketDir), 0755); err != nil {
-					return "", err
-				}
-			} else {
-				return "", err
-			}
-		}
-		return "unix:" + socketDir, nil
-	case srvArgs.Varlink:
-		return registry.DefaultVarlinkAddress, nil
-	default:
-		return registry.DefaultAPIAddress, nil
-	}
-}
diff --git a/cmd/podmanV2/system/system.go b/cmd/podmanV2/system/system.go
deleted file mode 100644
index e62a0c150..000000000
--- a/cmd/podmanV2/system/system.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package system
-
-import (
-	"github.com/containers/libpod/cmd/podmanV2/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/spf13/cobra"
-)
-
-var (
-	// Command: podman _system_
-	systemCmd = &cobra.Command{
-		Use:              "system",
-		Short:            "Manage podman",
-		Long:             "Manage podman",
-		TraverseChildren: true,
-		RunE:             registry.SubCommandExists,
-	}
-)
-
-func init() {
-	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
-		Command: systemCmd,
-	})
-}
diff --git a/cmd/podmanV2/system/varlink.go b/cmd/podmanV2/system/varlink.go
deleted file mode 100644
index 27dd0a7e9..000000000
--- a/cmd/podmanV2/system/varlink.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package system
-
-import (
-	"time"
-
-	"github.com/containers/libpod/cmd/podmanV2/registry"
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/spf13/cobra"
-)
-
-var (
-	varlinkDescription = `Run varlink interface.  Podman varlink listens on the specified unix domain socket for incoming connects.
-
-  Tools speaking varlink protocol can remotely manage pods, containers and images.
-`
-	varlinkCmd = &cobra.Command{
-		Use:   "varlink [flags] [URI]",
-		Args:  cobra.MinimumNArgs(1),
-		Short: "Run varlink interface",
-		Long:  varlinkDescription,
-		RunE:  varlinkE,
-		Example: `podman varlink unix:/run/podman/io.podman
-  podman varlink --timeout 5000 unix:/run/podman/io.podman`,
-	}
-	varlinkArgs = struct {
-		Timeout int64
-	}{}
-)
-
-func init() {
-	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
-		Command: varlinkCmd,
-	})
-	flags := varlinkCmd.Flags()
-	flags.Int64VarP(&varlinkArgs.Timeout, "time", "t", 1000, "Time until the varlink session expires in milliseconds.  Use 0 to disable the timeout")
-	flags.Int64Var(&varlinkArgs.Timeout, "timeout", 1000, "Time until the varlink session expires in milliseconds.  Use 0 to disable the timeout")
-
-}
-
-func varlinkE(cmd *cobra.Command, args []string) error {
-	uri := registry.DefaultVarlinkAddress
-	if len(args) > 0 {
-		uri = args[0]
-	}
-	opts := entities.ServiceOptions{
-		URI:     uri,
-		Timeout: time.Duration(varlinkArgs.Timeout) * time.Second,
-		Command: cmd,
-	}
-	return registry.ContainerEngine().VarlinkService(registry.GetContext(), opts)
-}
diff --git a/cmd/podmanV2/system/version.go b/cmd/podmanV2/system/version.go
deleted file mode 100644
index 7004c3109..000000000
--- a/cmd/podmanV2/system/version.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package system
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"github.com/containers/buildah/pkg/formats"
-	"github.com/containers/libpod/cmd/podmanV2/registry"
-	"github.com/containers/libpod/libpod/define"
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-)
-
-var (
-	versionCommand = &cobra.Command{
-		Use:   "version",
-		Args:  cobra.NoArgs,
-		Short: "Display the Podman Version Information",
-		RunE:  version,
-		Annotations: map[string]string{
-			registry.ParentNSRequired: "",
-		},
-	}
-	versionFormat string
-)
-
-type versionStruct struct {
-	Client define.Version
-	Server define.Version
-}
-
-func init() {
-	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
-		Command: versionCommand,
-	})
-	flags := versionCommand.Flags()
-	flags.StringVarP(&versionFormat, "format", "f", "", "Change the output format to JSON or a Go template")
-}
-
-func version(cmd *cobra.Command, args []string) error {
-	var (
-		v   versionStruct
-		err error
-	)
-	v.Client, err = define.GetVersion()
-	if err != nil {
-		return errors.Wrapf(err, "unable to determine version")
-	}
-	// TODO we need to discuss how to implement
-	// this more. current endpoints dont have a
-	// version endpoint.  maybe we use info?
-	//if remote {
-	//	v.Server, err = getRemoteVersion(c)
-	//	if err != nil {
-	//		return err
-	//	}
-	//} else {
-	v.Server = v.Client
-	//}
-
-	versionOutputFormat := versionFormat
-	if versionOutputFormat != "" {
-		if strings.Join(strings.Fields(versionOutputFormat), "") == "{{json.}}" {
-			versionOutputFormat = formats.JSONString
-		}
-		var out formats.Writer
-		switch versionOutputFormat {
-		case formats.JSONString:
-			out = formats.JSONStruct{Output: v}
-			return out.Out()
-		default:
-			out = formats.StdoutTemplate{Output: v, Template: versionOutputFormat}
-			err := out.Out()
-			if err != nil {
-				// On Failure, assume user is using older version of podman version --format and check client
-				out = formats.StdoutTemplate{Output: v.Client, Template: versionOutputFormat}
-				if err1 := out.Out(); err1 != nil {
-					return err
-				}
-			}
-		}
-		return nil
-	}
-	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-	defer w.Flush()
-
-	if registry.IsRemote() {
-		if _, err := fmt.Fprintf(w, "Client:\n"); err != nil {
-			return err
-		}
-		formatVersion(w, v.Client)
-		if _, err := fmt.Fprintf(w, "\nServer:\n"); err != nil {
-			return err
-		}
-		formatVersion(w, v.Server)
-	} else {
-		formatVersion(w, v.Client)
-	}
-	return nil
-}
-
-func formatVersion(writer io.Writer, version define.Version) {
-	fmt.Fprintf(writer, "Version:\t%s\n", version.Version)
-	fmt.Fprintf(writer, "RemoteAPI Version:\t%d\n", version.RemoteAPIVersion)
-	fmt.Fprintf(writer, "Go Version:\t%s\n", version.GoVersion)
-	if version.GitCommit != "" {
-		fmt.Fprintf(writer, "Git Commit:\t%s\n", version.GitCommit)
-	}
-	// Prints out the build time in readable format
-	if version.Built != 0 {
-		fmt.Fprintf(writer, "Built:\t%s\n", time.Unix(version.Built, 0).Format(time.ANSIC))
-	}
-
-	fmt.Fprintf(writer, "OS/Arch:\t%s\n", version.OsArch)
-}