sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-11 07:59:08 +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
management/server/grpcserver.go
+2 -2
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
}
management/server/token_mgr.go
+3 -4
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})