Merge branch 'main' into refactor/jwt-group-sync

# Conflicts:
#	management/server/file_store.go

.github/workflows/golang-test-freebsd.yml

@@ -38,7 +38,7 @@ jobs:
  time go test -timeout 1m -failfast ./dns/...
  time go test -timeout 1m -failfast ./encryption/...
  time go test -timeout 1m -failfast ./formatter/...
- time go test -timeout 1m -failfast ./iface/...
+ time go test -timeout 1m -failfast ./client/iface/...
  time go test -timeout 1m -failfast ./route/...
  time go test -timeout 1m -failfast ./sharedsock/...
  time go test -timeout 1m -failfast ./signal/...

.github/workflows/golang-test-linux.yml

@@ -80,7 +80,7 @@ jobs:
  run: git --no-pager diff --exit-code
 
  - name: Generate Iface Test bin
- run: CGO_ENABLED=0 go test -c -o iface-testing.bin ./iface/
+ run: CGO_ENABLED=0 go test -c -o iface-testing.bin ./client/iface/
 
  - name: Generate Shared Sock Test bin
  run: CGO_ENABLED=0 go test -c -o sharedsock-testing.bin ./sharedsock

.github/workflows/golangci-lint.yml

@@ -19,7 +19,7 @@ jobs:
  - name: codespell
  uses: codespell-project/actions-codespell@v2
  with:
- ignore_words_list: erro,clienta,hastable,
+ ignore_words_list: erro,clienta,hastable,iif
  skip: go.mod,go.sum
  only_warn: 1
  golangci:

client/android/client.go

@@ -8,14 +8,14 @@ import (
 
  log "github.com/sirupsen/logrus"
 
+ "github.com/netbirdio/netbird/client/iface/device"
  "github.com/netbirdio/netbird/client/internal"
  "github.com/netbirdio/netbird/client/internal/dns"
  "github.com/netbirdio/netbird/client/internal/listener"
  "github.com/netbirdio/netbird/client/internal/peer"
  "github.com/netbirdio/netbird/client/internal/stdnet"
  "github.com/netbirdio/netbird/client/system"
  "github.com/netbirdio/netbird/formatter"
- "github.com/netbirdio/netbird/iface"
  "github.com/netbirdio/netbird/util/net"
 )
 
@@ -26,7 +26,7 @@ type ConnectionListener interface {
 
 // TunAdapter export internal TunAdapter for mobile
 type TunAdapter interface {
- iface.TunAdapter
+ device.TunAdapter
 }
 
 // IFaceDiscover export internal IFaceDiscover for mobile
@@ -51,7 +51,7 @@ func init() {
 // Client struct manage the life circle of background service
 type Client struct {
  cfgFile string
- tunAdapter iface.TunAdapter
+ tunAdapter device.TunAdapter
  iFaceDiscover IFaceDiscover
  recorder *peer.Status
  ctxCancel context.CancelFunc

client/cmd/login_test.go

@@ -5,8 +5,8 @@ import (
  "strings"
  "testing"
 
+ "github.com/netbirdio/netbird/client/iface"
  "github.com/netbirdio/netbird/client/internal"
- "github.com/netbirdio/netbird/iface"
  "github.com/netbirdio/netbird/util"
 )
 

client/cmd/root_test.go

@@ -7,7 +7,7 @@ import (
 
  "github.com/spf13/cobra"
 
- "github.com/netbirdio/netbird/iface"
+ "github.com/netbirdio/netbird/client/iface"
 )
 
 func TestInitCommands(t *testing.T) {

client/cmd/testutil_test.go

@@ -3,7 +3,6 @@ package cmd
 import (
  "context"
  "net"
- "path/filepath"
  "testing"
  "time"
 
@@ -34,18 +33,12 @@ func startTestingServices(t *testing.T) string {
  if err != nil {
  t.Fatal(err)
  }
- testDir := t.TempDir()
- config.Datadir = testDir
- err = util.CopyFileContents("../testdata/store.json", filepath.Join(testDir, "store.json"))
- if err != nil {
- t.Fatal(err)
- }
 
  _, signalLis := startSignal(t)
  signalAddr := signalLis.Addr().String()
  config.Signal.URI = signalAddr
 
- _, mgmLis := startManagement(t, config)
+ _, mgmLis := startManagement(t, config, "../testdata/store.sqlite")
  mgmAddr := mgmLis.Addr().String()
  return mgmAddr
 }
@@ -70,15 +63,15 @@ func startSignal(t *testing.T) (*grpc.Server, net.Listener) {
  return s, lis
 }
 
-func startManagement(t *testing.T, config *mgmt.Config) (*grpc.Server, net.Listener) {
+func startManagement(t *testing.T, config *mgmt.Config, testFile string) (*grpc.Server, net.Listener) {
  t.Helper()
 
  lis, err := net.Listen("tcp", ":0")
  if err != nil {
  t.Fatal(err)
  }
  s := grpc.NewServer()
- store, cleanUp, err := mgmt.NewTestStoreFromJson(context.Background(), config.Datadir)
+ store, cleanUp, err := mgmt.NewTestStoreFromSqlite(context.Background(), testFile, t.TempDir())
  if err != nil {
  t.Fatal(err)
  }

client/cmd/up.go

@@ -15,11 +15,11 @@ import (
  gstatus "google.golang.org/grpc/status"
  "google.golang.org/protobuf/types/known/durationpb"
 
+ "github.com/netbirdio/netbird/client/iface"
  "github.com/netbirdio/netbird/client/internal"
  "github.com/netbirdio/netbird/client/internal/peer"
  "github.com/netbirdio/netbird/client/proto"
  "github.com/netbirdio/netbird/client/system"
- "github.com/netbirdio/netbird/iface"
  "github.com/netbirdio/netbird/util"
 )
 

client/firewall/iface.go

@@ -1,11 +1,13 @@
 package firewall
 
-import "github.com/netbirdio/netbird/iface"
+import (
+ "github.com/netbirdio/netbird/client/iface/device"
+)
 
 // IFaceMapper defines subset methods of interface required for manager
 type IFaceMapper interface {
  Name() string
- Address() iface.WGAddress
+ Address() device.WGAddress
  IsUserspaceBind() bool
- SetFilter(iface.PacketFilter) error
+ SetFilter(device.PacketFilter) error
 }