sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-21 12:59:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into embedded-vnc

Browse Source 
# Conflicts:
#	client/cmd/up.go
#	client/internal/engine.go
#	client/internal/profilemanager/config.go
#	client/proto/daemon.pb.go
#	client/server/mdm.go
#	client/server/server.go
#	client/status/status.go
#	client/ui/main.go
#	client/ui/services/windowmanager.go
#	management/internals/shared/grpc/conversion.go
#	management/server/store/sql_store.go
#	management/server/store/sql_store_test.go
#	shared/management/networkmap/envelope.go
#	shared/management/proto/management.pb.go
This commit is contained in:
Viktor Liu
2026-10-19 19:49:54 +09:00
parent 1fec7c0ded cf01711971
commit 0a17d1a9f5
804 changed files with 72029 additions and 25943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration_tests/management/network_map_db/network_map_data_golden.json
+5 -1
View File
@@ -35,6 +35,7 @@
"ProcessIsRunning": false
}
],
"Certificates": null,
"Capabilities": [
1,
2
@@ -90,6 +91,7 @@
"ProcessIsRunning": false
}
],
"Certificates": null,
"Capabilities": [
1,
2
@@ -145,6 +147,7 @@
"ProcessIsRunning": false
}
],
"Certificates": null,
"Capabilities": [
1,
2
@@ -435,7 +438,8 @@
"192.168.0.1/24"
]
},
"ProcessCheck": null
"ProcessCheck": null,
"CertificateCheck": null
}
}
},
integration_tests/management/network_map_db/sqlite_test_store.go
+6 -2
View File
@@ -9,8 +9,8 @@ import (
"strings"
networkmap_sqlite "github.com/netbirdio/netbird/management/internals/network_map_db/sqlite"
nbdb "github.com/netbirdio/netbird/management/internals/shared/db"
gormstore "github.com/netbirdio/netbird/management/server/store"
"github.com/netbirdio/netbird/management/server/types"
log "github.com/sirupsen/logrus"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
@@ -28,7 +28,11 @@ func createSqliteTestStore(baseData string) (*networkmap_sqlite.SqliteStore, fun
if err != nil {
log.Fatalf("error initializing db: %s", err.Error())
}
_, err = gormstore.NewSqlStore(context.TODO(), db, types.SqliteStoreEngine, nil, false)
conn, err := nbdb.NewConn(context.TODO(), db, nbdb.SqliteStoreEngine, nil)
if err != nil {
log.Fatalf("error initializing db: %s", err.Error())
}
_, err = gormstore.NewSqlStore(context.TODO(), conn, nil, false)
if err != nil {
log.Fatalf("error initializing db: %s", err.Error())
}