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

removing UUID gen from client side

Browse Source
This commit is contained in:
afeiszli
2022-02-01 22:01:30 -05:00
parent c8154ffa5d
commit f6c68bd209
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logic/nodes.go
View File

@@ -238,11 +238,7 @@ func CreateNode(node *models.Node) error {
} }
// TODO: This covers legacy nodes, eventually want to remove legacy check // TODO: This covers legacy nodes, eventually want to remove legacy check
if node.IsServer == "yes" { node.ID = uuid.NewString()
node.ID = uuid.NewString()
} else if node.IsServer != "yes" || (node.ID == "" || strings.Contains(node.ID, "###")) {
node.ID = uuid.NewString()
}
//Create a JWT for the node //Create a JWT for the node
tokenString, _ := CreateJWT(node.ID, node.MacAddress, node.Network) tokenString, _ := CreateJWT(node.ID, node.MacAddress, node.Network)

5
netclient/functions/join.go
View File

@@ -10,7 +10,6 @@ import (
"os/exec" "os/exec"
"runtime" "runtime"
"github.com/google/uuid"
nodepb "github.com/gravitl/netmaker/grpc" nodepb "github.com/gravitl/netmaker/grpc"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/auth" "github.com/gravitl/netmaker/netclient/auth"
@@ -104,10 +103,6 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
} }
} }
if cfg.Node.ID == "" {
cfg.Node.ID = uuid.NewString()
}
if ncutils.IsLinux() { if ncutils.IsLinux() {
_, err := exec.LookPath("resolvconf") _, err := exec.LookPath("resolvconf")
if err != nil { if err != nil {