mirror of
https://github.com/netbirdio/netbird.git
synced 2026-10-03 12:09:09 +02:00
Reuse filterEnabledProviders in the authorized-provider selection
This commit is contained in:
@@ -3,7 +3,6 @@ package agentnetwork
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"sort"
|
|
||||||
|
|
||||||
"github.com/netbirdio/netbird/management/internals/modules/agentnetwork/catalog"
|
"github.com/netbirdio/netbird/management/internals/modules/agentnetwork/catalog"
|
||||||
"github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types"
|
"github.com/netbirdio/netbird/management/internals/modules/agentnetwork/types"
|
||||||
@@ -117,22 +116,16 @@ func (m *managerImpl) authorizedProvidersForGroups(ctx context.Context, accountI
|
|||||||
return nil, nil, fmt.Errorf("list account providers: %w", err)
|
return nil, nil, fmt.Errorf("list account providers: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
authorized := make([]*types.Provider, 0, len(providers))
|
// filterEnabledProviders carries the enabled filter and the
|
||||||
for _, p := range providers {
|
// created_at/ID order shared with the router synthesizer.
|
||||||
if p == nil || !p.Enabled {
|
enabled := filterEnabledProviders(providers)
|
||||||
continue
|
authorized := make([]*types.Provider, 0, len(enabled))
|
||||||
}
|
for _, p := range enabled {
|
||||||
if len(policiesForProvider(applicable, p.ID)) == 0 {
|
if len(policiesForProvider(applicable, p.ID)) == 0 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
authorized = append(authorized, p)
|
authorized = append(authorized, p)
|
||||||
}
|
}
|
||||||
sort.SliceStable(authorized, func(i, j int) bool {
|
|
||||||
if !authorized[i].CreatedAt.Equal(authorized[j].CreatedAt) {
|
|
||||||
return authorized[i].CreatedAt.Before(authorized[j].CreatedAt)
|
|
||||||
}
|
|
||||||
return authorized[i].ID < authorized[j].ID
|
|
||||||
})
|
|
||||||
return authorized, applicable, nil
|
return authorized, applicable, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user