Merge branch 'main' into chore/update-permissions-import

# Conflicts:
#	integrations/go.mod
#	integrations/go.sum
This commit is contained in:
pascal
2026-04-16 18:32:47 +02:00
3 changed files with 6 additions and 3 deletions
+2 -2
View File
@@ -1,8 +1,9 @@
module github.com/netbirdio/management-integrations/integrations
go 1.25.5
go 1.25
require (
github.com/eko/gocache/lib/v4 v4.2.0
github.com/gorilla/mux v1.8.1
github.com/netbirdio/netbird v0.67.2-0.20260327134706-beee14b9bfe5
github.com/sirupsen/logrus v1.9.3
@@ -42,7 +43,6 @@ require (
github.com/docker/docker v28.0.1+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/eko/gocache/lib/v4 v4.2.0 // indirect
github.com/eko/gocache/store/go_cache/v4 v4.2.2 // indirect
github.com/eko/gocache/store/redis/v4 v4.2.2 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
+2
View File
@@ -234,6 +234,8 @@ github.com/netbirdio/dex v0.244.0 h1:1GOvi8wnXYassnKGildzNqRHq0RbcfEUw7LKYpKIN7U
github.com/netbirdio/dex v0.244.0/go.mod h1:STGInJhPcAflrHmDO7vyit2kSq03PdL+8zQPoGALtcU=
github.com/netbirdio/netbird v0.62.3 h1:d0j+nznzgYwELavuIu1CbF4dNfRgLB3d6haq0sFM5e0=
github.com/netbirdio/netbird v0.62.3/go.mod h1:l6wZOkwN5q2MznIrWIW9pMgZC/ATsDvEN9R8kILE3P8=
github.com/netbirdio/netbird v0.65.3 h1://bhpHRW3GgneF6IxvtWOrlBzK7PgSrPDdeWVPpLuQ0=
github.com/netbirdio/netbird v0.65.3/go.mod h1:Yeh8fZDsfngjcWedgGrzLKzsxKbGw2dQBOrJpLntpiw=
github.com/netbirdio/netbird v0.67.2-0.20260327134706-beee14b9bfe5 h1:N5WzNA/JrDppPAA+sA6+cDGyBfBwqX9iuF/Eges1zmQ=
github.com/netbirdio/netbird v0.67.2-0.20260327134706-beee14b9bfe5/go.mod h1:yr3CsO7aMZVYvqXQWlRPnVwcM7Iad0aYdLawn/oNUfw=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+2 -1
View File
@@ -3,6 +3,7 @@ package integrations
import (
"context"
cachestore "github.com/eko/gocache/lib/v4/store"
"github.com/netbirdio/netbird/management/internals/modules/peers"
"github.com/netbirdio/netbird/management/server/activity"
nbpeer "github.com/netbirdio/netbird/management/server/peer"
@@ -14,7 +15,7 @@ import (
type IntegratedValidatorImpl struct {
}
func NewIntegratedValidator(_ context.Context, peersManager peers.Manager, settingsManager settings.Manager, store activity.Store) (*IntegratedValidatorImpl, error) {
func NewIntegratedValidator(_ context.Context, _ peers.Manager, _ settings.Manager, _ activity.Store, _ cachestore.StoreInterface) (*IntegratedValidatorImpl, error) {
return &IntegratedValidatorImpl{}, nil
}