Update integrated peer approval

Delete unused package
This commit is contained in:
Zoltan Papp
2024-03-13 12:55:01 +01:00
parent 469a80446a
commit 78fc48320b
5 changed files with 17 additions and 43 deletions
-5
View File
@@ -1,5 +0,0 @@
module github.com/netbirdio/management-integrations/additions
go 1.20
require github.com/netbirdio/netbird v0.24.3-0.20231128133457-bab420ca7798
-2
View File
@@ -1,2 +0,0 @@
github.com/netbirdio/netbird v0.24.3-0.20231128133457-bab420ca7798 h1:k0FvU2kxsZC/rikDD2JdC5CjuX5s09wUue6xq87f/AE=
github.com/netbirdio/netbird v0.24.3-0.20231128133457-bab420ca7798/go.mod h1:5TrGRLGrGQZDEsGLQVR5KW8T82atu6J2WvOJcxQmtmE=
-14
View File
@@ -1,14 +0,0 @@
package additions
import (
"github.com/netbirdio/netbird/management/server/activity"
nbpeer "github.com/netbirdio/netbird/management/server/peer"
)
func ValidatePeersUpdateRequest(update *nbpeer.Peer, peer *nbpeer.Peer, userID string, accountID string, eventStore activity.Store, dnsDomain string) (*nbpeer.Peer, error) {
return update, nil
}
func ValidatePeers(peers []*nbpeer.Peer) []*nbpeer.Peer {
return peers
}
-21
View File
@@ -1,21 +0,0 @@
package additions
import (
"github.com/netbirdio/netbird/management/server/account"
"github.com/netbirdio/netbird/management/server/activity"
nbpeer "github.com/netbirdio/netbird/management/server/peer"
log "github.com/sirupsen/logrus"
)
func ValidateExtraSettings(newExtraSettings *account.ExtraSettings, oldExtraSettings *account.ExtraSettings, peers map[string]*nbpeer.Peer, userID string, accountID string, eventStore activity.Store) error {
if newExtraSettings != nil {
if oldExtraSettings == nil {
log.Info("extra settings are only supported on the cloud version of NetBird")
}
if newExtraSettings.PeerApprovalEnabled {
log.Info("setting peer approval to false")
newExtraSettings.PeerApprovalEnabled = false
}
}
return nil
}
+17 -1
View File
@@ -13,13 +13,29 @@ func NewIntegratedApproval(activity.Store) (*IntegratedApprovalImpl, error) {
return &IntegratedApprovalImpl{}, nil
}
func (v *IntegratedApprovalImpl) UpdatePeerApprovalSetting(*account.ExtraSettings, *account.ExtraSettings, map[string]*nbpeer.Peer, string, string) error {
return nil
}
func (v *IntegratedApprovalImpl) ApprovePeer(update *nbpeer.Peer, _ *nbpeer.Peer, _ string, _ string, _ string, _ []string, _ *account.ExtraSettings) (*nbpeer.Peer, error) {
return update, nil
}
func (v *IntegratedApprovalImpl) PreparePeer(_ string, peer *nbpeer.Peer, _ []string, _ *account.ExtraSettings) *nbpeer.Peer {
return peer.Copy()
}
func (v *IntegratedApprovalImpl) IsRequiresApproval(accountID string, peer *nbpeer.Peer, peersGroup []string, extraSettings *account.ExtraSettings) bool {
func (v *IntegratedApprovalImpl) IsRequiresApproval(_ string, _ *nbpeer.Peer, _ []string, _ *account.ExtraSettings) bool {
return false
}
func (v *IntegratedApprovalImpl) GetApprovedPeers(_ string, peers map[string]*nbpeer.Peer, _ *account.ExtraSettings) (map[string]struct{}, error) {
approvedPeers := make(map[string]struct{})
for p := range peers {
approvedPeers[p] = struct{}{}
}
return approvedPeers, nil
}
func (v *IntegratedApprovalImpl) Stop() {
}