PMM-5194 Tunnels

Gopkg.toml

@@ -11,7 +11,8 @@ required = [
 
 [[constraint]]
   name = "github.com/percona/pmm"
-  branch = "PMM-2.0"
+  # branch = "PMM-2.0"
+  branch = "PMM-5194-tunnels"
 
 # https://jira.percona.com/browse/PMM-4081
 # https://jira.percona.com/browse/PMM-4042

commands/inventory/list_tunnels.go

@@ -0,0 +1,112 @@
+// pmm-admin
+// Copyright 2019 Percona LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package inventory
+
+import (
+	"bytes"
+	"fmt"
+	"strconv"
+	"strings"
+	"text/tabwriter"
+
+	"github.com/percona/pmm/api/inventorypb/json/client"
+	"github.com/percona/pmm/api/inventorypb/json/client/tunnels"
+
+	"github.com/percona/pmm-admin/commands"
+)
+
+type listResultTunnel struct {
+	TunnelID       string `json:"tunnel_id"`
+	ListenAgentID  string `json:"listen_agent_id"`
+	ListenPort     uint16 `json:"listen_port"`
+	ConnectAgentID string `json:"connect_agent_id"`
+	ConnectPort    uint16 `json:"connect_port"`
+}
+
+type listTunnelsResult struct {
+	Tunnels []listResultTunnel `json:"tunnels"`
+}
+
+func (res *listTunnelsResult) Result() {}
+
+func (res *listTunnelsResult) String() string {
+	if len(res.Tunnels) == 0 {
+		return "No tunnels."
+	}
+
+	var buf bytes.Buffer
+	w := tabwriter.NewWriter(&buf, 0, 0, 3, ' ', 0)
+	header := strings.Join([]string{
+		"ID",
+		"Listen Agent ID",
+		"Listen port",
+		"Connect Agent ID",
+		"Connect port",
+	}, "\t")
+	fmt.Fprintln(w, header)
+	for _, t := range res.Tunnels {
+		line := strings.Join([]string{
+			t.TunnelID,
+			t.ListenAgentID,
+			strconv.Itoa(int(t.ListenPort)),
+			t.ConnectAgentID,
+			strconv.Itoa(int(t.ConnectPort)),
+		}, "\t")
+		fmt.Fprintln(w, line)
+	}
+	w.Flush()
+	return buf.String()
+}
+
+type listTunnelsCommand struct {
+	filters tunnels.ListTunnelsBody
+}
+
+func (cmd *listTunnelsCommand) Run() (commands.Result, error) {
+	params := &tunnels.ListTunnelsParams{
+		Body:    cmd.filters,
+		Context: commands.Ctx,
+	}
+	tunnelsRes, err := client.Default.Tunnels.ListTunnels(params)
+	if err != nil {
+		return nil, err
+	}
+
+	tunnelsList := make([]listResultTunnel, len(tunnelsRes.Payload.Tunnel))
+	for i, t := range tunnelsRes.Payload.Tunnel {
+		tunnelsList[i] = listResultTunnel{
+			TunnelID:       t.TunnelID,
+			ListenAgentID:  t.ListenAgentID,
+			ListenPort:     uint16(t.ListenPort),
+			ConnectAgentID: t.ConnectAgentID,
+			ConnectPort:    uint16(t.ConnectPort),
+		}
+	}
+
+	return &listTunnelsResult{
+		Tunnels: tunnelsList,
+	}, nil
+}
+
+// register command
+var (
+	ListTunnels  = new(listTunnelsCommand)
+	ListTunnelsC = inventoryListC.Command("tunnels", "Show tunnels in inventory").Hide(hide)
+)
+
+func init() {
+	ListTunnelsC.Flag("pmm-agent-id", "Filter by pmm-agent identifier").StringVar(&ListTunnels.filters.AgentID)
+}

main.go

@@ -122,6 +122,8 @@ func main() {
 
 		inventory.RemoveAgentC.FullCommand(): inventory.RemoveAgent,
 
+		inventory.ListTunnelsC.FullCommand(): inventory.ListTunnels,
+
 		commands.ListC.FullCommand():       commands.List,
 		commands.AnnotationC.FullCommand(): commands.Annotation,
 		commands.StatusC.FullCommand():     commands.Status,