Merge pull request #30 from ernoaapa/fix-discovery-bug

Fix discovery bug
ernoaapa · Feb 15, 2018 · 48b7e23 · 48b7e23
2 parents b97fea4 + a61a267
commit 48b7e23
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/cmd/utils.go b/cmd/utils.go
@@ -86,6 +86,7 @@ func GetClient(config *config.Provider) *api.Client {
 		client := api.NewClient(config.GetNamespace(), endpoints[0])
 		info, err := client.GetInfo()
 		if err != nil {
+			logrus.Debugf("Connection failure: %s", err)
 			uiline.Fatalf("Failed connect to %s (%s)", endpoints[0].Name, endpoints[0].URL)
 		}
 		uiline.Donef("Connected to %s (%s)", info.Hostname, endpoints[0].URL)
@@ -138,10 +139,12 @@ func GetConfigProvider(clicontext *cli.Context) *config.Provider {
 
 		endpoints := []config.Endpoint{}
 		for _, device := range devices {
-			endpoints = append(endpoints, config.Endpoint{
-				Name: device.Hostname,
-				URL:  utils.GetFirst(device.Addresses, ""),
-			})
+			if len(device.Addresses) > 0 {
+				endpoints = append(endpoints, config.Endpoint{
+					Name: device.Hostname,
+					URL:  fmt.Sprintf("%s:%d", utils.GetFirst(device.Addresses, ""), device.GrpcPort),
+				})
+			}
 		}
 		provider.OverrideEndpoints(endpoints)
 	}
@@ -322,7 +325,7 @@ func expandTilde(path string) string {
 	usr, _ := user.Current()
 	dir := usr.HomeDir
 
-	if path[:2] == "~/" {
+	if len(path) >= 2 && path[:2] == "~/" {
 		return filepath.Join(dir, path[2:])
 	}
 	return path

diff --git a/cmd/utils_test.go b/cmd/utils_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	containers "github.com/ernoaapa/eliot/pkg/api/services/containers/v1"
+	"github.com/ernoaapa/eliot/pkg/config"
 	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli"
 )
@@ -123,3 +124,18 @@ func TestEmptyResolveContainerIDFail(t *testing.T) {
 	_, err := ResolveContainerID([]*containers.ContainerStatus{}, "")
 	assert.Error(t, err)
 }
+
+func TestGetConfigProviderWithEndpointFlag(t *testing.T) {
+	flags := flag.NewFlagSet("test", 0)
+	flags.String("endpoint", "", "")
+
+	flags.Parse([]string{"--endpoint", "1.2.3.4:5000"})
+	clicontext := cli.NewContext(nil, flags, nil)
+
+	provider := GetConfigProvider(clicontext)
+
+	assert.Equal(t, []config.Endpoint{{
+		Name: "1.2.3.4:5000",
+		URL:  "1.2.3.4:5000",
+	}}, provider.GetEndpoints(), "")
+}
diff --git a/pkg/printers/humanreadable.go b/pkg/printers/humanreadable.go
@@ -87,7 +87,8 @@ func (p *HumanReadablePrinter) PrintDevices(devices []*device.Info, writer io.Wr
 	fmt.Fprintln(writer, "\nHOSTNAME\tENDPOINT\tVERSION")
 
 	for _, device := range devices {
-		_, err := fmt.Fprintf(writer, "%s\t%s\t%s\n", device.Hostname, utils.GetFirst(device.Addresses, ""), device.Version)
+		endpoint := fmt.Sprintf("%s:%d", utils.GetFirst(device.Addresses, ""), device.GrpcPort)
+		_, err := fmt.Fprintf(writer, "%s\t%s\t%s\n", device.Hostname, endpoint, device.Version)
 		if err != nil {
 			return errors.Wrapf(err, "Error while writing device row")
 		}