began refactoring of client

netclient/command/commands.go

@@ -1,32 +1,28 @@
 package command
 
 import (
-        "github.com/gravitl/netmaker/netclient/functions"
-        "github.com/gravitl/netmaker/netclient/config"
-        "github.com/gravitl/netmaker/netclient/local"
-        "golang.zx2c4.com/wireguard/wgctrl"
-        nodepb "github.com/gravitl/netmaker/grpc"
+	"log"
 	"os"
 	"strings"
-	"log"
+
+	nodepb "github.com/gravitl/netmaker/grpc"
+	"github.com/gravitl/netmaker/netclient/config"
+	"github.com/gravitl/netmaker/netclient/functions"
+	"github.com/gravitl/netmaker/netclient/local"
+	"golang.zx2c4.com/wireguard/wgctrl"
 )
 
 var (
-        wgclient *wgctrl.Client
+	wgclient *wgctrl.Client
 )
 
 var (
-        wcclient nodepb.NodeServiceClient
+	wcclient nodepb.NodeServiceClient
 )
 
-func Register(cfg config.GlobalConfig) error {
-        err := functions.Register(cfg)
-        return err
-}
+func Join(cfg config.ClientConfig, privateKey string) error {
 
-func Join(cfg config.ClientConfig) error {
-
-	err := functions.JoinNetwork(cfg)
+	err := functions.JoinNetwork(cfg, privateKey)
 	if err != nil {
 		if !strings.Contains(err.Error(), "ALREADY_INSTALLED") {
 			log.Println("Error installing: ", err)
@@ -38,15 +34,15 @@ func Join(cfg config.ClientConfig) error {
 				}
 			}
 			if cfg.Daemon != "off" {
-	                        err = local.RemoveSystemDServices(cfg.Network)
-	                        if err != nil {
-	                                log.Println("Error removing services: ", err)
-	                        }
+				err = local.RemoveSystemDServices(cfg.Network)
+				if err != nil {
+					log.Println("Error removing services: ", err)
+				}
 			}
 		}
 		return err
 	}
-        log.Println("joined " + cfg.Network)
+	log.Println("joined " + cfg.Network)
 	if cfg.Daemon != "off" {
 		err = functions.InstallDaemon(cfg)
 	}
@@ -54,74 +50,70 @@ func Join(cfg config.ClientConfig) error {
 }
 
 func CheckIn(cfg config.ClientConfig) error {
-        if cfg.Network == "all" || cfg.Network == "" {
+	if cfg.Network == "all" || cfg.Network == "" {
 		log.Println("Required, '-n'. No network provided. Exiting.")
-                os.Exit(1)
-        }
-	err := functions.CheckIn(cfg)
-	if err != nil {
-		log.Println("Error checking in: ", err)
 		os.Exit(1)
 	}
-	return nil
+	err := functions.CheckConfig(cfg)
+	return err
 }
 
 func Leave(cfg config.ClientConfig) error {
 	err := functions.LeaveNetwork(cfg.Network)
-        if err != nil {
+	if err != nil {
 		log.Println("Error attempting to leave network " + cfg.Network)
-        }
+	}
 	return err
 }
 
 func Push(cfg config.ClientConfig) error {
-        var err error
-        if cfg.Network == "all" {
-                log.Println("No network selected. Running Push for all networks.")
-                networks, err := functions.GetNetworks()
-                if err != nil {
-                        log.Println("Error retrieving networks. Exiting.")
-                        return err
-                }
-                for _, network := range networks {
-                        err = functions.Push(network)
-                        if err != nil {
-                                log.Printf("Error pushing network configs for " + network + " network: ", err)
-                        } else {
-                                log.Println("pushed network config for " + network)
-                        }
-                }
-                err = nil
-        } else {
-                err = functions.Push(cfg.Network)
-        }
-        log.Println("Completed pushing network configs to remote server.")
-        return err
-}
-
-func Pull(cfg config.ClientConfig) error {
-        var err error
+	var err error
 	if cfg.Network == "all" {
-                log.Println("No network selected. Running Pull for all networks.")
+		log.Println("No network selected. Running Push for all networks.")
 		networks, err := functions.GetNetworks()
 		if err != nil {
 			log.Println("Error retrieving networks. Exiting.")
 			return err
 		}
 		for _, network := range networks {
-			err = functions.Pull(network)
+			err = functions.Push(network)
 			if err != nil {
-				log.Printf("Error pulling network config for " + network + " network: ", err)
+				log.Printf("Error pushing network configs for "+network+" network: ", err)
+			} else {
+				log.Println("pushed network config for " + network)
+			}
+		}
+		err = nil
+	} else {
+		err = functions.Push(cfg.Network)
+	}
+	log.Println("Completed pushing network configs to remote server.")
+	return err
+}
+
+func Pull(cfg config.ClientConfig) error {
+	var err error
+	if cfg.Network == "all" {
+		log.Println("No network selected. Running Pull for all networks.")
+		networks, err := functions.GetNetworks()
+		if err != nil {
+			log.Println("Error retrieving networks. Exiting.")
+			return err
+		}
+		for _, network := range networks {
+			_, err = functions.Pull(network, true)
+			if err != nil {
+				log.Printf("Error pulling network config for "+network+" network: ", err)
 			} else {
 				log.Println("pulled network config for " + network)
 			}
 		}
 		err = nil
 	} else {
-	        err = functions.Pull(cfg.Network)
+		_, err = functions.Pull(cfg.Network, true)
 	}
 	log.Println("Completed pulling network and peer configs.")
-        return err
+	return err
 }
 
 func List(cfg config.ClientConfig) error {
@@ -133,10 +125,9 @@ func Uninstall(cfg config.GlobalConfig) error {
 	log.Println("Uninstalling netclient")
 	err := functions.Uninstall()
 	err = functions.Unregister(cfg)
-        return err
+	return err
 }
 func Unregister(cfg config.GlobalConfig) error {
-        err := functions.Unregister(cfg)
-        return err
+	err := functions.Unregister(cfg)
+	return err
 }
-