sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-09-22 14:49:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts with main

Browse Source
This commit is contained in:
Viktor Liu
2026-05-20 15:38:01 +02:00
parent d705dac572 9192b4f029
commit fd8a21d3a0
23 changed files with 397 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/internals/shared/grpc/proxy_group_access_test.go
+1 -1
View File
@@ -109,7 +109,7 @@ func (m *mockReverseProxyManager) GetServiceByDomain(_ context.Context, domain s
return nil, errors.New("service not found for domain: " + domain)
}
func (m *mockReverseProxyManager) GetActiveClusters(_ context.Context, _, _ string) ([]proxy.Cluster, error) {
func (m *mockReverseProxyManager) GetClusters(_ context.Context, _, _ string) ([]proxy.Cluster, error) {
return nil, nil
}
management/internals/shared/grpc/validate_session_test.go
+1 -1
View File
@@ -322,7 +322,7 @@ func (m *testValidateSessionServiceManager) GetServiceByDomain(ctx context.Conte
return m.store.GetServiceByDomain(ctx, domain)
}
func (m *testValidateSessionServiceManager) GetActiveClusters(_ context.Context, _, _ string) ([]proxy.Cluster, error) {
func (m *testValidateSessionServiceManager) GetClusters(_ context.Context, _, _ string) ([]proxy.Cluster, error) {
return nil, nil
}