review comments

controllers/relay.go

@@ -59,7 +59,7 @@ func createRelay(w http.ResponseWriter, r *http.Request) {
 	//}
 	clients := peers
 	for _, client := range clients {
-		mq.PubPeerUpdate(&client, &relay, &peers)
+		mq.PubPeerUpdate(&client, &relay, peers)
 	}
 
 	logger.Log(1, r.Header.Get("user"), "created relay on node", relayRequest.NodeID, "on network", relayRequest.NetID)
@@ -113,7 +113,7 @@ func deleteRelay(w http.ResponseWriter, r *http.Request) {
 		}
 		clients := peers
 		for _, client := range clients {
-			mq.PubPeerUpdate(&client, nil, &peers)
+			mq.PubPeerUpdate(&client, nil, peers)
 		}
 	}()
 	logger.Log(1, r.Header.Get("user"), "deleted relay on node", node.ID.String(), "on network", node.Network)

logic/peers.go

@@ -7,7 +7,6 @@ import (
 	"net"
 	"net/netip"
 
-	"github.com/google/uuid"
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic/acls/nodeacls"
@@ -686,7 +685,7 @@ func filterNodeMapForClientACLs(publicKey, network string, nodePeerMap map[strin
 func GetPeerUpdate(host *models.Host) []wgtypes.PeerConfig {
 	peerUpdate := []wgtypes.PeerConfig{}
 	for _, nodeStr := range host.Nodes {
-		node, err := GetNodeByID(uuid.MustParse(nodeStr).String())
+		node, err := GetNodeByID(nodeStr)
 		if err != nil {
 			continue
 		}
@@ -696,11 +695,11 @@ func GetPeerUpdate(host *models.Host) []wgtypes.PeerConfig {
 			continue
 		}
 		if node.IsRelayed {
-			peerUpdate = append(peerUpdate, peerUpdateForRelayed(&client, &peers)...)
+			peerUpdate = append(peerUpdate, peerUpdateForRelayed(&client, peers)...)
 			continue
 		}
 		if node.IsRelay {
-			peerUpdate = append(peerUpdate, peerUpdateForRelay(&client, &peers)...)
+			peerUpdate = append(peerUpdate, peerUpdateForRelay(&client, peers)...)
 			continue
 		}
 		for _, peer := range peers {
@@ -842,12 +841,12 @@ func getIngressIPs(peer *models.Client) []net.IPNet {
 }
 
 // GetPeerUpdateForRelay - returns the peer update for a relay node
-func GetPeerUpdateForRelay(client *models.Client, peers *[]models.Client) []wgtypes.PeerConfig {
+func GetPeerUpdateForRelay(client *models.Client, peers []models.Client) []wgtypes.PeerConfig {
 	peerConfig := []wgtypes.PeerConfig{}
 	if !client.Node.IsRelay {
 		return []wgtypes.PeerConfig{}
 	}
-	for _, peer := range *peers {
+	for _, peer := range peers {
 		if peer.Host.ID == client.Host.ID {
 			continue
 		}

logic/relay.go

@@ -147,7 +147,7 @@ func getRelayedAddresses(id string) []net.IPNet {
 }
 
 // peerUpdateForRelayed - returns the peerConfig for a relayed node
-func peerUpdateForRelayed(client *models.Client, peers *[]models.Client) []wgtypes.PeerConfig {
+func peerUpdateForRelayed(client *models.Client, peers []models.Client) []wgtypes.PeerConfig {
 	peerConfig := []wgtypes.PeerConfig{}
 	if !client.Node.IsRelayed {
 		logger.Log(0, "GetPeerUpdateForRelayed called for non-relayed node ", client.Host.Name)
@@ -162,7 +162,7 @@ func peerUpdateForRelayed(client *models.Client, peers *[]models.Client) []wgtyp
 		Host: *GetHostByNodeID(relayNode.ID.String()),
 		Node: relayNode,
 	}
-	for _, peer := range *peers {
+	for _, peer := range peers {
 		if peer.Host.ID == client.Host.ID {
 			continue
 		}
@@ -224,13 +224,13 @@ func peerUpdateForRelayedByRelay(relayed, relay *models.Client) wgtypes.PeerConf
 }
 
 // peerUpdateForRelay - returns the peerConfig for a relay
-func peerUpdateForRelay(relay *models.Client, peers *[]models.Client) []wgtypes.PeerConfig {
+func peerUpdateForRelay(relay *models.Client, peers []models.Client) []wgtypes.PeerConfig {
 	peerConfig := []wgtypes.PeerConfig{}
 	if !relay.Node.IsRelay {
 		logger.Log(0, "GetPeerUpdateForRelay called for non-relay node ", relay.Host.Name)
 		return []wgtypes.PeerConfig{}
 	}
-	for _, peer := range *peers {
+	for _, peer := range peers {
 		if peer.Host.ID == relay.Host.ID {
 			continue
 		}

mq/relay.go

@@ -14,7 +14,7 @@ import (
 
 // PubPeerUpdate publishes a peer update to the client
 // relay is set to a newly created relay node or nil for other peer updates
-func PubPeerUpdate(client, relay *models.Client, peers *[]models.Client) {
+func PubPeerUpdate(client, relay *models.Client, peers []models.Client) {
 	p := models.PeerAction{
 		Action: models.UpdatePeer,
 	}
@@ -28,7 +28,7 @@ func PubPeerUpdate(client, relay *models.Client, peers *[]models.Client) {
 			return
 		}
 	}
-	for _, peer := range *peers {
+	for _, peer := range peers {
 		if client.Host.ID == peer.Host.ID {
 			continue
 		}
@@ -139,7 +139,7 @@ func getIngressIPs(peer models.Client) []net.IPNet {
 }
 
 // pubRelayedUpdate - publish peer update to a node (client) that is relayed by the relay
-func pubRelayedUpdate(client, relay *models.Client, peers *[]models.Client) {
+func pubRelayedUpdate(client, relay *models.Client, peers []models.Client) {
 	//verify
 	if !logic.StringSliceContains(relay.Node.RelayedNodes, client.Node.ID.String()) {
 		logger.Log(0, "invalid call to pubRelayed update", client.Host.Name, relay.Host.Name)
@@ -149,7 +149,7 @@ func pubRelayedUpdate(client, relay *models.Client, peers *[]models.Client) {
 	p := models.PeerAction{
 		Action: models.RemovePeer,
 	}
-	for _, peer := range *peers {
+	for _, peer := range peers {
 		if peer.Host.ID == relay.Host.ID || peer.Host.ID == client.Host.ID {
 			continue
 		}
@@ -188,7 +188,7 @@ func pubRelayedUpdate(client, relay *models.Client, peers *[]models.Client) {
 	}
 	p.Peers = append(p.Peers, update)
 	// add all other peers to allowed ips
-	for _, peer := range *peers {
+	for _, peer := range peers {
 		if peer.Host.ID == relay.Host.ID || peer.Host.ID == client.Host.ID {
 			continue
 		}
@@ -204,7 +204,7 @@ func pubRelayedUpdate(client, relay *models.Client, peers *[]models.Client) {
 }
 
 // pubRelayUpdate - publish peer update to a relay
-func pubRelayUpdate(client *models.Client, peers *[]models.Client) {
+func pubRelayUpdate(client *models.Client, peers []models.Client) {
 	if !client.Node.IsRelay {
 		return
 	}
@@ -212,7 +212,7 @@ func pubRelayUpdate(client *models.Client, peers *[]models.Client) {
 	p := models.PeerAction{
 		Action: models.UpdatePeer,
 	}
-	for _, peer := range *peers {
+	for _, peer := range peers {
 		if peer.Host.ID == client.Host.ID {
 			continue
 		}