zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 08:47:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

netclient: pass by value -> reference (#919)

Browse Source 
* netclient: pass by value -> reference

Updates various function arguments to accept config.ClientConfig
as a reference to avoid deep copying the struct.

Signed-off-by: John Sahhar <john@gravitl.com>
This commit is contained in:
john s
2022-03-20 23:43:17 -05:00
committed by GitHub
parent eb974dbd63
commit 24f292c934
6 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
netclient/command/commands.go
View File

@@ -1,6 +1,7 @@
package command
import (
"errors"
"strings"
"github.com/gravitl/netmaker/netclient/config"
@@ -12,22 +13,24 @@ import (
// JoinComms -- Join the message queue comms network if it doesn't have it
// tries to ping if already found locally, if fail ping pull for best effort for communication
func JoinComms(cfg *config.ClientConfig) error {
var commsCfg config.ClientConfig
commsCfg := &config.ClientConfig{}
commsCfg.Network = cfg.Server.CommsNetwork
commsCfg.Node.Network = cfg.Server.CommsNetwork
commsCfg.Server.AccessKey = cfg.Server.AccessKey
commsCfg.Server.GRPCAddress = cfg.Server.GRPCAddress
commsCfg.Server.GRPCSSL = cfg.Server.GRPCSSL
commsCfg.Server.CoreDNSAddr = cfg.Server.CoreDNSAddr
if commsCfg.ConfigFileExists() {
commsCfg.ReadConfig()
if !commsCfg.ConfigFileExists() {
return errors.New("no configuration file exists")
}
if commsCfg.Node.Name == "" {
commsCfg.ReadConfig()
if len(commsCfg.Node.Name) == 0 {
if err := functions.JoinNetwork(commsCfg, "", true); err != nil {
return err
}
} else { // check if comms is currently reachable
if err := functions.PingServer(&commsCfg); err != nil {
if err := functions.PingServer(commsCfg); err != nil {
if err = Pull(commsCfg); err != nil {
return err
}
@@ -37,10 +40,10 @@ func JoinComms(cfg *config.ClientConfig) error {
}
// Join - join command to run from cli
func Join(cfg config.ClientConfig, privateKey string) error {
func Join(cfg *config.ClientConfig, privateKey string) error {
var err error
//check if comms network exists
if err = JoinComms(&cfg); err != nil {
if err = JoinComms(cfg); err != nil {
return err
}
@@ -88,7 +91,7 @@ func Join(cfg config.ClientConfig, privateKey string) error {
}
// Leave - runs the leave command from cli
func Leave(cfg config.ClientConfig, force bool) error {
func Leave(cfg *config.ClientConfig, force bool) error {
err := functions.LeaveNetwork(cfg.Network, force)
if err != nil {
ncutils.PrintLog("error attempting to leave network "+cfg.Network, 1)
@@ -106,7 +109,7 @@ func Leave(cfg config.ClientConfig, force bool) error {
}
// Pull - runs pull command from cli
func Pull(cfg config.ClientConfig) error {
func Pull(cfg *config.ClientConfig) error {
var err error
if cfg.Network == "all" {
ncutils.PrintLog("No network selected. Running Pull for all networks.", 0)