sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-19 23:11:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

update integrations and go mod

Browse Source
This commit is contained in:
Maycon Santos
2025-03-09 18:47:05 +01:00
parent 3482852bb6
commit 036cecbf46
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -60,7 +60,7 @@ require (
github.com/miekg/dns v1.1.59
github.com/mitchellh/hashstructure/v2 v2.0.2
github.com/nadoo/ipset v0.5.0
github.com/netbirdio/management-integrations/integrations v0.0.0-20250307123548-fdd328baf934
github.com/netbirdio/management-integrations/integrations v0.0.0-20250309172507-ee34714caafc
github.com/netbirdio/signal-dispatcher/dispatcher v0.0.0-20241010133937-e0df50df217d
github.com/okta/okta-sdk-golang/v2 v2.18.0
github.com/oschwald/maxminddb-golang v1.12.0

2
go.sum
View File

@@ -531,6 +531,8 @@ github.com/netbirdio/ice/v3 v3.0.0-20240315174635-e72a50fcb64e h1:PURA50S8u4mF6R
github.com/netbirdio/ice/v3 v3.0.0-20240315174635-e72a50fcb64e/go.mod h1:YMLU7qbKfVjmEv7EoZPIVEI+kNYxWCdPK3VS0BU+U4Q=
github.com/netbirdio/management-integrations/integrations v0.0.0-20250307123548-fdd328baf934 h1:/fb+a/xr1U2xD1Sl3nAP3AdrUORHSWbsMVOrpB2PdPk=
github.com/netbirdio/management-integrations/integrations v0.0.0-20250307123548-fdd328baf934/go.mod h1:1ubblPEYqdsR4L2bPIbkVvqBs6XYxxfW1C9PcoX067A=
github.com/netbirdio/management-integrations/integrations v0.0.0-20250309172507-ee34714caafc h1:ighDmYrYbNGj+XMh8F0Ro5yDZ89PaNXRcM9eXrwtLHU=
github.com/netbirdio/management-integrations/integrations v0.0.0-20250309172507-ee34714caafc/go.mod h1:gxlShs2JgyGBdGt4ctGVZsShX2Tcv8YFYt9QKr3jNhU=
github.com/netbirdio/service v0.0.0-20240911161631-f62744f42502 h1:3tHlFmhTdX9axERMVN63dqyFqnvuD+EMJHzM7mNGON8=
github.com/netbirdio/service v0.0.0-20240911161631-f62744f42502/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM=
github.com/netbirdio/signal-dispatcher/dispatcher v0.0.0-20241010133937-e0df50df217d h1:bRq5TKgC7Iq20pDiuC54yXaWnAVeS5PdGpSokFTlR28=

4
management/server/grpcserver.go
View File

@@ -12,7 +12,7 @@ import (
pb "github.com/golang/protobuf/proto" // nolint
"github.com/golang/protobuf/ptypes/timestamp"
"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/realip"
"github.com/netbirdio/management-integrations/integrations"
integrationsConfig "github.com/netbirdio/management-integrations/integrations/config"
log "github.com/sirupsen/logrus"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
"google.golang.org/grpc/codes"
@@ -605,7 +605,7 @@ func toNetbirdConfig(config *Config, turnCredentials *Token, relayToken *Token,
Relay: relayCfg,
}
integrations.ExtendNetBirdConfig(nbConfig, extraSettings)
integrationsConfig.ExtendNetBirdConfig(nbConfig, extraSettings)
return nbConfig
}

7
management/server/token_mgr.go
View File

@@ -9,10 +9,9 @@ import (
"sync"
"time"
integrationsConfig "github.com/netbirdio/management-integrations/integrations/config"
log "github.com/sirupsen/logrus"
"github.com/netbirdio/management-integrations/integrations"
"github.com/netbirdio/netbird/management/proto"
auth "github.com/netbirdio/netbird/relay/auth/hmac"
authv2 "github.com/netbirdio/netbird/relay/auth/hmac/v2"
@@ -218,7 +217,7 @@ func (m *TimeBasedAuthSecretsManager) pushNewTURNAndRelayTokens(ctx context.Cont
}
}
integrations.ExtendNetBirdConfig(update.NetbirdConfig, nil)
integrationsConfig.ExtendNetBirdConfig(update.NetbirdConfig, nil)
log.WithContext(ctx).Debugf("sending new TURN credentials to peer %s", peerID)
m.updateManager.SendUpdate(ctx, peerID, &UpdateMessage{Update: update})
@@ -242,7 +241,7 @@ func (m *TimeBasedAuthSecretsManager) pushNewRelayTokens(ctx context.Context, pe
},
}
integrations.ExtendNetBirdConfig(update.NetbirdConfig, nil)
integrationsConfig.ExtendNetBirdConfig(update.NetbirdConfig, nil)
log.WithContext(ctx).Debugf("sending new relay credentials to peer %s", peerID)
m.updateManager.SendUpdate(ctx, peerID, &UpdateMessage{Update: update})