codegod100/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: server list expands connection string

Browse Source
This commit is contained in:
decentral1se 2021-10-22 10:40:28 +02:00
parent 313e3beb1e
commit b72fa28ddb
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cli/server/list.go
View File

@ -6,6 +6,7 @@ import (
"coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/formatter"
"coopcloud.tech/abra/pkg/client" "coopcloud.tech/abra/pkg/client"
"coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/config"
"github.com/docker/cli/cli/connhelper/ssh"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )
@ -23,7 +24,7 @@ var serverListCommand = &cli.Command{
logrus.Fatal(err) logrus.Fatal(err)
} }
tableColumns := []string{"Name", "Connection"} tableColumns := []string{"name", "host", "user", "port"}
table := formatter.CreateTable(tableColumns) table := formatter.CreateTable(tableColumns)
defer table.Render() defer table.Render()
@ -41,14 +42,18 @@ var serverListCommand = &cli.Command{
continue continue
} }
if ctx.Name == serverName { if ctx.Name == serverName {
row = []string{serverName, endpoint} sp, err := ssh.ParseURL(endpoint)
if err != nil {
logrus.Fatal(err)
}
row = []string{serverName, sp.Host, sp.User, sp.Port}
} }
} }
if len(row) == 0 { if len(row) == 0 {
if serverName == "default" { if serverName == "default" {
row = []string{serverName, "local"} row = []string{serverName, "local", "n/a", "n/a"}
} else { } else {
row = []string{serverName, "unknown"} row = []string{serverName, "unknown", "unknown", "unknown"}
} }
} }
table.Append(row) table.Append(row)