From bfd0c00ef2212d45a91b8577811dca9f9f626c2e Mon Sep 17 00:00:00 2001
From: Adrien Raffin-Caboisse <adrien.raffin@sekoia.fr>
Date: Fri, 15 Oct 2021 15:52:29 +0200
Subject: [PATCH] fix(netclient): rework the returned errors on list command

---
 netclient/functions/list.go | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/netclient/functions/list.go b/netclient/functions/list.go
index eb1c2d6e..f5a0d92b 100644
--- a/netclient/functions/list.go
+++ b/netclient/functions/list.go
@@ -3,7 +3,6 @@ package functions
 import (
 	"encoding/json"
 	"fmt"
-	"log"
 
 	nodepb "github.com/gravitl/netmaker/grpc"
 	"github.com/gravitl/netmaker/models"
@@ -93,7 +92,7 @@ func getPeers(network string) ([]Peer, error) {
 		ncutils.GRPCRequestOpts(cfg.Server.GRPCSSL))
 
 	if err != nil {
-		log.Fatalf("Unable to establish client connection to localhost:50051: %v", err)
+		return []Peer{}, fmt.Errorf("connecting to %v: %w", cfg.Server.GRPCAddress, err)
 	}
 	defer conn.Close()
 	// Instantiate the BlogServiceClient with our client connection to the server
@@ -106,19 +105,16 @@ func getPeers(network string) ([]Peer, error) {
 
 	ctx, err := auth.SetJWT(wcclient, network)
 	if err != nil {
-		log.Println("Failed to authenticate.")
-		return []Peer{}, err
+		return []Peer{}, fmt.Errorf("authenticating: %w", err)
 	}
 	var header metadata.MD
 
 	response, err := wcclient.GetPeers(ctx, req, grpc.Header(&header))
 	if err != nil {
-		log.Println("Error retrieving peers")
-		return []Peer{}, err
+		return []Peer{}, fmt.Errorf("retrieving peers: %w", err)
 	}
 	if err := json.Unmarshal([]byte(response.GetData()), &nodes); err != nil {
-		log.Println("Error unmarshaling data for peers")
-		return []Peer{}, err
+		return []Peer{}, fmt.Errorf("unmarshaling data for peers: %w", err)
 	}
 
 	peers := []Peer{}