Fix merge

netbirdio · Jun 20, 2024 · 9d2f6af · 9d2f6af
1 parent 90b211a
commit 9d2f6af
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/management/server/http/routes_handler_test.go b/management/server/http/routes_handler_test.go
@@ -104,26 +104,26 @@ func initRoutesTestData() *RoutesHandler {
 				}
 				return nil, status.Errorf(status.NotFound, "route with ID %s not found", routeID)
 			},
-			CreateRouteFunc: func(accountID string, prefix netip.Prefix, networkType route.NetworkType, domains domain.List, peerID string, peerGroups []string, description string, netID route.NetID, masquerade bool, metric int, groups []string,accessControlGroups []string, enabled bool, _ string, keepRoute bool) (*route.Route, error) {
+			CreateRouteFunc: func(accountID string, prefix netip.Prefix, networkType route.NetworkType, domains domain.List, peerID string, peerGroups []string, description string, netID route.NetID, masquerade bool, metric int, groups []string, accessControlGroups []string, enabled bool, _ string, keepRoute bool) (*route.Route, error) {
 				if peerID == notFoundPeerID {
 					return nil, status.Errorf(status.InvalidArgument, "peer with ID %s not found", peerID)
 				}
 				if len(peerGroups) > 0 && peerGroups[0] == notFoundGroupID {
 					return nil, status.Errorf(status.InvalidArgument, "peer groups with ID %s not found", peerGroups[0])
 				}
 				return &route.Route{
-					ID:          existingRouteID,
-					NetID:       netID,
-					Peer:        peerID,
-					PeerGroups:  peerGroups,
-					Network:     prefix,
-					Domains:     domains,
-					NetworkType: networkType,
-					Description: description,
-					Masquerade:  masquerade,
-					Enabled:     enabled,
-					Groups:      groups,
-					KeepRoute:   keepRoute,
+					ID:                  existingRouteID,
+					NetID:               netID,
+					Peer:                peerID,
+					PeerGroups:          peerGroups,
+					Network:             prefix,
+					Domains:             domains,
+					NetworkType:         networkType,
+					Description:         description,
+					Masquerade:          masquerade,
+					Enabled:             enabled,
+					Groups:              groups,
+					KeepRoute:           keepRoute,
 					AccessControlGroups: accessControlGroups,
 				}, nil
 			},
@@ -268,7 +268,7 @@ func TestRoutesHandlers(t *testing.T) {
 				Id:                  existingRouteID,
 				Description:         "Post",
 				NetworkId:           "awesomeNet",
-				Network:             "192.168.0.0/16",
+				Network:             toPtr("192.168.0.0/16"),
 				Peer:                &existingPeerID,
 				NetworkType:         route.IPv4NetworkString,
 				Masquerade:          false,