Skip to content

Commit 1d5e871

Browse files
authored
[misc] Move shared components to shared directory (#4286)
Moved the following directories: ``` - management/client → shared/management/client - management/domain → shared/management/domain - management/proto → shared/management/proto - signal/client → shared/signal/client - signal/proto → shared/signal/proto - relay/client → shared/relay/client - relay/auth → shared/relay/auth ``` and adjusted import paths
1 parent 3d3c4c5 commit 1d5e871

File tree

172 files changed

+181
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+181
-152
lines changed

client/cmd/debug.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/netbirdio/netbird/client/proto"
1818
"github.com/netbirdio/netbird/client/server"
1919
nbstatus "github.com/netbirdio/netbird/client/status"
20-
mgmProto "github.com/netbirdio/netbird/management/proto"
20+
mgmProto "github.com/netbirdio/netbird/shared/management/proto"
2121
"github.com/netbirdio/netbird/upload-server/types"
2222
)
2323

client/cmd/testutil_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626

2727
clientProto "github.com/netbirdio/netbird/client/proto"
2828
client "github.com/netbirdio/netbird/client/server"
29-
mgmtProto "github.com/netbirdio/netbird/management/proto"
29+
mgmtProto "github.com/netbirdio/netbird/shared/management/proto"
3030
mgmt "github.com/netbirdio/netbird/management/server"
31-
sigProto "github.com/netbirdio/netbird/signal/proto"
31+
sigProto "github.com/netbirdio/netbird/shared/signal/proto"
3232
sig "github.com/netbirdio/netbird/signal/server"
3333
)
3434

client/cmd/up.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/netbirdio/netbird/client/internal/profilemanager"
2424
"github.com/netbirdio/netbird/client/proto"
2525
"github.com/netbirdio/netbird/client/system"
26-
"github.com/netbirdio/netbird/management/domain"
26+
"github.com/netbirdio/netbird/shared/management/domain"
2727
"github.com/netbirdio/netbird/util"
2828
)
2929

client/firewall/manager/set.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
log "github.com/sirupsen/logrus"
1111

12-
"github.com/netbirdio/netbird/management/domain"
12+
"github.com/netbirdio/netbird/shared/management/domain"
1313
)
1414

1515
type Set struct {

client/firewall/uspfilter/filter_filter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/netbirdio/netbird/client/iface/device"
1616
"github.com/netbirdio/netbird/client/iface/mocks"
1717
"github.com/netbirdio/netbird/client/iface/wgaddr"
18-
"github.com/netbirdio/netbird/management/domain"
18+
"github.com/netbirdio/netbird/shared/management/domain"
1919
)
2020

2121
func TestPeerACLFiltering(t *testing.T) {

client/firewall/uspfilter/filter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/netbirdio/netbird/client/iface/device"
2121
"github.com/netbirdio/netbird/client/iface/wgaddr"
2222
"github.com/netbirdio/netbird/client/internal/netflow"
23-
"github.com/netbirdio/netbird/management/domain"
23+
"github.com/netbirdio/netbird/shared/management/domain"
2424
)
2525

2626
var logger = log.NewFromLogrus(logrus.StandardLogger())

client/internal/acl/manager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
firewall "github.com/netbirdio/netbird/client/firewall/manager"
1919
"github.com/netbirdio/netbird/client/internal/acl/id"
2020
"github.com/netbirdio/netbird/client/ssh"
21-
"github.com/netbirdio/netbird/management/domain"
22-
mgmProto "github.com/netbirdio/netbird/management/proto"
21+
"github.com/netbirdio/netbird/shared/management/domain"
22+
mgmProto "github.com/netbirdio/netbird/shared/management/proto"
2323
)
2424

2525
var ErrSourceRangesEmpty = errors.New("sources range is empty")

client/internal/acl/manager_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/netbirdio/netbird/client/iface/wgaddr"
1313
"github.com/netbirdio/netbird/client/internal/acl/mocks"
1414
"github.com/netbirdio/netbird/client/internal/netflow"
15-
mgmProto "github.com/netbirdio/netbird/management/proto"
15+
mgmProto "github.com/netbirdio/netbird/shared/management/proto"
1616
)
1717

1818
var flowLogger = netflow.NewManager(nil, []byte{}, nil).GetLogger()

client/internal/auth/pkce_flow_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/stretchr/testify/require"
88

99
"github.com/netbirdio/netbird/client/internal"
10-
mgm "github.com/netbirdio/netbird/management/client/common"
10+
mgm "github.com/netbirdio/netbird/shared/management/client/common"
1111
)
1212

1313
func TestPromptLogin(t *testing.T) {

client/internal/connect.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
cProto "github.com/netbirdio/netbird/client/proto"
2727
"github.com/netbirdio/netbird/client/ssh"
2828
"github.com/netbirdio/netbird/client/system"
29-
mgm "github.com/netbirdio/netbird/management/client"
30-
mgmProto "github.com/netbirdio/netbird/management/proto"
31-
"github.com/netbirdio/netbird/relay/auth/hmac"
32-
relayClient "github.com/netbirdio/netbird/relay/client"
33-
signal "github.com/netbirdio/netbird/signal/client"
29+
mgm "github.com/netbirdio/netbird/shared/management/client"
30+
mgmProto "github.com/netbirdio/netbird/shared/management/proto"
31+
"github.com/netbirdio/netbird/shared/relay/auth/hmac"
32+
relayClient "github.com/netbirdio/netbird/shared/relay/client"
33+
signal "github.com/netbirdio/netbird/shared/signal/client"
3434
"github.com/netbirdio/netbird/util"
3535
nbnet "github.com/netbirdio/netbird/util/net"
3636
"github.com/netbirdio/netbird/version"

0 commit comments

Comments
 (0)