wire up validated peers

Signed-off-by: Dmitri Dolguikh <dmitri.external@netbird.io>
This commit is contained in:
Dmitri Dolguikh
2026-08-04 12:52:09 +02:00
parent 1f190a50cf
commit a0fe80cd99
3 changed files with 12 additions and 4 deletions

View File

@@ -8,7 +8,6 @@ import (
"reflect"
"strings"
"github.com/netbirdio/netbird/management/server/integrations/integrated_validator"
"github.com/netbirdio/netbird/shared/management/networkmap"
"github.com/netbirdio/netbird/shared/management/networkmap/nmdata"
"github.com/rs/xid"
@@ -38,8 +37,7 @@ type NetworkMapDBStore interface {
}
type NetworkMapDBStoreImpl struct {
store NetworkMapDBStore
integratedPeerValidator integrated_validator.IntegratedValidator
store NetworkMapDBStore
}
func FromSqlTypesToSharedTypes(src reflect.Value, dst reflect.Value) error {

View File

@@ -81,6 +81,11 @@ func (pg *PgStore) GetNetworkMapData(ctx context.Context, accountId string) (*ne
if err != nil {
return rollbackAndReturnError(ctx, tx, err)
}
extraSettings, err := pg.settingsManager.GetExtraSettings(ctx, accountId)
if err != nil {
return rollbackAndReturnError(ctx, tx, err)
}
validatedPeers, err := pg.integratedPeerValidator.GetValidatedPeers(ctx, accountId, toSliceOfPtrs(groups), toSliceOfPtrs(peers), extraSettings)
resourcePolicies := make(map[string][]*nmdata.Policy)
for _, resource := range networkResources {
@@ -117,6 +122,7 @@ func (pg *PgStore) GetNetworkMapData(ctx context.Context, accountId string) (*ne
DNSSettings: &dnsSettings,
Network: &network,
Peers: toMap(peers, func(p nmdata.Peer) string { return p.ID }),
ValidatedPeers: validatedPeers,
Groups: toMap(groups, func(g nmdata.Group) string { return g.PublicID }),
Policies: toSliceOfPtrs(policies),
ResourcePolicies: resourcePolicies,

View File

@@ -7,6 +7,8 @@ import (
"github.com/jackc/pgx/v5/pgxpool"
networkmapdb "github.com/netbirdio/netbird/management/internals/network_map_db"
"github.com/netbirdio/netbird/management/server/integrations/integrated_validator"
"github.com/netbirdio/netbird/management/server/settings"
)
const (
@@ -19,7 +21,9 @@ const (
var _ networkmapdb.NetworkMapDBStore = &PgStore{}
type PgStore struct {
Pool *pgxpool.Pool
Pool *pgxpool.Pool
integratedPeerValidator integrated_validator.IntegratedValidator
settingsManager settings.Manager
}
func NewPostgresqlStore(ctx context.Context, dsn string) (*PgStore, error) {