sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 16:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename byod to byop

Browse Source
This commit is contained in:
crn4
2026-03-19 16:11:57 +01:00
parent 26ba03f08e
commit da57b0f276
7 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
management/internals/modules/reverseproxy/domain/manager/manager.go
View File

@@ -69,7 +69,7 @@ func (m Manager) GetDomains(ctx context.Context, accountID, userID string) ([]*d
var ret []*domain.Domain
// Add connected proxy clusters as free domains.
// For BYOD accounts, only their own cluster is returned; otherwise shared clusters.
// For BYOP accounts, only their own cluster is returned; otherwise shared clusters.
allowList, err := m.getClusterAllowList(ctx, accountID)
if err != nil {
log.WithContext(ctx).Errorf("failed to get active proxy cluster addresses: %v", err)
@@ -286,12 +286,12 @@ func (m Manager) DeriveClusterFromDomain(ctx context.Context, accountID, domain
}
func (m Manager) getClusterAllowList(ctx context.Context, accountID string) ([]string, error) {
byodAddresses, err := m.proxyManager.GetActiveClusterAddressesForAccount(ctx, accountID)
byopAddresses, err := m.proxyManager.GetActiveClusterAddressesForAccount(ctx, accountID)
if err != nil {
return nil, fmt.Errorf("get BYOD cluster addresses: %w", err)
return nil, fmt.Errorf("get BYOP cluster addresses: %w", err)
}
if len(byodAddresses) > 0 {
return byodAddresses, nil
if len(byopAddresses) > 0 {
return byopAddresses, nil
}
return m.proxyManager.GetActiveClusterAddresses(ctx)
}

14
management/internals/modules/reverseproxy/domain/manager/manager_test.go
View File

@@ -28,14 +28,14 @@ func (m *mockProxyManager) GetActiveClusterAddressesForAccount(ctx context.Conte
return nil, nil
}
func TestGetClusterAllowList_BYODProxy(t *testing.T) {
func TestGetClusterAllowList_BYOPProxy(t *testing.T) {
pm := &mockProxyManager{
getActiveClusterAddressesForAccountFunc: func(_ context.Context, accID string) ([]string, error) {
assert.Equal(t, "acc-123", accID)
return []string{"byod.example.com"}, nil
return []string{"byop.example.com"}, nil
},
getActiveClusterAddressesFunc: func(_ context.Context) ([]string, error) {
t.Fatal("should not call GetActiveClusterAddresses when BYOD addresses exist")
t.Fatal("should not call GetActiveClusterAddresses when BYOP addresses exist")
return nil, nil
},
}
@@ -43,10 +43,10 @@ func TestGetClusterAllowList_BYODProxy(t *testing.T) {
mgr := Manager{proxyManager: pm}
result, err := mgr.getClusterAllowList(context.Background(), "acc-123")
require.NoError(t, err)
assert.Equal(t, []string{"byod.example.com"}, result)
assert.Equal(t, []string{"byop.example.com"}, result)
}
func TestGetClusterAllowList_NoBYOD_FallbackToShared(t *testing.T) {
func TestGetClusterAllowList_NoBYOP_FallbackToShared(t *testing.T) {
pm := &mockProxyManager{
getActiveClusterAddressesForAccountFunc: func(_ context.Context, _ string) ([]string, error) {
return nil, nil
@@ -62,7 +62,7 @@ func TestGetClusterAllowList_NoBYOD_FallbackToShared(t *testing.T) {
assert.Equal(t, []string{"eu.proxy.netbird.io", "us.proxy.netbird.io"}, result)
}
func TestGetClusterAllowList_BYODError_FallbackToShared(t *testing.T) {
func TestGetClusterAllowList_BYOPError_FallbackToShared(t *testing.T) {
pm := &mockProxyManager{
getActiveClusterAddressesForAccountFunc: func(_ context.Context, _ string) ([]string, error) {
return nil, errors.New("db error")
@@ -78,7 +78,7 @@ func TestGetClusterAllowList_BYODError_FallbackToShared(t *testing.T) {
assert.Equal(t, []string{"eu.proxy.netbird.io"}, result)
}
func TestGetClusterAllowList_BYODEmptySlice_FallbackToShared(t *testing.T) {
func TestGetClusterAllowList_BYOPEmptySlice_FallbackToShared(t *testing.T) {
pm := &mockProxyManager{
getActiveClusterAddressesForAccountFunc: func(_ context.Context, _ string) ([]string, error) {
return []string{}, nil

4
management/internals/modules/reverseproxy/proxy/manager/manager_test.go
View File

@@ -246,7 +246,7 @@ func TestGetAccountProxy(t *testing.T) {
t.Run("found", func(t *testing.T) {
expected := &proxy.Proxy{
ID: "proxy-1",
ClusterAddress: "byod.example.com",
ClusterAddress: "byop.example.com",
AccountID: &accountID,
Status: proxy.StatusConnected,
}
@@ -306,7 +306,7 @@ func TestDeleteProxy(t *testing.T) {
}
func TestGetActiveClusterAddressesForAccount(t *testing.T) {
expected := []string{"byod.example.com"}
expected := []string{"byop.example.com"}
s := &mockStore{
getActiveProxyClusterAddressesForAccFunc: func(_ context.Context, accID string) ([]string, error) {
assert.Equal(t, "acc-123", accID)

8
management/internals/modules/reverseproxy/selfhostedproxy/handler_test.go
View File

@@ -50,7 +50,7 @@ func TestListProxies_Success(t *testing.T) {
proxyMgr := proxy.NewMockManager(ctrl)
proxyMgr.EXPECT().GetAccountProxy(gomock.Any(), accountID).Return(&proxy.Proxy{
ID: "proxy-1",
ClusterAddress: "byod.example.com",
ClusterAddress: "byop.example.com",
IPAddress: "10.0.0.1",
AccountID: &accountID,
Status: proxy.StatusConnected,
@@ -60,8 +60,8 @@ func TestListProxies_Success(t *testing.T) {
serviceMgr := rpservice.NewMockManager(ctrl)
serviceMgr.EXPECT().GetAccountServices(gomock.Any(), accountID).Return([]*rpservice.Service{
{ProxyCluster: "byod.example.com"},
{ProxyCluster: "byod.example.com"},
{ProxyCluster: "byop.example.com"},
{ProxyCluster: "byop.example.com"},
{ProxyCluster: "other.cluster.com"},
}, nil)
@@ -85,7 +85,7 @@ func TestListProxies_Success(t *testing.T) {
require.NoError(t, json.NewDecoder(w.Body).Decode(&resp))
require.Len(t, resp, 1)
assert.Equal(t, "proxy-1", resp[0].Id)
assert.Equal(t, "byod.example.com", resp[0].ClusterAddress)
assert.Equal(t, "byop.example.com", resp[0].ClusterAddress)
assert.Equal(t, 2, resp[0].ServiceCount)
assert.Equal(t, api.SelfHostedProxyStatus(proxy.StatusConnected), resp[0].Status)
}

6
management/internals/shared/grpc/proxy.go
View File

@@ -226,7 +226,7 @@ func (s *ProxyServiceServer) GetMappingUpdate(req *proto.GetMappingUpdateRequest
if strings.Contains(err.Error(), "UNIQUE constraint") || strings.Contains(err.Error(), "duplicate key") || strings.Contains(err.Error(), "idx_proxy_account_id_unique") {
return status.Errorf(codes.ResourceExhausted, "limit of 1 self-hosted proxy per account")
}
return status.Errorf(codes.Internal, "failed to register BYOD proxy: %v", err)
return status.Errorf(codes.Internal, "failed to register BYOP proxy: %v", err)
}
log.WithContext(ctx).Warnf("Failed to register proxy %s in database: %v", proxyID, err)
}
@@ -308,7 +308,7 @@ func (s *ProxyServiceServer) heartbeat(ctx context.Context, conn *proxyConnectio
// sendSnapshot sends the initial snapshot of services to the connecting proxy.
// Only services matching the proxy's cluster address are sent.
// For BYOD proxies (account-scoped), only account services are sent.
// For BYOP proxies (account-scoped), only account services are sent.
func (s *ProxyServiceServer) sendSnapshot(ctx context.Context, conn *proxyConnection) error {
var services []*rpservice.Service
var err error
@@ -450,7 +450,7 @@ func (s *ProxyServiceServer) SendAccessLog(ctx context.Context, req *proto.SendA
// Management should call this when services are created/updated/removed.
// For create/update operations a unique one-time auth token is generated per
// proxy so that every replica can independently authenticate with management.
// BYOD proxies only receive updates for their own account's services.
// BYOP proxies only receive updates for their own account's services.
func (s *ProxyServiceServer) SendServiceUpdate(update *proto.GetMappingUpdateResponse) {
log.Debugf("Broadcasting service update to all connected proxy servers")
var updateAccountID string

2
management/internals/shared/grpc/proxy_address_test.go
View File

@@ -13,7 +13,7 @@ func TestIsProxyAddressValid(t *testing.T) {
valid bool
}{
{name: "valid domain", addr: "eu.proxy.netbird.io", valid: true},
{name: "valid subdomain", addr: "byod.proxy.example.com", valid: true},
{name: "valid subdomain", addr: "byop.proxy.example.com", valid: true},
{name: "valid IPv4", addr: "10.0.0.1", valid: true},
{name: "valid IPv4 public", addr: "203.0.113.10", valid: true},
{name: "valid IPv6", addr: "::1", valid: true},