Browse Source

removing UUID gen from client side

afeiszli 3 years ago
parent
commit
f6c68bd209
2 changed files with 1 additions and 10 deletions
  1. 1 5
      logic/nodes.go
  2. 0 5
      netclient/functions/join.go

+ 1 - 5
logic/nodes.go

@@ -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()
-	} else if node.IsServer != "yes" || (node.ID == "" || strings.Contains(node.ID, "###")) {
-		node.ID = uuid.NewString()
-	}
+	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)

+ 0 - 5
netclient/functions/join.go

@@ -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 {