sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-24 03:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[management] Remove resource from groups when resource deleted (#3059)

Browse Source
This commit is contained in:
Pascal Fischer
2024-12-17 11:32:53 +01:00
committed by GitHub
parent ffe0a11d34
commit 12ae7ff54e
4 changed files with 108 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
management/server/networks/manager.go
View File

@@ -2,6 +2,7 @@ package networks
import (
"context"
"fmt"
"github.com/rs/xid"
@@ -98,7 +99,36 @@ func (m *managerImpl) DeleteNetwork(ctx context.Context, accountID, userID, netw
return status.NewPermissionDeniedError()
}
return m.store.DeleteNetwork(ctx, store.LockingStrengthUpdate, accountID, networkID)
unlock := m.store.AcquireWriteLockByUID(ctx, accountID)
defer unlock()
return m.store.ExecuteInTransaction(ctx, func(transaction store.Store) error {
resources, err := transaction.GetNetworkResourcesByNetID(ctx, store.LockingStrengthUpdate, accountID, networkID)
if err != nil {
return fmt.Errorf("failed to get resources in network: %w", err)
}
for _, resource := range resources {
err = m.resourcesManager.DeleteResourceInTransaction(ctx, transaction, accountID, networkID, resource.ID)
if err != nil {
return fmt.Errorf("failed to delete resource: %w", err)
}
}
routers, err := transaction.GetNetworkRoutersByNetID(ctx, store.LockingStrengthUpdate, accountID, networkID)
if err != nil {
return fmt.Errorf("failed to get routers in network: %w", err)
}
for _, router := range routers {
err = transaction.DeleteNetworkRouter(ctx, store.LockingStrengthUpdate, accountID, router.ID)
if err != nil {
return fmt.Errorf("failed to delete router: %w", err)
}
}
return transaction.DeleteNetwork(ctx, store.LockingStrengthUpdate, accountID, networkID)
})
}
func (m *managerImpl) GetResourceManager() resources.Manager {

37
management/server/networks/resources/manager.go
View File

@@ -19,6 +19,7 @@ type Manager interface {
GetResource(ctx context.Context, accountID, userID, networkID, resourceID string) (*types.NetworkResource, error)
UpdateResource(ctx context.Context, userID string, resource *types.NetworkResource) (*types.NetworkResource, error)
DeleteResource(ctx context.Context, accountID, userID, networkID, resourceID string) error
DeleteResourceInTransaction(ctx context.Context, transaction store.Store, accountID, networkID, resourceID string) error
}
type managerImpl struct {
@@ -161,5 +162,39 @@ func (m *managerImpl) DeleteResource(ctx context.Context, accountID, userID, net
return status.NewPermissionDeniedError()
}
return m.store.DeleteNetworkResource(ctx, store.LockingStrengthUpdate, accountID, resourceID)
unlock := m.store.AcquireWriteLockByUID(ctx, accountID)
defer unlock()
return m.store.ExecuteInTransaction(ctx, func(transaction store.Store) error {
return m.DeleteResourceInTransaction(ctx, transaction, accountID, networkID, resourceID)
})
}
func (m *managerImpl) DeleteResourceInTransaction(ctx context.Context, transaction store.Store, accountID, networkID, resourceID string) error {
resource, err := transaction.GetNetworkResourceByID(ctx, store.LockingStrengthUpdate, accountID, resourceID)
if err != nil {
return fmt.Errorf("failed to get network resource: %w", err)
}
if resource.NetworkID != networkID {
return errors.New("resource not part of network")
}
account, err := transaction.GetAccount(ctx, accountID)
if err != nil {
return fmt.Errorf("failed to get account: %w", err)
}
account.DeleteResource(resource.ID)
err = transaction.SaveAccount(ctx, account)
if err != nil {
return fmt.Errorf("failed to save account: %w", err)
}
err = transaction.IncrementNetworkSerial(ctx, store.LockingStrengthUpdate, accountID)
if err != nil {
return fmt.Errorf("failed to increment network serial: %w", err)
}
return transaction.DeleteNetworkResource(ctx, store.LockingStrengthUpdate, accountID, resourceID)
}