fix egress reference errors

controllers/egress.go

@@ -12,6 +12,7 @@ import (
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/models"
 	"github.com/gravitl/netmaker/mq"
+	"github.com/gravitl/netmaker/schema"
 	"gorm.io/datatypes"
 )
 
@@ -52,7 +53,7 @@ func createEgress(w http.ResponseWriter, r *http.Request) {
 		egressRange = "*"
 	}
 
-	e := models.Egress{
+	e := schema.Egress{
 		ID:          uuid.New().String(),
 		Name:        req.Name,
 		Network:     req.Network,
@@ -101,7 +102,7 @@ func listEgress(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("network is required"), "badrequest"))
 		return
 	}
-	e := models.Egress{Network: network}
+	e := schema.Egress{Network: network}
 	list, err := e.ListByNetwork()
 	if err != nil {
 		logic.ReturnErrorResponse(
@@ -144,7 +145,7 @@ func updateEgress(w http.ResponseWriter, r *http.Request) {
 		egressRange = "*"
 	}
 
-	e := models.Egress{ID: req.ID}
+	e := schema.Egress{ID: req.ID}
 	err = e.Get()
 	if err != nil {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
@@ -209,7 +210,7 @@ func deleteEgress(w http.ResponseWriter, r *http.Request) {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(errors.New("id is required"), "badrequest"))
 		return
 	}
-	e := models.Egress{ID: id}
+	e := schema.Egress{ID: id}
 	err := e.Delete()
 	if err != nil {
 		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))

logic/acls.go

@@ -13,6 +13,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/schema"
 	"github.com/gravitl/netmaker/servercfg"
 )
 
@@ -291,7 +292,7 @@ func checkIfAclTagisValid(t models.AclPolicyTag, netID models.NetworkID, policyT
 			}
 		}
 	case models.EgressID:
-		e := models.Egress{
+		e := schema.Egress{
 			ID: t.Value,
 		}
 		err := e.Get()
@@ -1249,7 +1250,7 @@ func getEgressUserRulesForNode(targetnode *models.Node,
 			}
 			for _, dstI := range acl.Dst {
 				if dstI.ID == models.EgressID {
-					e := models.Egress{ID: dstI.Value}
+					e := schema.Egress{ID: dstI.Value}
 					err := e.Get()
 					if err != nil {
 						continue

logic/egress.go

@@ -5,9 +5,10 @@ import (
 	"net"
 
 	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/schema"
 )
 
-func ValidateEgressReq(e *models.Egress) bool {
+func ValidateEgressReq(e *schema.Egress) bool {
 	if e.Network == "" {
 		return false
 	}
@@ -44,7 +45,7 @@ func GetInetClientsFromAclPolicies(node *models.Node) (inetClientIDs []string) {
 	for _, acl := range acls {
 		for _, dstI := range acl.Dst {
 			if dstI.ID == models.EgressID {
-				e := models.Egress{
+				e := schema.Egress{
 					ID: dstI.Value,
 				}
 				err := e.Get()
@@ -74,7 +75,7 @@ func IsNodeUsingInternetGw(node *models.Node) {
 		srcVal := convAclTagToValueMap(acl.Src)
 		for _, dstI := range acl.Dst {
 			if dstI.ID == models.EgressID {
-				e := models.Egress{ID: dstI.Value}
+				e := schema.Egress{ID: dstI.Value}
 				err := e.Get()
 				if err != nil {
 					continue
@@ -101,7 +102,7 @@ func IsNodeUsingInternetGw(node *models.Node) {
 }
 
 func GetNodeEgressInfo(targetNode *models.Node) {
-	eli, _ := (&models.Egress{Network: targetNode.Network}).ListByNetwork()
+	eli, _ := (&schema.Egress{Network: targetNode.Network}).ListByNetwork()
 	req := models.EgressGatewayRequest{
 		NodeID: targetNode.ID.String(),
 		NetID:  targetNode.Network,

logic/extpeers.go

@@ -16,6 +16,7 @@ import (
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/logic/acls"
 	"github.com/gravitl/netmaker/models"
+	"github.com/gravitl/netmaker/schema"
 	"github.com/gravitl/netmaker/servercfg"
 	"golang.org/x/exp/slog"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
@@ -629,7 +630,7 @@ func getFwRulesForNodeAndPeerOnGw(node, peer models.Node, allowedPolicies []mode
 		for _, dstI := range policy.Dst {
 			if dstI.ID == models.EgressID {
 
-				e := models.Egress{ID: dstI.Value}
+				e := schema.Egress{ID: dstI.Value}
 				err := e.Get()
 				if err != nil {
 					continue
@@ -718,7 +719,7 @@ func getFwRulesForUserNodesOnGw(node models.Node, nodes []models.Node) (rules []
 						for _, dstI := range policy.Dst {
 							if dstI.ID == models.EgressID {
 
-								e := models.Egress{ID: dstI.Value}
+								e := schema.Egress{ID: dstI.Value}
 								err := e.Get()
 								if err != nil {
 									continue