mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-20 17:26:40 +00:00
MySQL Support (#2837)
* Update store.go * Update sql_store.go * Update store.go * Update golang-test-linux.yml * Update store.go * Update go.mod * Update go.mod * Update go.sum * Update store.go * Update sql_store.go * TestContainer * Update go.sum * Update store.go * TestUtil Duplicate * dsn fix * go mod tidy * NETBIRD_STORE_ENGINE_MYSQL_DSN * Skip Test * Update test-infrastructure-files.yml * Update test-infrastructure-files.yml * MYSQL_ROOT_PASSWORD added * Update test-infrastructure-files.yml * Update store.go * Debug + Mysql JSON Query * swicth/case convert * Update store.go * Update store.go * Debug * MySQL Test Version Change * Root Test * Ignore other sql tests. * MySQL Connection Fix * enable other tests * The word "key" is a reserved word in MySQL. * Remove Debugs * Update sql_store.go * Added default null value for datetime. * Added default null value for datetime. * MySQL Hooks * MySQL Config File * remove default values * test timeout change * MySQL max lifetime change * WithConfigFile * disable other tests * Update mysql.cnf * Update golang-test-linux.yml * Delete sql_hooks.go * enable other tests * test timeout change * update packets * Fix the Inactivity Expiration problem * Update sql_store.go * Update mysql.cnf * Update sql_store.go * Update sql_store.go * timeout change * MySQL Connection LifeTime Change * TestContainers have been optimized. * Update store_ios.go * Update sql_store.go * timeout fix * fix migration (setup keys) * Update event.go * Add disable option for event activities. * Revert "Update event.go" * Update event.go * Fix Gorm Mysql Bug * update go-jose module * containerd module update * containerd downgrade * Revert commits * Revert "Revert commits" This reverts commit62b3eac799. * Revert "containerd downgrade" This reverts commit4e46108915. * Revert "containerd module update" This reverts commite8cfa87d16. * Revert "update go-jose module" This reverts commit1fabdc7606.
This commit is contained in:
@@ -8,19 +8,68 @@ import (
|
||||
"os"
|
||||
"time"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
"github.com/testcontainers/testcontainers-go"
|
||||
"github.com/testcontainers/testcontainers-go/modules/mysql"
|
||||
"github.com/testcontainers/testcontainers-go/modules/postgres"
|
||||
"github.com/testcontainers/testcontainers-go/wait"
|
||||
)
|
||||
|
||||
func CreatePGDB() (func(), error) {
|
||||
var (
|
||||
mysqlContainer = (*mysql.MySQLContainer)(nil)
|
||||
mysqlContainerString = ""
|
||||
mysqlContainerConfigPath = "../../management/server/testdata/mysql.cnf"
|
||||
postgresContainer = (*postgres.PostgresContainer)(nil)
|
||||
postgresContainerString = ""
|
||||
)
|
||||
|
||||
func emptyCleanup() {
|
||||
// Empty function, don't do anything.
|
||||
}
|
||||
|
||||
func CreateMysqlTestContainer() (func(), error) {
|
||||
|
||||
ctx := context.Background()
|
||||
c, err := postgres.RunContainer(ctx,
|
||||
testcontainers.WithImage("postgres:alpine"),
|
||||
postgres.WithDatabase("test"),
|
||||
postgres.WithUsername("postgres"),
|
||||
postgres.WithPassword("postgres"),
|
||||
|
||||
if mysqlContainerString != "" && mysqlContainer != nil && mysqlContainer.IsRunning() {
|
||||
RefreshMysqlDatabase(ctx)
|
||||
return emptyCleanup, os.Setenv("NETBIRD_STORE_ENGINE_MYSQL_DSN", mysqlContainerString)
|
||||
}
|
||||
|
||||
container, err := mysql.Run(ctx,
|
||||
"mysql:8.0.40",
|
||||
mysql.WithConfigFile(mysqlContainerConfigPath),
|
||||
mysql.WithDatabase("netbird"),
|
||||
mysql.WithUsername("root"),
|
||||
mysql.WithPassword(""),
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
talksConn, _ := container.ConnectionString(ctx)
|
||||
|
||||
mysqlContainer = container
|
||||
mysqlContainerString = talksConn
|
||||
|
||||
RefreshMysqlDatabase(ctx)
|
||||
return emptyCleanup, os.Setenv("NETBIRD_STORE_ENGINE_MYSQL_DSN", talksConn)
|
||||
}
|
||||
|
||||
func CreatePostgresTestContainer() (func(), error) {
|
||||
|
||||
ctx := context.Background()
|
||||
|
||||
if postgresContainerString != "" && postgresContainer != nil && postgresContainer.IsRunning() {
|
||||
RefreshPostgresDatabase(ctx)
|
||||
return emptyCleanup, os.Setenv("NETBIRD_STORE_ENGINE_POSTGRES_DSN", postgresContainerString)
|
||||
}
|
||||
|
||||
container, err := postgres.Run(ctx,
|
||||
"postgres:16-alpine",
|
||||
postgres.WithDatabase("netbird"),
|
||||
postgres.WithUsername("root"),
|
||||
postgres.WithPassword("netbird"),
|
||||
testcontainers.WithWaitStrategy(
|
||||
wait.ForLog("database system is ready to accept connections").
|
||||
WithOccurrence(2).WithStartupTimeout(15*time.Second)),
|
||||
@@ -29,17 +78,21 @@ func CreatePGDB() (func(), error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
cleanup := func() {
|
||||
timeout := 10 * time.Second
|
||||
err = c.Stop(ctx, &timeout)
|
||||
if err != nil {
|
||||
log.WithContext(ctx).Warnf("failed to stop container: %s", err)
|
||||
}
|
||||
}
|
||||
talksConn, _ := container.ConnectionString(ctx)
|
||||
|
||||
talksConn, err := c.ConnectionString(ctx)
|
||||
if err != nil {
|
||||
return cleanup, err
|
||||
}
|
||||
return cleanup, os.Setenv("NETBIRD_STORE_ENGINE_POSTGRES_DSN", talksConn)
|
||||
postgresContainerString = talksConn
|
||||
postgresContainer = container
|
||||
|
||||
RefreshPostgresDatabase(ctx)
|
||||
return emptyCleanup, os.Setenv("NETBIRD_STORE_ENGINE_POSTGRES_DSN", postgresContainerString)
|
||||
}
|
||||
|
||||
func RefreshMysqlDatabase(ctx context.Context) {
|
||||
_, _, _ = mysqlContainer.Exec(ctx, []string{"mysqladmin", "--user=root", "drop", "netbird", "-f"})
|
||||
_, _, _ = mysqlContainer.Exec(ctx, []string{"mysqladmin", "--user=root", "create", "netbird"})
|
||||
}
|
||||
|
||||
func RefreshPostgresDatabase(ctx context.Context) {
|
||||
_, _, _ = postgresContainer.Exec(ctx, []string{"dropdb", "-f", "netbird"})
|
||||
_, _, _ = postgresContainer.Exec(ctx, []string{"createdb", "netbird"})
|
||||
}
|
||||
|
||||
@@ -3,4 +3,14 @@
|
||||
|
||||
package testutil
|
||||
|
||||
func CreatePGDB() (func(), error) { return func() {}, nil }
|
||||
func CreatePostgresTestContainer() (func(), error) {
|
||||
return func() {
|
||||
// Empty function for Postgres
|
||||
}, nil
|
||||
}
|
||||
|
||||
func CreateMysqlTestContainer() (func(), error) {
|
||||
return func() {
|
||||
// Empty function for MySQL
|
||||
}, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user