From a1c654de94738802b850edfad9502fca5dd26a59 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Thu, 16 May 2019 10:01:37 -0700
Subject: Add connection information to podman-remote info

Refactor client code to break out building connection string from
making the connection.

Example:

client:
  Connection: unix:/run/podman/io.podman
  Connection Type: DirectConnection
  .
  :

Signed-off-by: Jhon Honce <jhonce@redhat.com>
---
 pkg/adapter/client.go | 50 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 19 deletions(-)

(limited to 'pkg/adapter/client.go')

diff --git a/pkg/adapter/client.go b/pkg/adapter/client.go
index f672a92a6..01914834f 100644
--- a/pkg/adapter/client.go
+++ b/pkg/adapter/client.go
@@ -10,44 +10,56 @@ import (
 	"github.com/varlink/go/varlink"
 )
 
-type VarlinkConnectionInfo struct {
-	RemoteUserName string
-	RemoteHost     string
-	VarlinkAddress string
-}
-
-// Connect provides a varlink connection
-func (r RemoteRuntime) Connect() (*varlink.Connection, error) {
-	var (
-		err        error
-		connection *varlink.Connection
-	)
+var remoteEndpoint *Endpoint
 
-	logLevel := r.cmd.LogLevel
+func (r RemoteRuntime) RemoteEndpoint() (remoteEndpoint *Endpoint, err error) {
+	if remoteEndpoint == nil {
+		remoteEndpoint = &Endpoint{Unknown, ""}
+	} else {
+		return remoteEndpoint, nil
+	}
 
 	// I'm leaving this here for now as a document of the birdge format.  It can be removed later once the bridge
 	// function is more flushed out.
-	//bridge := `ssh -T root@192.168.122.1 "/usr/bin/varlink -A '/usr/bin/podman varlink \$VARLINK_ADDRESS' bridge"`
+	// bridge := `ssh -T root@192.168.122.1 "/usr/bin/varlink -A '/usr/bin/podman varlink \$VARLINK_ADDRESS' bridge"`
 	if len(r.cmd.RemoteHost) > 0 {
 		// The user has provided a remote host endpoint
 		if len(r.cmd.RemoteUserName) < 1 {
 			return nil, errors.New("you must provide a username when providing a remote host name")
 		}
-		bridge := fmt.Sprintf(`ssh -T %s@%s /usr/bin/varlink -A \'/usr/bin/podman --log-level=%s varlink \\\$VARLINK_ADDRESS\' bridge`, r.cmd.RemoteUserName, r.cmd.RemoteHost, logLevel)
-		connection, err = varlink.NewBridge(bridge)
+		remoteEndpoint.Type = BridgeConnection
+		remoteEndpoint.Connection = fmt.Sprintf(
+			`ssh -T %s@%s /usr/bin/varlink -A \'/usr/bin/podman --log-level=%s varlink \\\$VARLINK_ADDRESS\' bridge`,
+			r.cmd.RemoteUserName, r.cmd.RemoteHost, r.cmd.LogLevel)
+
 	} else if bridge := os.Getenv("PODMAN_VARLINK_BRIDGE"); bridge != "" {
-		connection, err = varlink.NewBridge(bridge)
+		remoteEndpoint.Type = BridgeConnection
+		remoteEndpoint.Connection = bridge
 	} else {
 		address := os.Getenv("PODMAN_VARLINK_ADDRESS")
 		if address == "" {
 			address = DefaultAddress
 		}
-		connection, err = varlink.NewConnection(address)
+		remoteEndpoint.Type = DirectConnection
+		remoteEndpoint.Connection = address
 	}
+	return
+}
+
+// Connect provides a varlink connection
+func (r RemoteRuntime) Connect() (*varlink.Connection, error) {
+	ep, err := r.RemoteEndpoint()
 	if err != nil {
 		return nil, err
 	}
-	return connection, nil
+
+	switch ep.Type {
+	case DirectConnection:
+		return varlink.NewConnection(ep.Connection)
+	case BridgeConnection:
+		return varlink.NewBridge(ep.Connection)
+	}
+	return nil, errors.New(fmt.Sprintf("Unable to determine type of varlink connection: %s", ep.Connection))
 }
 
 // RefreshConnection is used to replace the current r.Conn after things like
-- 
cgit v1.2.3-54-g00ecf