NM-293: Nodes Schema Migration

auth/host_session.go

@@ -4,19 +4,17 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"log/slog"
-	"strings"
 	"time"
 
 	"github.com/google/uuid"
 	"github.com/gorilla/websocket"
 	"github.com/gravitl/netmaker/db"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic"
-	"github.com/gravitl/netmaker/logic/hostactions"
 	"github.com/gravitl/netmaker/logic/pro/netcache"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/mq"
+	"github.com/gravitl/netmaker/orchestrator"
 	"github.com/gravitl/netmaker/schema"
 	"github.com/gravitl/netmaker/servercfg"
 )
@@ -236,18 +234,18 @@ func SessionHandler(conn *websocket.Conn) {
 }
 
 // CheckNetRegAndHostUpdate - run through networks and send a host update
-func CheckNetRegAndHostUpdate(key models.EnrollmentKey, h *schema.Host, username string) {
+func CheckNetRegAndHostUpdate(key models.EnrollmentKey, host *schema.Host, username string) {
 	// publish host update through MQ
 	featureFlags := logic.GetFeatureFlags()
 	for _, netID := range key.Networks {
 		network := &schema.Network{Name: netID}
 		if err := network.Get(db.WithContext(context.TODO())); err == nil {
 			if featureFlags.EnableDeviceApproval && !network.AutoJoin {
-				if logic.DoesHostExistinTheNetworkAlready(h, schema.NetworkID(netID)) {
+				if logic.DoesHostExistInTheNetworkAlready(host, schema.NetworkID(netID)) {
 					continue
 				}
 				if err := (&schema.PendingHost{
-					HostID:  h.ID.String(),
+					HostID:  host.ID.String(),
 					Network: netID,
 				}).CheckIfPendingHostExists(db.WithContext(context.TODO())); err == nil {
 					continue
@@ -256,116 +254,72 @@ func CheckNetRegAndHostUpdate(key models.EnrollmentKey, h *schema.Host, username
 				// add host to pending host table
 				p := schema.PendingHost{
 					ID:            uuid.NewString(),
-					HostID:        h.ID.String(),
-					Hostname:      h.Name,
+					HostID:        host.ID.String(),
+					Hostname:      host.Name,
 					Network:       netID,
-					PublicKey:     h.PublicKey.String(),
-					OS:            h.OS,
-					Location:      h.Location,
-					Version:       h.Version,
+					PublicKey:     host.PublicKey.String(),
+					OS:            host.OS,
+					Location:      host.Location,
+					Version:       host.Version,
 					EnrollmentKey: keyB,
 					RequestedAt:   time.Now().UTC(),
 				}
 				p.Create(db.WithContext(context.TODO()))
 				continue
 			}
 
-			if len(username) > 0 {
-				logic.LogEvent(&models.Event{
-					Action: schema.JoinHostToNet,
-					Source: models.Subject{
-						ID:   username,
-						Name: username,
-						Type: schema.UserSub,
-					},
-					TriggeredBy: username,
-					Target: models.Subject{
-						ID:   h.ID.String(),
-						Name: h.Name,
-						Type: schema.DeviceSub,
-					},
-					NetworkID: schema.NetworkID(netID),
-					Origin:    schema.Dashboard,
-				})
+			_, err := orchestrator.GetRepository().NodeOrchestrator().CreateNode(
+				db.WithContext(context.TODO()),
+				host,
+				network,
+				orchestrator.UseKey(&key),
+				orchestrator.SkipPublishPeerUpdate(),
+			)
+			if err != nil {
+				logger.Log(0, fmt.Sprintf("failed to add host (%s, %s) to network (%s): %v", host.ID.String(), host.Name, netID, err.Error()))
 			} else {
-				logic.LogEvent(&models.Event{
-					Action: schema.JoinHostToNet,
-					Source: models.Subject{
-						ID:   key.Value,
-						Name: key.Tags[0],
-						Type: schema.EnrollmentKeySub,
-					},
-					TriggeredBy: username,
-					Target: models.Subject{
-						ID:   h.ID.String(),
-						Name: h.Name,
-						Type: schema.DeviceSub,
-					},
-					NetworkID: schema.NetworkID(netID),
-					Origin:    schema.Dashboard,
-				})
-			}
-
-			newNode, err := logic.UpdateHostNetwork(h, netID, true)
-			if servercfg.IsPro && key.AutoAssignGateway {
-				newNode.AutoAssignGateway = true
-				logic.UpsertNode(newNode)
-			}
-			if err == nil || strings.Contains(err.Error(), "host already part of network") {
-				if len(key.Groups) > 0 {
-					newNode.Tags = make(map[models.TagID]struct{})
-					for _, tagI := range key.Groups {
-						newNode.Tags[tagI] = struct{}{}
-					}
-					logic.UpsertNode(newNode)
-				}
-				if key.Relay != uuid.Nil && !newNode.IsRelayed {
-					// check if relay node exists and acting as relay
-					relaynode, err := logic.GetNodeByID(key.Relay.String())
-					if err == nil && relaynode.IsGw && relaynode.Network == newNode.Network {
-						slog.Error(fmt.Sprintf("adding relayed node %s to relay %s on network %s", newNode.ID.String(), key.Relay.String(), netID))
-						newNode.IsRelayed = true
-						newNode.RelayedBy = key.Relay.String()
-						updatedRelayNode := relaynode
-						updatedRelayNode.RelayedNodes = append(updatedRelayNode.RelayedNodes, newNode.ID.String())
-						logic.UpdateRelayed(&relaynode, &updatedRelayNode)
-						if err := logic.UpsertNode(&updatedRelayNode); err != nil {
-							slog.Error("failed to update node", "nodeid", key.Relay.String())
-						}
-						if err := logic.UpsertNode(newNode); err != nil {
-							slog.Error("failed to update node", "nodeid", key.Relay.String())
-						}
-					} else {
-						slog.Error("failed to relay node. maybe specified relay node is actually not a relay? Or the relayed node is not in the same network with relay?", "err", err)
-					}
-				}
-				if err != nil && strings.Contains(err.Error(), "host already part of network") {
-					continue
+				if len(username) > 0 {
+					logic.LogEvent(&models.Event{
+						Action: schema.JoinHostToNet,
+						Source: models.Subject{
+							ID:   username,
+							Name: username,
+							Type: schema.UserSub,
+						},
+						TriggeredBy: username,
+						Target: models.Subject{
+							ID:   host.ID.String(),
+							Name: host.Name,
+							Type: schema.DeviceSub,
+						},
+						NetworkID: schema.NetworkID(netID),
+						Origin:    schema.Dashboard,
+					})
+				} else {
+					logic.LogEvent(&models.Event{
+						Action: schema.JoinHostToNet,
+						Source: models.Subject{
+							ID:   key.Value,
+							Name: key.Tags[0],
+							Type: schema.EnrollmentKeySub,
+						},
+						TriggeredBy: username,
+						Target: models.Subject{
+							ID:   host.ID.String(),
+							Name: host.Name,
+							Type: schema.DeviceSub,
+						},
+						NetworkID: schema.NetworkID(netID),
+						Origin:    schema.Dashboard,
+					})
 				}
-			} else {
-				logger.Log(0, "failed to add host to network:", h.ID.String(), h.Name, netID, err.Error())
-				continue
-			}
-			logger.Log(1, "added new node", newNode.ID.String(), "to host", h.Name)
-			hostactions.AddAction(models.HostUpdate{
-				Action: models.JoinHostToNetwork,
-				Host:   *h,
-				Node:   *newNode,
-			})
-			if h.IsDefault {
-				// make host gateway
-				logic.CreateIngressGateway(netID, newNode.ID.String(), models.IngressRequest{})
-				logic.CreateRelay(models.RelayRequest{
-					NodeID: newNode.ID.String(),
-					NetID:  netID,
-				})
 			}
 		}
 	}
 	if servercfg.IsMessageQueueBackend() {
 		mq.HostUpdate(&models.HostUpdate{
 			Action: models.RequestAck,
-			Host:   *h,
+			Host:   *host,
 		})
 		if err := mq.PublishPeerUpdate(false); err != nil {
 			logger.Log(0, "failed to publish peer update during registration -", err.Error())

cli/cmd/node/create_ingress.go

@@ -13,11 +13,10 @@ var nodeCreateIngressCmd = &cobra.Command{
 	Deprecated: "in favour of the `gateway` subcommand, in Netmaker v0.90.0.",
 	Aliases:    []string{"create_rag"},
 	Run: func(cmd *cobra.Command, args []string) {
-		functions.PrettyPrint(functions.CreateIngress(args[0], args[1], failover))
+		functions.PrettyPrint(functions.CreateIngress(args[0], args[1]))
 	},
 }
 
 func init() {
-	nodeCreateIngressCmd.Flags().BoolVar(&failover, "failover", false, "Enable FailOver ?")
 	rootCmd.AddCommand(nodeCreateIngressCmd)
 }

cli/cmd/node/flags.go

@@ -2,7 +2,6 @@ package node
 
 var (
 	natEnabled             bool
-	failover               bool
 	networkName            string
 	nodeDefinitionFilePath string
 	address                string

cli/cmd/root.go

@@ -9,7 +9,6 @@ import (
 	"github.com/gravitl/netmaker/cli/cmd/dns"
 	"github.com/gravitl/netmaker/cli/cmd/enrollment_key"
 	"github.com/gravitl/netmaker/cli/cmd/ext_client"
-	"github.com/gravitl/netmaker/cli/cmd/failover"
 	"github.com/gravitl/netmaker/cli/cmd/gateway"
 	"github.com/gravitl/netmaker/cli/cmd/host"
 	"github.com/gravitl/netmaker/cli/cmd/metrics"
@@ -55,7 +54,6 @@ func init() {
 	rootCmd.AddCommand(metrics.GetRoot())
 	rootCmd.AddCommand(host.GetRoot())
 	rootCmd.AddCommand(enrollment_key.GetRoot())
-	rootCmd.AddCommand(failover.GetRoot())
 	rootCmd.AddCommand(gateway.GetRoot())
 	rootCmd.AddCommand(access_token.GetRoot())
 }

cli/functions/node.go

@@ -42,10 +42,10 @@ func DeleteEgress(networkName, nodeID string) *models.ApiNode {
 }
 
 // CreateIngress - turn a node into an ingress
-func CreateIngress(networkName, nodeID string, failover bool) *models.ApiNode {
+func CreateIngress(networkName, nodeID string) *models.ApiNode {
 	return request[models.ApiNode](http.MethodPost, fmt.Sprintf("/api/nodes/%s/%s/createingress", networkName, nodeID), &struct {
 		Failover bool `json:"failover"`
-	}{Failover: failover})
+	}{Failover: false})
 }
 
 // DeleteIngress - remove ingress role from a node

controllers/controller.go

@@ -40,7 +40,6 @@ var HttpHandlers = []interface{}{
 	enrollmentKeyHandlers,
 	aclHandlers,
 	egressHandlers,
-	legacyHandlers,
 }
 
 func HandleRESTRequests(wg *sync.WaitGroup, ctx context.Context) {