new IP allocator and add postgres to integration tests. (#1756)

hscontrol/db/db.go

@@ -5,7 +5,6 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"net/netip"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -18,7 +17,6 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 
-	"github.com/juanfont/headscale/hscontrol/notifier"
 	"github.com/juanfont/headscale/hscontrol/types"
 	"github.com/juanfont/headscale/hscontrol/util"
 )
@@ -35,7 +33,6 @@ type KV struct {
 type HSDatabase struct {
 	DB *gorm.DB
 
-	ipPrefixes []netip.Prefix
 	baseDomain string
 }
 
@@ -43,8 +40,6 @@ type HSDatabase struct {
 // rather than arguments.
 func NewHeadscaleDatabase(
 	cfg types.DatabaseConfig,
-	notifier *notifier.Notifier,
-	ipPrefixes []netip.Prefix,
 	baseDomain string,
 ) (*HSDatabase, error) {
 	dbConn, err := openDB(cfg)
@@ -327,7 +322,6 @@ func NewHeadscaleDatabase(
 	db := HSDatabase{
 		DB: dbConn,
 
-		ipPrefixes: ipPrefixes,
 		baseDomain: baseDomain,
 	}
 
@@ -351,6 +345,11 @@ func openDB(cfg types.DatabaseConfig) (*gorm.DB, error) {
 			return nil, fmt.Errorf("creating directory for sqlite: %w", err)
 		}
 
+		log.Info().
+			Str("database", types.DatabaseSqlite).
+			Str("path", cfg.Sqlite.Path).
+			Msg("Opening database")
+
 		db, err := gorm.Open(
 			sqlite.Open(cfg.Sqlite.Path+"?_synchronous=1&_journal_mode=WAL"),
 			&gorm.Config{
@@ -379,6 +378,11 @@ func openDB(cfg types.DatabaseConfig) (*gorm.DB, error) {
 			cfg.Postgres.User,
 		)
 
+		log.Info().
+			Str("database", types.DatabasePostgres).
+			Str("path", dbString).
+			Msg("Opening database")
+
 		if sslEnabled, err := strconv.ParseBool(cfg.Postgres.Ssl); err == nil {
 			if !sslEnabled {
 				dbString += " sslmode=disable"