extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-19 11:20:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

simplify storage inheritance

Browse Source
This commit is contained in:
Pascal Fischer
2024-03-14 11:42:25 +01:00
parent f31b06fc92
commit 27c3a4c5d6
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
management/refactor/mesh/controller.go
View File

@@ -27,8 +27,8 @@ type DefaultController struct {
func NewDefaultController() *DefaultController { func NewDefaultController() *DefaultController {
storeStore, _ := store.NewDefaultStore(store.SqliteStoreEngine, "", nil) storeStore, _ := store.NewDefaultStore(store.SqliteStoreEngine, "", nil)
peersManager := peers.NewDefaultManager(storeStore, nil)
settingsManager := settings.NewDefaultManager(storeStore) settingsManager := settings.NewDefaultManager(storeStore)
peersManager := peers.NewDefaultManager(storeStore, settingsManager)
usersManager := users.NewDefaultManager(storeStore, peersManager) usersManager := users.NewDefaultManager(storeStore, peersManager)
policiesManager := policies.NewDefaultManager(storeStore, peersManager) policiesManager := policies.NewDefaultManager(storeStore, peersManager)
@@ -60,7 +60,7 @@ func (c *DefaultController) LoginPeer(login peers.PeerLogin) {
} }
} }
account, err := pm.accountManager.GetAccount(peer.AccountID) account, err := pm.accountManager.GetAccount(peer.GetAccountID())
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@@ -117,8 +117,8 @@ func (c *DefaultController) GetPeerNetworkMap(peerID, dnsDomain string) *Network
aclPeers, firewallRules := c.policiesManager.GetAccessiblePeersAndFirewallRules(peerID) aclPeers, firewallRules := c.policiesManager.GetAccessiblePeersAndFirewallRules(peerID)
// exclude expired peers // exclude expired peers
var peersToConnect []*peers.Peer var peersToConnect []peers.Peer
var expiredPeers []*peers.Peer var expiredPeers []peers.Peer
accSettings, _ := c.settingsManager.GetSettings(peer.GetAccountID()) accSettings, _ := c.settingsManager.GetSettings(peer.GetAccountID())
for _, p := range aclPeers { for _, p := range aclPeers {
expired, _ := p.LoginExpired(accSettings.GetPeerLoginExpiration()) expired, _ := p.LoginExpired(accSettings.GetPeerLoginExpiration())

4
management/refactor/peers/manager.go
View File

@@ -12,11 +12,11 @@ type Manager interface {
} }
type DefaultManager struct { type DefaultManager struct {
repository repository repository Repository
settingsManager settings.Manager settingsManager settings.Manager
} }
func NewDefaultManager(repository repository, settingsManager settings.Manager) *DefaultManager { func NewDefaultManager(repository Repository, settingsManager settings.Manager) *DefaultManager {
return &DefaultManager{ return &DefaultManager{
repository: repository, repository: repository,
settingsManager: settingsManager, settingsManager: settingsManager,

8
management/refactor/peers/repository.go
View File

@@ -1,8 +1,8 @@
package peers package peers
type repository interface { type Repository interface {
FindPeerByPubKey(pubKey string) (*Peer, error) FindPeerByPubKey(pubKey string) (Peer, error)
FindPeerByID(id string) (*Peer, error) FindPeerByID(id string) (Peer, error)
FindAllPeersInAccount(id string) ([]*Peer, error) FindAllPeersInAccount(id string) ([]Peer, error)
UpdatePeer(peer Peer) error UpdatePeer(peer Peer) error
} }

2
management/refactor/policies/repository.go
View File

@@ -1,4 +1,4 @@
package policies package policies
type repository interface { type Repository interface {
} }

2
management/refactor/settings/repository.go
View File

@@ -1,5 +1,5 @@
package settings package settings
type repository interface { type Repository interface {
FindSettings(accountID string) (Settings, error) FindSettings(accountID string) (Settings, error)
} }

8
management/refactor/store/postgres_store.go
View File

@@ -12,22 +12,22 @@ const (
type DefaultPostgresStore struct { type DefaultPostgresStore struct {
} }
func (s *DefaultPostgresStore) FindSettings(accountID string) (*settings.Settings, error) { func (s *DefaultPostgresStore) FindSettings(accountID string) (settings.Settings, error) {
// TODO implement me // TODO implement me
panic("implement me") panic("implement me")
} }
func (s *DefaultPostgresStore) FindPeerByPubKey(pubKey string) (*peers.Peer, error) { func (s *DefaultPostgresStore) FindPeerByPubKey(pubKey string) (peers.Peer, error) {
// TODO implement me // TODO implement me
panic("implement me") panic("implement me")
} }
func (s *DefaultPostgresStore) FindPeerByID(id string) (*peers.Peer, error) { func (s *DefaultPostgresStore) FindPeerByID(id string) (peers.Peer, error) {
// TODO implement me // TODO implement me
panic("implement me") panic("implement me")
} }
func (s *DefaultPostgresStore) FindAllPeersInAccount(id string) ([]*peers.Peer, error) { func (s *DefaultPostgresStore) FindAllPeersInAccount(id string) ([]peers.Peer, error) {
// TODO implement me // TODO implement me
panic("implement me") panic("implement me")
} }

8
management/refactor/store/sqlite_store.go
View File

@@ -31,22 +31,22 @@ type DefaultSqliteStore struct {
installationPK int installationPK int
} }
func (s *DefaultSqliteStore) FindSettings(accountID string) (*settings.Settings, error) { func (s *DefaultSqliteStore) FindSettings(accountID string) (settings.Settings, error) {
// TODO implement me // TODO implement me
panic("implement me") panic("implement me")
} }
func (s *DefaultSqliteStore) FindPeerByPubKey(pubKey string) (*peers.Peer, error) { func (s *DefaultSqliteStore) FindPeerByPubKey(pubKey string) (peers.Peer, error) {
// TODO implement me // TODO implement me
panic("implement me") panic("implement me")
} }
func (s *DefaultSqliteStore) FindPeerByID(id string) (*peers.Peer, error) { func (s *DefaultSqliteStore) FindPeerByID(id string) (peers.Peer, error) {
// TODO implement me // TODO implement me
panic("implement me") panic("implement me")
} }
func (s *DefaultSqliteStore) FindAllPeersInAccount(id string) ([]*peers.Peer, error) { func (s *DefaultSqliteStore) FindAllPeersInAccount(id string) ([]peers.Peer, error) {
// TODO implement me // TODO implement me
panic("implement me") panic("implement me")
} }

12
management/refactor/store/store.go
View File

@@ -14,18 +14,18 @@ import (
type Store interface { type Store interface {
GetLicense() string GetLicense() string
FindPeerByPubKey(pubKey string) (*peers.Peer, error) FindPeerByPubKey(pubKey string) (peers.Peer, error)
FindPeerByID(id string) (*peers.Peer, error) FindPeerByID(id string) (peers.Peer, error)
FindAllPeersInAccount(id string) ([]*peers.Peer, error) FindAllPeersInAccount(id string) ([]peers.Peer, error)
UpdatePeer(peer peers.Peer) error UpdatePeer(peer peers.Peer) error
FindSettings(accountID string) (settings.Settings, error) FindSettings(accountID string) (settings.Settings, error)
} }
type DefaultStore interface { type DefaultStore interface {
GetLicense() string GetLicense() string
FindPeerByPubKey(pubKey string) (*peers.Peer, error) FindPeerByPubKey(pubKey string) (peers.Peer, error)
FindPeerByID(id string) (*peers.Peer, error) FindPeerByID(id string) (peers.Peer, error)
FindAllPeersInAccount(id string) ([]*peers.Peer, error) FindAllPeersInAccount(id string) ([]peers.Peer, error)
UpdatePeer(peer peers.Peer) error UpdatePeer(peer peers.Peer) error
FindSettings(accountID string) (settings.Settings, error) FindSettings(accountID string) (settings.Settings, error)
} }

2
management/refactor/users/repository.go
View File

@@ -1,4 +1,4 @@
package users package users
type repository interface { type Repository interface {
} }