From a2fb274b86641f1569e1b288ad0f8704c519e7a0 Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Mon, 18 Nov 2024 15:09:30 +0300 Subject: [PATCH] remove duplicate store method Signed-off-by: bcmmbaga --- management/server/peer.go | 2 +- management/server/sql_store.go | 17 ----------------- management/server/store.go | 1 - 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/management/server/peer.go b/management/server/peer.go index a93f62a1d..e71587948 100644 --- a/management/server/peer.go +++ b/management/server/peer.go @@ -1226,7 +1226,7 @@ func getPeerGroupIDs(ctx context.Context, transaction Store, accountID string, p } func getPeerDNSLabels(ctx context.Context, transaction Store, accountID string) (lookupMap, error) { - dnsLabels, err := transaction.GetAccountPeerDNSLabels(ctx, LockingStrengthShare, accountID) + dnsLabels, err := transaction.GetPeerLabelsInAccount(ctx, LockingStrengthShare, accountID) if err != nil { return nil, err } diff --git a/management/server/sql_store.go b/management/server/sql_store.go index a672e7e6f..6e4f1d396 100644 --- a/management/server/sql_store.go +++ b/management/server/sql_store.go @@ -1147,23 +1147,6 @@ func (s *SqlStore) GetPeersByIDs(ctx context.Context, lockStrength LockingStreng return peersMap, nil } -// GetAccountPeerDNSLabels retrieves all unique DNS labels for peers associated with a specified account. -func (s *SqlStore) GetAccountPeerDNSLabels(ctx context.Context, lockStrength LockingStrength, accountID string) ([]string, error) { - var labels []string - - result := s.db.Clauses(clause.Locking{Strength: string(lockStrength)}).Model(&nbpeer.Peer{}). - Where(accountIDCondition, accountID).Pluck("dns_label", &labels) - if result.Error != nil { - if errors.Is(result.Error, gorm.ErrRecordNotFound) { - return nil, status.Errorf(status.NotFound, "no peers found for the account") - } - log.WithContext(ctx).Errorf("error when getting dns labels from the store: %s", result.Error) - return nil, status.Errorf(status.Internal, "issue getting dns labels from store") - } - - return labels, nil -} - // GetAccountPeersWithExpiration retrieves a list of peers that have login expiration enabled and added by a user. func (s *SqlStore) GetAccountPeersWithExpiration(ctx context.Context, lockStrength LockingStrength, accountID string) ([]*nbpeer.Peer, error) { var peers []*nbpeer.Peer diff --git a/management/server/store.go b/management/server/store.go index 94324fcc3..5b48de378 100644 --- a/management/server/store.go +++ b/management/server/store.go @@ -95,7 +95,6 @@ type Store interface { DeletePostureChecks(ctx context.Context, lockStrength LockingStrength, accountID, postureChecksID string) error GetPeerLabelsInAccount(ctx context.Context, lockStrength LockingStrength, accountId string) ([]string, error) - GetAccountPeerDNSLabels(ctx context.Context, lockStrength LockingStrength, accountID string) ([]string, error) AddPeerToAllGroup(ctx context.Context, accountID string, peerID string) error AddPeerToGroup(ctx context.Context, accountId string, peerId string, groupID string) error AddPeerToAccount(ctx context.Context, peer *nbpeer.Peer) error